Adds transactions and some tooltips++

templates/log.html

@@ -17,7 +17,7 @@
     {% endif %}
     <section id="orders" class="row-fluid">
         <div class="span12">
-            <h2>Siste ordre</h2>
+            <h2 title="Ordre fra de siste 2 dagene eller de 5 siste ordrene.">Siste ordre</h2>
             <table class="table table-striped">
                 <thead>
                 <tr>
@@ -34,17 +34,41 @@
                     <td>{{ order.created }}</td>
                     <td>{% if order.customer.get_profile.image %}<img src="{{ order.customer.get_profile.image }}" class="customer" title="{{ order.customer.first_name }} {{ order.customer.last_name|slice:":1"}}" />{% else %}{{ order.customer.first_name }} {{ order.customer.last_name|slice:":1"}}{% endif %}</td>
                     <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>
+                        <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-confirm-delete.html" with order=order %}<a class="btn btn-danger" data-toggle="modal" href="#modal-{{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">
+            <h2 title="Transaksjoner fra de siste 2 dagene eller de 5 siste transaksjonene.">Siste transaksjoner</h2>
+            <table class="table table-striped">
+                <thead>
+                <tr>
+                    <th>Når</th>
+                    <th>Hvem</th>
+                    <th>Innskudd</th>
+                    <th>Handling</th>
+                </tr>
+                </thead>
+                <tbody>
+                {% for t in transactions %}
+                <tr>
+                    <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>
+                </tr>
+                {% endfor %}
+                </tbody>
+            </table>
+            <a href="{% url register %}" class="btn">« Gå tilbake</a>
+        </div>
+    </section>
 </section>
 {% endblock %}
 {% block tailinc %}