From 4910a387d920247d427fd8d4be6a5efaf267af11 Mon Sep 17 00:00:00 2001 From: Konrad Mohrfeldt Date: Sun, 16 Oct 2011 13:03:11 +0200 Subject: [PATCH] updated account view template and styles --- k4ever/media/css/img/approved.png | Bin 0 -> 929 bytes k4ever/media/css/img/cash.png | Bin 0 -> 881 bytes k4ever/media/css/img/pending.png | Bin 0 -> 1455 bytes k4ever/media/css/img/transfer.png | Bin 0 -> 703 bytes k4ever/media/css/style.css | 53 +++++++++- k4ever/media/css/style.less | 70 +++++++++++- .../templates/transaction/overview.html | 100 +++++++----------- 7 files changed, 160 insertions(+), 63 deletions(-) create mode 100644 k4ever/media/css/img/approved.png create mode 100644 k4ever/media/css/img/cash.png create mode 100644 k4ever/media/css/img/pending.png create mode 100644 k4ever/media/css/img/transfer.png diff --git a/k4ever/media/css/img/approved.png b/k4ever/media/css/img/approved.png new file mode 100644 index 0000000000000000000000000000000000000000..6b4044799989dbcf0e226a569b11fbe52fac310d GIT binary patch literal 929 zcmV;S177@zP)(^b8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H110G34K~zYI?Ul<<6Hyq&&ve?(P^crt(iavYVk;twVh!;vq7fAn zgT@tZj7Fkp+?cR2>Yt!dH^xNK#D(uiSf~g-P{PCbqNuf$Qd+UJP@J~Ynd!Kp31C4I zVPWD)zSaHi@67pb=3YXQB+R5_GfMw&FcrzC1Cqb}O!d;m^Q!0S)w$OmzS-{KUo}b% z4FWI?334|bUNC>Y>Coau=0z53Hl3x_oY0fDHHr1VN|0AtldCo4ecHCUkW@2jNB}Cz zSCl<@_O=*+CaHm@_#m^htfYog$eb5XSJh1fU$OgCRerwp=&BMcDTpG1fk6O(-yeWV zNe(3X#*8ShyqwZ!X4IxJ^huErPg>Rc zt^3_a$JInHk@%DKOR7>CU1se{o3++#$^g&vXliPc`h8xT9rm+QxmlNf#3Wfkr! zN!6vkEG$?`P)Zs~ih@E(L5xT7=+;?m*|8rgl@@})15z9sCI!tcFJZU$?De(XxsmL= zi1D|nVOhmGy)pfY(Ufgw7$ayp1#-C@ge(q1l0y&#L?aOl4te11a}IiYgNOS%?q5p= zA2XtayzTcI{XXCI-k#5%C>KUFB7);2#5e_hhDERu5#d-2ZgF!^Qg;VuMc#!otp|A03b=y zqyED0RX58Qx_I!t%O4+dx00000NkvXXu0mjf DzjCV1 literal 0 HcmV?d00001 diff --git a/k4ever/media/css/img/cash.png b/k4ever/media/css/img/cash.png new file mode 100644 index 0000000000000000000000000000000000000000..6201c00e15ce337d3f33ece1a48b45554751bf7d GIT binary patch literal 881 zcmV-%1CIQOP)z zJ8v9S6vuyO_U?M$Ue6Aj1Uayhtyn^`SR~xV@=#Di&lhk$i@yK`1r0SR5Je~m0VR=W zA_b6uM2?)`*g@;~wGZ#?+(R+XwcNOH!EJVC?w$YnKhBvIRply|bEW8)S&z0><{xdX ze0JIQE~DUU;O^tCm2WRoz$6#zn`^2lAQ1nGM0-(8$GrE+7wr7_&F8l_*V5pk(~5|2 zF3#33U;cVz0B&!7yiu-}@ju-l2m-8H)LN`nEEa1+cyW(ntp&gbAKju-uVJl4ZHQGx zRk7A`&AZNnAATkb!yfQctU!7T?gBQnI8K4GDM!p>hSPAGmqN4F!fSge)kOJze~*c z7~|KQ4IIZ|JQ-yfs3L%f6Wb73<~UAjjJ45ot5f<%eX8Xe^=1`SdH`nq&f15~W`l4# z#Sw>ErH;gW6VQ6K5kZTfKqJ0i?A%PxBt3OJIAS;%(P-9Lzq7XC0A083GPP5RrkIAS z5Vam)jF}196ii$`X@dw{1ZtHUqu~Iz?E>@+&~rVPAP6`N4naXB3Jw(2%yWqcIiZQyGQ*EoaUoT_R)+<*#q3~aHUSI= z1CUt3cXz*!9!umxa-DyFV+jtP{|O>IeDE+nd*K8l$sXbx;7NCN(U+{}Vz09biXy{5 za7+n+8_U-yRf;*jSraRYAWY5zcK_bHZ-Cy5r>`PxC1pn3O9?q$0#h!5D!b43&PhyI zXA0uw8-XY9uP*xe)=Z&AvI@iBDHKZ}!n@1YGX*JfuAsnV94pYgf(usa?-H1~=o_{B zY(IlLms_e{atgYuH~qxH%*$M82n>FsP?`f(ZY+10tCX@mvY|}wgUOVC{(61iDB9b8 z`Z5E{F`D_#FA3ZCz5)?mKiiLh64iPUJwd>i|NWo-l^6IASUZk@I73Vl00000NkvXX Hu0mjf626!+ literal 0 HcmV?d00001 diff --git a/k4ever/media/css/img/pending.png b/k4ever/media/css/img/pending.png new file mode 100644 index 0000000000000000000000000000000000000000..cb7015af922553182def1d66706e31a79f237921 GIT binary patch literal 1455 zcmV;g1yK5lP)v2raoeO2+FJy%>BS|N`p}boDHNL?Ov#}w=w?Iho1vj5*m6TDVSBK47YXd8Es<*x zZ=>kXF1GgD-I@8mZ+eh+EujiOcnr*g_j~i+n|ULgbL=GZ^YcTAM4}+2%sb~Mfc%E3 zB!nnOQB(@UaOS{)14}#k5dRNQE|*n*fBz*R#6>`DGPO3=^rk&4gt**jG_FicOxPC! zs@3W^a1A)>oNGlM3YX=#ZkPo9u+^XwfNB)j`<)UG}&rL;nbG%yF88yg#&-4QT5 zJNqH<(MHrktyaraDiyNXEF&W$jEszsZT^9$kN?CMONy2D2!{$k=atvq4S)<_feYi~ z)0mKLr_dJmy&AJH_d8Oll+s$OX0usH7-RAPzVEBS!9kQ#bPMmC z!#RhPa=rOeX{=47EkrTI8ydNdH3k_y##gb@S_9-0TI&fR1WG9e1_pZ3Z-#_nxPF3U z3U33@b+{Q2$B^_RT;~zSD4cT>31duNO4*W9rUwQFSX^AhImhtu@RkecoTKrygJ~*u zXE#M3L+qZz5)wLV{~`=WTTv9{J*_p?+Fq{*K|rh3+R{Ou=OLvew`Y{L_f2a0o#zD( zw-(z*;K>BmTC~J_wIH0vX$WVzQ5pH{5(}L zbS(HUy+QErdfGYnsb{S%8)IlR8e1aXN%y|CpLgDUkFSD*eD?VdX|~mtZVE%t(bq7> zV682C#+Z`Unx&;Bn@A*H2=F|QJ$qi|{4ahmRJHt_BAW9^B>o{*I0}tMB`K`}lWx{m^?XeEwH1_|GfB z;^JZ^48z}Cy?XT%58&CeXP33sbJc1!Q>j#(wYK;Ebk*}bYPA}*T5X%HfA9c5{@`!O zmw)D})oMm-J=bhDuk;?fsi`TewLWKzvA1sB(#2xYHJi19m|{5Kt;V zaDV>zt~SP4t@XL7sVTc{;G8{s_Cq1WM}Rtf_;4^eIhpA`AKf%{C5~gPwXCkLa`WcR z;NioE8NfQ{E?mEUefz-a%H-tacpS&qfTO8Ys&(ST3AJzEKDB@UesZ}S04pmiJbLtq zg@pxMEEa9M-A)5@p68vrapT6$BeN^#&!1N-D=U|PEki$R0TQE)HvSRX(Q0Ku<0CX;qFy>5 z2^gpVWAK##1!BNEpT+Fny?`b*G{#fR?3~#-=X~e;X4fRKl@@Jj^#2L|#;mh{uxc;@ z)G&iq(l@R*m;f`QRVc;U%*K!goSBVu_w>|yj~>a7loR&bngAh%VCBo?zVObw*Kcam z6B8p2sn&a>kG0iRyaW=G@DlQ(;XU#mwfZG|qk$xbZ=Yp*d$O*C<&`yV4a3yLL@iQY zl=2e12#_U&)`18G&}@lWv?(~iwk$5%gbOeY?>)8oTkKq$Z?>SHK*4UQDn-B#0ge#y+qGNTQ?h6-*vyAWGzQX8e*vtFuoFi#Zh@t>li0gO9 zu^f>o(Pdd0&X`%q=0k-)S5~MbZTLnbv`)fRD#Te#6jky-9+Yc9Drr_Bfzn(dLod%< zTMs;a(%k%#9wJRsqDs{4y$}}kiC5sr08c486^a5}kxkz7s$+<{gbZRAlO&FcSvVc) zF2uj-epnt_`LpFiPBJvSD0b5{C5nuD*H1G!vj_%{>vP<=+{?&|S-SUDc~qa}=9NAs zXBU~8TVnddBIi%-2jKne63^d$1_|rxAJnC5S6NzEB61N~)&>@V54R?eW?)+HYazB6 zTDi!wl!x~p;0j+Qj!4^5kTtL5x#RozwzvWqyLP0EPk!QXR~5|IRZVzWpJPMly!T~t z>*^nTw&%dX+KDqK`LkK`9{g#)q&H0Um#_FZGc#sg$A+pDA3K#TDCE|hHxS$WT($bG lL@#N~%m(cLFZ16|@Cz`jQ}@202ps?b002ovPDHLkV1n&UQ9=L! literal 0 HcmV?d00001 diff --git a/k4ever/media/css/style.css b/k4ever/media/css/style.css index fc30a65..eca3036 100644 --- a/k4ever/media/css/style.css +++ b/k4ever/media/css/style.css @@ -155,9 +155,11 @@ a:hover { background-color: #3398cc; } .content { + max-width: 1280px; + min-width: 800px; padding: 5px; } -input { +input, select { padding: 2px 5px; border: 1px solid #E5E5E5; background: url("img/404") white; @@ -554,3 +556,52 @@ table.itemListContainer > tbody > tr:first-child ~ tr > td { vertical-align: middle; margin: 0 10px 0 0; } +.textData thead, .textData tfoot { + background-color: #111111; +} +.textData thead th, .textData tfoot th { + font-weight: bold; + color: white; +} +.textData tr:nth-child(even) td { + background-color: #eaeaea; +} +.textData tr:hover td { + background-color: #9e9e9e; +} +.textData th, .textData td { + padding: 7px 30px; + vertical-align: middle; + text-align: center; +} +.icon { + display: block; + height: 24px; + width: 24px; + text-indent: -10000px; + background-position: 0 0; + background-repeat: no-repeat; + margin: 0 auto; +} +.icon.approved { + background-image: url("img/approved.png"); +} +.icon.pending { + background-image: url("img/pending.png"); +} +.icon.cash { + background-image: url("img/cash.png"); +} +.icon.transfer { + background-image: url("img/transfer.png"); +} +.transaction { + padding: 0 30px; +} +.transaction > * { + float: none; + display: block; +} +.transaction input[type="text"], .transaction select { + font-size: 16px; +} diff --git a/k4ever/media/css/style.less b/k4ever/media/css/style.less index adc3173..5de19e7 100644 --- a/k4ever/media/css/style.less +++ b/k4ever/media/css/style.less @@ -161,10 +161,12 @@ a { } .content { + max-width: 1280px; + min-width: 800px; padding: 5px; } -input { +input, select { padding: 2px 5px; border: 1px solid #E5E5E5; background: url("@{fldImages}/404") white; @@ -560,4 +562,70 @@ table.itemListContainer { vertical-align: middle; margin: 0 10px 0 0; } +} + +.textData { + thead, tfoot { + background-color: @clrDarkGrey; + + th { + font-weight: bold; + color: white; + } + } + + tr { + &:nth-child(even) td { + background-color: @clrLightGrey; + } + + &:hover td { + background-color: darken(@clrLightGrey, 30%); + } + } + + th, td { + padding: 7px 30px; + vertical-align: middle; + text-align: center; + } +} + +.icon { + display: block; + height: 24px; + width: 24px; + text-indent: -10000px; + background-position: 0 0; + background-repeat: no-repeat; + margin: 0 auto; + + &.approved { + background-image: url("@{fldImages}/approved.png"); + } + + &.pending { + background-image: url("@{fldImages}/pending.png"); + } + + &.cash { + background-image: url("@{fldImages}/cash.png"); + } + + &.transfer { + background-image: url("@{fldImages}/transfer.png"); + } +} + +.transaction { + padding: 0 30px; + + > * { + float: none; + display: block; + } + + input[type="text"], select { + font-size: 16px; + } } \ No newline at end of file diff --git a/k4ever/transaction/templates/transaction/overview.html b/k4ever/transaction/templates/transaction/overview.html index 4ff0c7b..b8e391b 100644 --- a/k4ever/transaction/templates/transaction/overview.html +++ b/k4ever/transaction/templates/transaction/overview.html @@ -8,73 +8,51 @@

Du hast Geld aufgeladen.

 {% endif %} {% endif %} -

Konto aufladen

-
- {% csrf_token %} - - {{ form.as_table }} +

Konto aufladen

+ + {% csrf_token %} + {{ form.as_table }} + + + +

Vergangene Transaktionen

+
+ + + + + + + + + + + + {% for transaction in history %} + + + + - -
DatumUhrzeitBetragTypStatus
{{ transaction.dateTime|date:"j. F Y" }}{{ transaction.dateTime|date:"H:i" }} Uhr{{ transaction.amount|floatformat:2 }}€{{ transaction.transactionType }} -   - - + {% if not transaction.transactionType.needsCheck or transaction.checked %} + Zahlung eingegangen + {% else %} + Zahlungsbestätigung steht noch aus + {% endif %}
- -
- -

Vergangene Transaktionen:

- - {% comment %} - - - - - - - - {% endcomment %} + {% endfor %} + - {% for transaction in history %} + - - - - - {% if forloop.first and transacted %} - - {% endif %} + + + + + - {% endfor %} +
- Datum - - Uhrzeit - - Betrag - - Typ - - Status -
- {% if forloop.first and transacted %} - - {% endif %} - [ {{ transaction.dateTime|date:"j. M Y" }}, - - {{ transaction.dateTime|date:"H:i" }} Uhr ] - - {{ transaction.amount|floatformat:2 }}€ - - durch {{ transaction.transactionType }} - - {% if not transaction.transactionType.needsCheck or transaction.checked %} - eingegangen - {% else %} - aber noch nicht bestätigt - {% endif %} - DatumUhrzeitBetragTypStatus
-
{% endblock %}