From 5b3401ffdde84912e32db1ba6b473be184383635 Mon Sep 17 00:00:00 2001 From: Konrad Mohrfeldt Date: Wed, 25 May 2011 18:33:48 +0200 Subject: [PATCH] =?UTF-8?q?=C3=A4nderungen=20an=20suchfeld=20und=20design?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit suchfeld: * kann jetzt kaufen * wie gehts: pfeiltastenwahl, alt + rechte pfeiltaste kleine oder große änderungen am design und an templates. zu lange her um alle im kopf zu haben :) --- .../buyable/templates/buyables/history.html | 34 +- k4ever/k4ever.db | Bin 66560 -> 72704 bytes k4ever/main/templates/base.html | 16 +- .../main/templates/main/navigation-login.html | 12 +- k4ever/main/templates/main/search-form.html | 6 + k4ever/media/css/img/alt.png | Bin 0 -> 5888 bytes k4ever/media/css/img/buy.png | Bin 0 -> 5788 bytes k4ever/media/css/img/failure.png | Bin 0 -> 1009 bytes k4ever/media/css/img/load.gif | Bin 0 -> 8787 bytes k4ever/media/css/img/success.png | Bin 0 -> 703 bytes .../css/img/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 180 bytes .../css/img/ui-bg_flat_0_eeeeee_40x100.png | Bin 0 -> 180 bytes .../css/img/ui-bg_flat_55_ffffff_40x100.png | Bin 0 -> 178 bytes .../css/img/ui-bg_flat_75_ffffff_40x100.png | Bin 0 -> 178 bytes .../css/img/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 105 bytes .../ui-bg_highlight-soft_100_f6f6f6_1x100.png | Bin 0 -> 90 bytes .../ui-bg_highlight-soft_25_0073ea_1x100.png | Bin 0 -> 118 bytes .../ui-bg_highlight-soft_50_dddddd_1x100.png | Bin 0 -> 92 bytes .../media/css/img/ui-icons_0073ea_256x240.png | Bin 0 -> 4369 bytes .../media/css/img/ui-icons_454545_256x240.png | Bin 0 -> 4369 bytes .../media/css/img/ui-icons_666666_256x240.png | Bin 0 -> 4369 bytes .../media/css/img/ui-icons_ff0084_256x240.png | Bin 0 -> 5355 bytes .../media/css/img/ui-icons_ffffff_256x240.png | Bin 0 -> 4369 bytes k4ever/media/css/jquery-ui-1.8.10.custom.css | 573 ++ k4ever/media/css/style.css | 163 +- k4ever/media/img/buyable/mate-cola.jpg | Bin 0 -> 31203 bytes k4ever/media/js/jquery-1.5.1.js | 8316 +++++++++++++++++ .../media/js/jquery-ui-1.8.10.custom.min.js | 782 ++ .../media/js/jquery.ui.autocomplete.html.js | 40 + k4ever/media/js/k4ever.js | 94 + 30 files changed, 9998 insertions(+), 38 deletions(-) create mode 100644 k4ever/main/templates/main/search-form.html create mode 100644 k4ever/media/css/img/alt.png create mode 100644 k4ever/media/css/img/buy.png create mode 100644 k4ever/media/css/img/failure.png create mode 100644 k4ever/media/css/img/load.gif create mode 100644 k4ever/media/css/img/success.png create mode 100644 k4ever/media/css/img/ui-bg_flat_0_aaaaaa_40x100.png create mode 100644 k4ever/media/css/img/ui-bg_flat_0_eeeeee_40x100.png create mode 100644 k4ever/media/css/img/ui-bg_flat_55_ffffff_40x100.png create mode 100644 k4ever/media/css/img/ui-bg_flat_75_ffffff_40x100.png create mode 100644 k4ever/media/css/img/ui-bg_glass_65_ffffff_1x400.png create mode 100644 k4ever/media/css/img/ui-bg_highlight-soft_100_f6f6f6_1x100.png create mode 100644 k4ever/media/css/img/ui-bg_highlight-soft_25_0073ea_1x100.png create mode 100644 k4ever/media/css/img/ui-bg_highlight-soft_50_dddddd_1x100.png create mode 100644 k4ever/media/css/img/ui-icons_0073ea_256x240.png create mode 100644 k4ever/media/css/img/ui-icons_454545_256x240.png create mode 100644 k4ever/media/css/img/ui-icons_666666_256x240.png create mode 100644 k4ever/media/css/img/ui-icons_ff0084_256x240.png create mode 100644 k4ever/media/css/img/ui-icons_ffffff_256x240.png create mode 100644 k4ever/media/css/jquery-ui-1.8.10.custom.css create mode 100755 k4ever/media/img/buyable/mate-cola.jpg create mode 100644 k4ever/media/js/jquery-1.5.1.js create mode 100644 k4ever/media/js/jquery-ui-1.8.10.custom.min.js create mode 100644 k4ever/media/js/jquery.ui.autocomplete.html.js create mode 100644 k4ever/media/js/k4ever.js diff --git a/k4ever/buyable/templates/buyables/history.html b/k4ever/buyable/templates/buyables/history.html index 94c3acd..7b74ebc 100644 --- a/k4ever/buyable/templates/buyables/history.html +++ b/k4ever/buyable/templates/buyables/history.html @@ -2,14 +2,36 @@ {% block "content" %} {% if history %} - Your personal history + + + + + + + + + + + + + + {% for order in history.all %} - {{ order }}
- {% for item in order.purchase_set.all %} - {{item }} - {% endfor %} -
+ + + + {% endfor %} +
BuchungEinkauf
BuchungEinkauf
{{ order.dateTime|date:"Y-m-d H:i" }} +
    + {% for item in order.purchase_set.all %} +
  • + {{ item.buyable.name }}{% if item.isDeposit %} Pfand{% endif %} + zu {{ item.price|floatformat:2 }} € +
  • + {% endfor %} +
