From 8c276644f533c78b2b2096b7d1bfd7977c13cd2c Mon Sep 17 00:00:00 2001 From: Konrad Mohrfeldt Date: Sun, 5 Feb 2012 23:54:26 +0100 Subject: [PATCH] template refactoring the first. fixes #6, #84, 75 --- .gitignore | 1 + .../buyable/templates/buyables/history.html | 120 +- .../templates/buyables/itemBought.html | 2 +- .../templates/buyables/product_list.html | 64 +- .../buyable/templates/buyables/showItem.html | 2 +- .../buyable/templates/buyables/showItems.html | 22 +- k4ever/main/templates/base.html | 30 +- .../{main/search-form.html => form.html} | 14 +- .../main/templates/main/navbar-content.html | 44 + .../main/templates/main/navigation-login.html | 20 - k4ever/main/templates/main/product_list.html | 2 +- k4ever/main/templates/settings/settings.html | 156 +- k4ever/main/templatetags/__init__.py | 0 .../navigation_extras.py} | 17 +- k4ever/media/css/img/cashIn.png | Bin 806 -> 1447 bytes k4ever/media/css/img/cashOut.png | Bin 802 -> 904 bytes k4ever/media/css/img/logo.png | Bin 2302 -> 1227 bytes k4ever/media/css/style.css | 371 +- k4ever/media/css/style.less | 425 +- k4ever/media/js/jquery-1.5.1.js | 8316 ----------------- k4ever/media/js/jquery.min.js | 4 + k4ever/media/js/k4ever.js | 16 +- k4ever/media/js/style.css | 0 k4ever/settings.py.template | 9 + .../templates/transaction/overview.html | 266 +- k4ever/transaction/templates/treasurer.html | 18 + .../templates/treasurer.html.template | 32 + 27 files changed, 640 insertions(+), 9311 deletions(-) rename k4ever/main/templates/{main/search-form.html => form.html} (53%) create mode 100644 k4ever/main/templates/main/navbar-content.html delete mode 100644 k4ever/main/templates/main/navigation-login.html create mode 100644 k4ever/main/templatetags/__init__.py rename k4ever/main/{templates/main/navigation.html => templatetags/navigation_extras.py} (58%) delete mode 100644 k4ever/media/js/jquery-1.5.1.js create mode 100644 k4ever/media/js/jquery.min.js create mode 100644 k4ever/media/js/style.css create mode 100644 k4ever/transaction/templates/treasurer.html create mode 100644 k4ever/transaction/templates/treasurer.html.template diff --git a/.gitignore b/.gitignore index db58cd0..5636e54 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ k4ever/media/img/ k4ever/settings.py *.kdev4 .kdev4 +*.kate-swp diff --git a/k4ever/buyable/templates/buyables/history.html b/k4ever/buyable/templates/buyables/history.html index 920668c..b83db00 100644 --- a/k4ever/buyable/templates/buyables/history.html +++ b/k4ever/buyable/templates/buyables/history.html @@ -14,97 +14,59 @@ {% block "content" %} {% if history %} -
-

Frühere Einkäufe von {{ user }}

+

Frühere Einkäufe von {{ user }}

+ + - - - + +
+ + + + - + - + - {% for order in history.object_list %} - - - - - {% endfor %} -
BuchungEinkaufEinkauf
BuchungEinkaufEinkauf
- {{ order.dateTime|date:"Y-m-d H:i" }} - - - - {% for item in order.purchase_set.all %} - - {% endfor %} - -
- {% if not item.isDeposit %} - - {% else %} - {{ item.buyable.name }} Pfand - {% endif %} -
- zu {{ item.price|floatformat:2 }} € -
-
- + {% for order in history.object_list %} + + {{ order.dateTime|date:"j. F Y H:i" }} + +
+ + {% endfor %} + + {% else %}

{{ default|default_if_none:"Noch keine gekauft" }}

{% endif %} diff --git a/k4ever/buyable/templates/buyables/showItem.html b/k4ever/buyable/templates/buyables/showItem.html index a40d251..d642a2e 100644 --- a/k4ever/buyable/templates/buyables/showItem.html +++ b/k4ever/buyable/templates/buyables/showItem.html @@ -13,7 +13,7 @@ {% block "content" %} - Zur Liste aller Items + Zur Liste aller Produkte {% if item %}
diff --git a/k4ever/buyable/templates/buyables/showItems.html b/k4ever/buyable/templates/buyables/showItems.html index ba04815..695025d 100644 --- a/k4ever/buyable/templates/buyables/showItems.html +++ b/k4ever/buyable/templates/buyables/showItems.html @@ -10,14 +10,20 @@ {% endcomment %} {% block "content" %} -
-

Sortieren nach

- Letzte Änderung - Alphabet - Preis
+

Produktübersicht

+ -
- {% include "buyables/product_list.html" with buyables=items %} -
+ {% include "buyables/product_list.html" with buyables=items %} {% endblock %} diff --git a/k4ever/main/templates/base.html b/k4ever/main/templates/base.html index a496239..cf670fe 100644 --- a/k4ever/main/templates/base.html +++ b/k4ever/main/templates/base.html @@ -18,39 +18,27 @@ - + + {% block extrahead %}{% endblock %} {% endblock head %} Freitagsrundenkasse{% block "title" %}{% endblock %} -