Bootstrap v3, edge case fixes

This commit is contained in:
nikolark committed 2013-12-02 10:31:18 +01:00
1 parent 3bb521db39
commit 7f84c936ab
32 files changed
+9356 -2075

No files matched your search

+11 -11
View File
@@ -4,18 +4,18 @@
{% endblock %}
{% block content %}
<section id="log" class="row-fluid">
<section id="log" class="row">
{% if messages %}
<section class="row-fluid">
<div class="span4">
<section class="row">
<div class="col-xs-4">
{% for message in messages %}
<div {% if message.tags %}class="alert alert-{{ message.tags }}"{% endif %}>{{ message }}<a class="close" data-dismiss="alert">×</a></div>
{% endfor %}
</div>
</section>
{% endif %}
<section id="orders" class="row-fluid">
<div class="span12">
<section id="orders" class="row">
<div class="col-xs-12">
{% if not limit %}
<h2 title="Alle registrerte ordre">Alle ordre</h2><br />
<a href="{% url log %}">Vis kun siste</a>
@@ -30,7 +30,7 @@
<th>Hvem</th>
<th>Hva</th>
<th>Sum</th>
<th>Handling</th>
<!--<th>Handling</th>-->
</tr>
</thead>
<tbody>
@@ -41,15 +41,15 @@
<td>{% for line in order.orderline_set.all %}
<span class="amount">{{ line.amount}}</span> <a href="#" class="product" title="{{ line.unit_price}} per">{{ line.product }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>
<td>{{ order.order_sum }}</td>
<td>{% include "modal-delete-order.html" with order=order %}<a class="btn btn-danger" data-toggle="modal" href="#modal-order-{{order.id}}"><i class="icon-trash icon-white"></i> Slett</a></td>
<!--<td><{% include "modal-delete-order.html" with order=order %}<a class="btn btn-danger" data-toggle="modal" href="#modal-order-{{order.id}}"><i class="icon-trash icon-white"></i> Slett</a></td>-->
</tr>
{% endfor %}
</tbody>
</table>
</div>
</section>
<section id="transactions" class="row-fluid">
<div class="span12">
<section id="transactions" class="row">
<div class="col-xs-12">
{% if not limit %}
<h2 title="Alle registrerte transaksjoner">Alle transaksjoner</h2>
<br /><a href="{% url log %}#transactions">Vis kun siste</a>
@@ -63,7 +63,7 @@
<th>Når</th>
<th>Hvem</th>
<th>Innskudd</th>
<th>Handling</th>
<!--<th>Handling</th>-->
</tr>
</thead>
<tbody>
@@ -72,7 +72,7 @@
<td>{{ t.created }}</td>
<td>{% if t.user.get_profile.image %}<img src="{{ t.user.get_profile.image }}" class="customer" title="{{ t.user.first_name }} {{ t.user.last_name|slice:":1"}}" />{% else %}{{ t.user.first_name }} {{ t.user.last_name|slice:":1"}}{% endif %}</td>
<td>{{ t.amount }}</td>
<td>{% include "modal-delete-transaction.html" with t=t %}<a class="btn btn-danger" data-toggle="modal" href="#modal-trans-{{t.id}}"><i class="icon-trash icon-white"></i> Slett</a></td>
<!--<td>{% include "modal-delete-transaction.html" with t=t %}<a class="btn btn-danger" data-toggle="modal" href="#modal-trans-{{t.id}}"><i class="icon-trash icon-white"></i> Slett</a></td>-->
</tr>
{% endfor %}
</tbody>