+
{% else %} {{ error }} Alle alle die Orders :( diff --git a/k4ever/k4ever.db b/k4ever/k4ever.db index 1129fea81e363dc75f2401656e91d186a8ecbe21..2dda0a28836eaa4e0133075d12841f990ffcf571 100644 GIT binary patch delta 4656 zcmb7HYitzP6`p&~7z4q91ri<&cx-Gu277$x{lNIa%aMrH3W0)}{K)Ql){oeWyS78i zk1n7pjiQJW7O51Kil(SPqEsSmgrW%L2S`!{kO4TOMj?@h1{OO z-a^=)?F*Zf3+FOnLGf&5;KHfCLVs_l>ybu;L zWBFoFm{*4SN0sQev#@6ff5QGe#)w`d5{(QOF!X4|D*13M9BES0V(6lQHnG)5lJg$_xyY!1G^?O z@Uc#TS<|ti0+GR8L}?q`EvFXz3qaZ`&U}|GScn|J2Mj)df5SDngNt$=N`L&}>P1o& z$2G0w9o;v6hu78DUXmY81ll|qXw#xIhh?uU|KlcEtIB zxcImKut+o&QI~5@nif5e}%uu z_rpmz4oBe-48s8I#(;Mi29%4uqXHP??SyTF8wpzpHxLGdKA}hG5;}x7p+#sC8iYEb zAZ#Jj2%8C;2zRZgpLK+dgeqYJ;ab9a!aBk=gtde{IcJk| z7CC2#2Pnl!nV&UisTw2*MM9Dat+8eAlHCg19A<>H6Yi3Tmy2Ak!$dO=iAO`ae!Q7 z;^l}j1$ZQu`N*7-!Dxn4IiD<9LKjjp{^TOju+i~XKxsR@Nsz8 z(`~hJT={pCE>sp1!$(pl3Tpa>sy-l1D)B{i4RyL@s0}kIbw98S≫+*VVP-%EU4i zr)G~*!_a(7_i;}34@whCJJ3z^$uT`$t(#G429~aQmf;yfT{DfcIBvcb*hXMs!-)Nw zZK}1?NGFw;P`FH%@EzAwYsQsRmQMPFdj%8T*Id)kT}xG_Q+C8_A4`Si`<~(WYV~x| z38ke+!|RqQP`SEv<*Q{&Y}%L}@t!Sgp{|Pf)C7;I>Ut(-;ExXj8$R=jEYD%^js)-E zL2w#&Y)Q?NIvHEo#i}Ng2U}%KTs_cj4SQJEvG_c5vcFSQ+$GA^T{~KYW+>mvrSm8yXU&T;~W@BQGnTc>nOl-4B$pD zZJOBPYrgK-riDkv(Nao2d}OH%LfTuZ9Nk=G2k=CBhCRt_R?8MjUrN`dOVS1Dv~)sx zS=xKw;gS+_aBnlVe&TGAc&a6))=hM|5~Q@4YHS}*1Bs=YV@gd>O%YXOtRcazk7a8U z@z=#veS&I?sk#KE#?+bw)euv)32JRj)l7}}RH{DalqoJ%7gN;OV!5I zswt{`bZnTzWBfbl?E2E;y4T8ze1a8ITVrKM!lErP)t(q)b4;}*RGVUIV}k08sn!J5 z5mOryRC`PX5mk)7J#bapV$M&KZI_&y4p5d zOkHz@>$|pE+&H5Yzu!F!>f64rw$7r&7qx}wn7X=QHl?lMceQUhYEYa}itPmUKX{tr z@$1i`)D6uu3=<2QH={BtKbo+xNSdl!QHCMM7v^gmT0BVe^S=@0z-0{TEzUB9Q<9 delta 548 zcmZXQKWI}?6o=2bzmw#V);7VSrW8#EHv?(X*peY82nL+GNF78fQS4B#)TJOubg`4X z=PlGlh_;C9>xJ4y2Zs(W{-IP#gc5NGIQYN}skP#bwV*g$xc9ribG~zLZB1(P;tqzn zOhjcbS?uo8p9cM_k8=GM2{#F|YFl05rtiID-OT^&yAxBrlt`S&-DKvRzL39`%%w9U z$!w;O9WCU?vYFxGbmlKKa@x#}J~$R-?Ao4m2D>KS`xQs2=tS)~gbJYn538tP8q>bl z2SI~QdS1#@CSEv>LO|#sFmd?|9aIPYB__B&AQn{#OQ_n=1a$Sr;{#v$k1tB4#3AcT z@xo#x#%F!+JU?HE^Ncbwx7X8;4gp()Ed*$xWBa^)wr#7?4l?0vMMaH zB<`5iwh7Cn`uP51-iN5sV8B!?d z$g-U*P`_ERvA)kfmT(TG18$1j>keY5>qskQ#dBS;nB^~%a>P=?TfD{!o}z9idxbAhe#A~37ar*Ex(IJ7d-O|!A_&a diff --git a/k4ever/main/templates/base.html b/k4ever/main/templates/base.html index dc0f2d1..70b0584 100644 --- a/k4ever/main/templates/base.html +++ b/k4ever/main/templates/base.html @@ -1,23 +1,29 @@ + + + + + + Freitagsrundenkasse