From 9729e675ff039eb0b83983be751047c550cd70bd Mon Sep 17 00:00:00 2001 From: Konrad Mohrfeldt Date: Wed, 12 Oct 2011 21:13:21 +0200 Subject: [PATCH 01/12] migrated to api2 --- k4ever/media/js/k4ever.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/k4ever/media/js/k4ever.js b/k4ever/media/js/k4ever.js index 517255a..2a6da22 100644 --- a/k4ever/media/js/k4ever.js +++ b/k4ever/media/js/k4ever.js @@ -5,20 +5,20 @@ jQuery(document).ready(function($) { var lock = false; var items = [false]; - $.getJSON('/api/store/', function(data) { + $.getJSON("/api2/buyable/item", function(data) { if(data.error === undefined) { source = []; - $.each(data, function(key, val) { - items[val.pk] = val; - + $.each(data, function(key, item) { + items[item.id] = item; + source.push({ - value: val.pk, - label: "" + - val.fields.name + "" + - "" + val.fields.name + - "
Preis: " + val.fields.price.toFixed(2) + + value: item.id, + label: "" + + item.name + "" + + "" + item.name + + "
Preis: " + parseFloat(item.price).toFixed(2) + " €" }); }); @@ -58,8 +58,8 @@ jQuery(document).ready(function($) { if(lock && event.keyCode === 39) { selected_item.addClass("load"); - $.get("/api/store/buy/" + selection.value + "/", { - + $.post("/api2/buyable/item/" + selection.value, { + "deposit": "1" }, function(data, status) { selected_item.removeClass("load"); From 5849239f5e4ce8634d7c573cdc94ae82cf4dec7f Mon Sep 17 00:00:00 2001 From: Konrad Mohrfeldt Date: Wed, 12 Oct 2011 21:13:43 +0200 Subject: [PATCH 02/12] updated styles for top bar --- k4ever/media/css/style.css | 210 +++++++++++++++++++++---------------- 1 file changed, 121 insertions(+), 89 deletions(-) diff --git a/k4ever/media/css/style.css b/k4ever/media/css/style.css index 18aaad9..18b0815 100644 --- a/k4ever/media/css/style.css +++ b/k4ever/media/css/style.css @@ -1,7 +1,8 @@ -/* THOSE ARE JUST TEMPORARY, I CHANGE THEM LATER INTO LOCAL RESOURCES */ +/* THOSE ARE JUST TEMPORARYLY, I CHANGE THEM LATER INTO LOCAL RESOURCES */ +/* OR DOES SHE?! */ -@import url(http://fonts.googleapis.com/css?family=Droid+Serif:regular,italic,bold,bolditalic&subset=latin); -@import url(http://fonts.googleapis.com/css?family=Droid+Sans:regular,bold&subset=latin); +@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,400,600,700); +@import url(http://fonts.googleapis.com/css?family=Istok+Web:400,700); /* jQuery Theme */ /* @import url(jquery-ui-1.8.10.custom.css); */ @@ -18,90 +19,93 @@ b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { - background: transparent; - border: 0; - margin: 0; - padding: 0; - vertical-align: baseline; + background: transparent; + border: 0; + margin: 0; + padding: 0; + vertical-align: baseline; } -/* added by seba because nobody else did this. */ .content { margin: 5px; } -/* end of addition */ body { - line-height: 1; + line-height: 1; } h1, h2, h3, h4, h5, h6 { - clear: both; - font-weight: normal; + clear: both; + font-weight: bold; + font-family: "Istok Web", inherit; } ol, ul, li { - list-style: none; + list-style: none; } blockquote { - quotes: none; + quotes: none; } blockquote:before, blockquote:after { - content: ''; - content: none; + content: ''; + content: none; } del { - text-decoration: line-through; + text-decoration: line-through; } /* tables still need 'cellspacing="0"' in the markup */ table { - border-collapse: collapse; - border-spacing: 0; + border-collapse: collapse; + border-spacing: 0; } a img { - border: none; + border: none; } /* GENERAL SETTINGS */ body { - font: 11px "lucida grande", tahoma, verdana, arial, sans-serif; -} - -h1, h2, h3, h4, h5, h6 { - font-family: 'Droid Serif', Garamond, serif; + font: 11px "Open Sans", Tahoma, Verdana, Arial, sans-serif; } p { margin-bottom: 7px; } input { - padding: 2px 5px; - border: 1px solid #E5E5E5; - background: none repeat scroll 0 0 #FBFBFB; + padding: 2px 5px; + border: 1px solid #E5E5E5; + background: none repeat scroll 0 0 #FBFBFB; } input[type=text]:focus, input[type=search]:focus, input[type=password]:focus { - background: #FAFFBD; + background: #FAFFBD; } /* HEADER */ #header { - margin-bottom: 20px; + margin-bottom: 20px; + background: #333; + background-image: -webkit-gradient(linear, left top, left bottom, from(#666666), to(#111111)); + background-image: -webkit-linear-gradient(top, #666666, #111111); + background-image: -moz-linear-gradient(top, #666666, #111111); + background-image: -ms-linear-gradient(top, #666666, #111111); + background-image: -o-linear-gradient(top, #666666, #111111); + background-image: linear-gradient(top, #666666, #111111); + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#666666', EndColorStr='#111111'); } #header > div { - padding: 5px 10px; + padding: 5px 10px; } #header .search { - background: url("img/logo.png") 10px center no-repeat #323232; - height: 40px; + background: url("img/logo.png") 10px center no-repeat transparent; + height: 40px; } #header .search input[type='search'] { @@ -110,73 +114,99 @@ input[type=text]:focus, input[type=search]:focus, input[type=password]:focus { } #header .search form { - float: right; - line-height: 40px; + float: right; + line-height: 40px; } #header .base_nav { - background: url("img/base_nav_bg.gif") repeat-x #339DD1; - text-transform: uppercase; - height: 50px; - color: white; + background: #3398cc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#32bbef), to(#3398cc)); + background-image: -webkit-linear-gradient(top, #32bbef, #3398cc); + background-image: -moz-linear-gradient(top, #32bbef, #3398cc); + background-image: -ms-linear-gradient(top, #32bbef, #3398cc); + background-image: -o-linear-gradient(top, #32bbef, #3398cc); + background-image: linear-gradient(top, #32bbef, #3398cc); + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#32bbef', EndColorStr='#3398cc'); + text-transform: uppercase; + color: white; + border-bottom: 2px solid black; + padding-top: 10px; + /*border-top: 2px solid black;*/ + -webkit-box-shadow: 0 3px 8px 0 black inset; } #header .base_nav h1 { - color: white; - float: left; - margin-right: 20px; - line-height: 50px; + color: white; + display: inline-block; + margin: 0 20px 0 0; + padding: 5px 0 0 0; + vertical-align: middle; + line-height: 1; + text-shadow: 0 -1px #777; } #header .base_nav ul { - float: left; + display: inline-block; + vertical-align: middle; } #header .base_nav ul li { - display: inline-block; - text-transform: uppercase; - line-height: 36px; + display: inline-block; + font-weight: bold; + margin-right: 10px; } #header .base_nav a { - display: block; - margin-top: 7px; - padding: 0 10px; - text-decoration: none; - color: white; + text-align: center; + //background: #3398cc; + display: block; + vertical-align: middle; + text-decoration: none; + color: inherit; + padding: 10px 15px; + margin: 3px 0; + -webkit-border-radius: 20px; + -moz-border-radius: 20px; + border-radius: 20px; + -webkit-transition: background .2s; } #header .base_nav a:hover { - background: white; - color: #339DD1; + -webkit-transition: background .2s; + background: white; + color: #339DD1; + -webkit-box-shadow: 0 1px 0 0 #777 inset; + -moz-box-shadow: 0 1px 0 0 #777 inset; + box-shadow: 0 1px 0 0 #777 inset; } span.balance { - float: right; - line-height: 50px; + float:right; + padding: 10px 0; + margin: 3px 0; } /* LOGIN FORM */ form.login { - width: 300px; - margin: 60px auto; - /*-moz-box-shadow: 3px 3px 6px #333; - -webkit-box-shadow: 3px 3px 6px #333;*/ - box-shadow: 1px 1px 2px #eaeaea; - border: 1px solid #E5E5E5; - padding: 20px; + width: 300px; + margin: 60px auto; + -moz-box-shadow: 1px 1px 2px #eaeaea; + -webkit-box-shadow: 1px 1px 2px #eaeaea; + box-shadow: 1px 1px 2px #eaeaea; + border: 1px solid #E5E5E5; + padding: 20px; } form.login label { - display: block; - margin-top: 10px; - margin-bottom: 3px; + display: block; + margin-top: 10px; + margin-bottom: 3px; } form.login input { - font-size: 24px; - width: 97%; + font-size: 24px; + width: 97%; } form.login input[type=submit] { @@ -214,37 +244,39 @@ form.login input[type=submit]:active { /* NOTIFICATIONS */ div.error, div.notice, div.success { - border-top: 1px solid #DDD; - padding: 0.6em 0.8em; - position: fixed; - bottom: 0; - width: 100%; + border-top: 1px solid #DDD; + padding: 0.6em 0.8em; + position: fixed; + bottom: 0; + width: 100%; } div.error h2, div.notice h2, div.success h2 { - font-size: 100%; - font-weight: bold; - margin-bottom: 10px; + font-size: 100%; + font-weight: bold; + margin-bottom: 10px; } div.error { - background: #FBE3E4; - color: #8A1F11; - border-color: #FBC2C4; + background: #FBE3E4; + color: #8A1F11; + border-color: #FBC2C4; } + div.error a { color:#8A1F11; } div.notice { - background: #FFF6BF; - color: #514721; - border-color: #FFD324; + background: #FFF6BF; + color: #514721; + border-color: #FFD324; } + div.notice a { color:#514721; } div.success{ - background: #E6EFC2; - color: #264409; - border-color: #C6D880; + background: #E6EFC2; + color: #264409; + border-color: #C6D880; } div.success a { color:#264409; } @@ -384,11 +416,11 @@ table.details td { } .content a:hover { - background: #3398CC; - color: white; + background: #3398CC; + color: white; } .content h1 { - font: 20px "lucida grande", tahoma, verdana, arial, sans-serif; + font-size: 20px; text-align: center; } From 1051d7cec1b32f02cea8c80d1042790c6642c527 Mon Sep 17 00:00:00 2001 From: Konrad Mohrfeldt Date: Wed, 12 Oct 2011 23:56:29 +0200 Subject: [PATCH 03/12] dont track the media/img folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1a7ece8..758068a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ *.bak *~ k4ever/k4ever.db +k4ever/media/img/ *.kdev4 .kdev4 From bb960dcba3ae1e00e84fd5d7661c76285fbaac2c Mon Sep 17 00:00:00 2001 From: Konrad Mohrfeldt Date: Thu, 13 Oct 2011 00:55:36 +0200 Subject: [PATCH 04/12] added deposit, payment and payment+deposit images --- k4ever/media/css/img/deposit.png | Bin 0 -> 645 bytes k4ever/media/css/img/payment.png | Bin 0 -> 1488 bytes k4ever/media/css/img/payment_deposit.png | Bin 0 -> 2071 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 k4ever/media/css/img/deposit.png create mode 100644 k4ever/media/css/img/payment.png create mode 100644 k4ever/media/css/img/payment_deposit.png diff --git a/k4ever/media/css/img/deposit.png b/k4ever/media/css/img/deposit.png new file mode 100644 index 0000000000000000000000000000000000000000..0497e3d06564d76391cfca1c11f7f41144c71090 GIT binary patch literal 645 zcmV;00($+4P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2ipn^ z6*@Xi1BV3w00IR`L_t(o!^PJzXwyLy$MMfUBo!Uhp%n|FxapvalPDDlV$ewkaT4ty z4#h!;gV}_D8l=#rXa_Csf}#?Ufa0KwS_i?wML~+S78eCutqwiqh)HSMIc@8JigDBSEK!eDUG&8XU{SExPL#?C&v7?E9H8!RNv1XCjsa&<9+C~3C^Z}9o5n#u1B7OnMJC4*9woD#)l@cSJAjH+u-mVCNPc{OFZx= zZsTp3PvMP9zF9xXHP?wkc~hY5ZL;_2 f)lvah(=3iZ%bjrW(b{lk00000NkvXXu0mjfp7A2a literal 0 HcmV?d00001 diff --git a/k4ever/media/css/img/payment.png b/k4ever/media/css/img/payment.png new file mode 100644 index 0000000000000000000000000000000000000000..e46dff06f33a0e4ddf3c993c07fc3dfec620a4c9 GIT binary patch literal 1488 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 B&T{|& literal 0 HcmV?d00001 From def4cebcdfb59ed15404dd9151ca3c06d887033f Mon Sep 17 00:00:00 2001 From: Konrad Mohrfeldt Date: Thu, 13 Oct 2011 00:57:41 +0200 Subject: [PATCH 05/12] removed unused css bg --- k4ever/media/css/img/base_nav_bg.gif | Bin 273 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 k4ever/media/css/img/base_nav_bg.gif diff --git a/k4ever/media/css/img/base_nav_bg.gif b/k4ever/media/css/img/base_nav_bg.gif deleted file mode 100644 index 8acc05975de49a3bf26686d6952e691e0705641e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmZ?wbhEHbWMnX6xXQp_yzr{g#;3+hZWu4RX0-ag(b|Vb>mM6!er`PPlF_DTMq6JR zt$Sp=^rrE$TgG!P7%#tVyyA}Wj5Edyt{APlXSDsb(V7QF+g=&ZI%l-|z46Sm#`7;5 zZFym|>z&cgx5jfX8ZW+Xyz;KmjyJ}$&l_!c!axI{_>%=}st$+*`H6u|&w;1y@XHb> u#jc}^ZshQF9>_?E5YcMk Date: Thu, 13 Oct 2011 00:58:17 +0200 Subject: [PATCH 06/12] only populate search field when logged in --- k4ever/main/templates/base.html | 2 +- k4ever/media/js/k4ever.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/k4ever/main/templates/base.html b/k4ever/main/templates/base.html index 41ce0ab..e1e4207 100644 --- a/k4ever/main/templates/base.html +++ b/k4ever/main/templates/base.html @@ -1,5 +1,5 @@ - + Date: Thu, 13 Oct 2011 00:58:47 +0200 Subject: [PATCH 07/12] added raw images for deposit and payment+deposit --- devel/grafiken/deposit.png | Bin 0 -> 8768 bytes devel/grafiken/payment_deposit.xcf | Bin 0 -> 4388 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 devel/grafiken/deposit.png create mode 100644 devel/grafiken/payment_deposit.xcf diff --git a/devel/grafiken/deposit.png b/devel/grafiken/deposit.png new file mode 100644 index 0000000000000000000000000000000000000000..eee1f01c9bda9807f652abd08980c635ed176195 GIT binary patch literal 8768 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 eM3np1nb(BXV$VCu&BE6^5KP}xuUNVE;D%yy>$ literal 0 HcmV?d00001 diff --git a/devel/grafiken/payment_deposit.xcf b/devel/grafiken/payment_deposit.xcf new file mode 100644 index 0000000000000000000000000000000000000000..c9feea5a0b749c78363890357cf9548726e26c62 GIT binary patch literal 4388 zcmeHKOH5Q(82<0PKnIEfwIY;WlP+X|QJY3rYF&+~anr<=X@dyEq`U;ib8UDm%!sW` zY?>xkLZE6*HEF}5HoE9k(wE)XrZW_T;A4n0?JxIQSc}LviE#M#6T$oY=9M5myp@-MfjJX zUgJjCa!*}_yQP^+|%7)s8CUuihl{dK$Rj6Aw zZ!yX;!q$YT3|$W`(=};V|6Aa$T61GXrKjGlZcUB_<+0_I30=9j-qWIb>MLuinz?^N zb#-%9ONt=(epY2_mUiVlB#P2WWdAbRLcI}C0py8t8!K9Bwr$_OWpiV_8*Q@i1H}Pw z;w6xskh#OEgp7(-XUNVBIVVHT&5-jTb1W6$k_GS>TrwBh)R1LILfD8}1>kGhw^V02 z$n6fBiY;XImLyP2Hg7T6y&HfcasXN0^%*FDUMH{3TR=HW;Be(YV?MK7PRQA=)p%OT zX4E#ay6mL8kft0jH>_jm4;R9p8`ONZxu|L}f#(pq1YLN7Sv5y)1xdFz2 z(+|czFotaRgRu{cePHa<$+wdqrO=f4z}N?lJ}~w%{r3se&w4U@=q*cZrEA$fS`=m|kMJyd)Nre>KHx*}B zmGVh<T7v<9aVS|E&h0 zkFmisoFnRyD_4Hx+3Bz27-U#L*Fuq^h?EzeF<2@3iIh{=yZUSJO7%jRFw#$YB_diW zX8+@8()=|4)&2W-Hfa_*_9eAnI7;H@|A*XMaPU^JsFcQquhCOA0WO8BX$8Mqo8#{HFOL+22X zNs+5a5phjuilz%(IX0P1^P=tB$tSZT*NzK8cBrywPMn&Uk36283=MRqb-#pX=l*&) zac}rWS{Is_3QtXpjSdF2RNwI3vGMWH?V-R}+Alc&;LhmC;Mnx9Y2C?zM^Pzb(}DCD zT6gQE{$TL>h1Roazk!jS4k1qT-nwb(6wE=X6UkA6=C2$N_xrgHUo>!s^~ z0K#;cw8G+piG|4G>;p`wtzBpcmLL)qscHSJO=dotxaf19kN6?YB3SM zcVD?b6&f81j)__jJ zHJsav!EZnX=^q{pA^mLTG+z${`!BSe1#`FPG*-e$q|tj|q_-Ut>KWqTBci+Ya(^(; ze;(P)49yA0f@@g(1Ql~^lR4I+OL&C)NX8aG@Hr72>FvPsGILU}k2N!k=UW9wp97iXmeFwH z<5*3Lh-&7FDq?}TaL%#DxN@XIi&$`T&GX2D`(ow%tel^f^TUUE<@~I?e^%Z<>Gz58 zetFLCA1B3j_08Zl6z_WnfBkx|bU@7G|AP*hE%nnZ&B#@BeI>=8)2 Date: Thu, 13 Oct 2011 01:37:28 +0200 Subject: [PATCH 08/12] updated start page view --- k4ever/main/templates/main/product_list.html | 31 +++ k4ever/main/templates/main/startpage.html | 265 +++---------------- k4ever/media/css/style.css | 117 +++++--- 3 files changed, 152 insertions(+), 261 deletions(-) create mode 100644 k4ever/main/templates/main/product_list.html diff --git a/k4ever/main/templates/main/product_list.html b/k4ever/main/templates/main/product_list.html new file mode 100644 index 0000000..8fc65b2 --- /dev/null +++ b/k4ever/main/templates/main/product_list.html @@ -0,0 +1,31 @@ +{% if buyables %} + {% if removeWrapper == None %} + + + {% endif %} + {% for buyable in buyables %} + + + + + + {% endfor %} + {% if removeWrapper == None %} + +
+ + {{ buyable.buyable__name }} ({{ buyable.num_buys }} mal gekauft) + {% if buyable.buyable__deposit > 0 %} + Kaufen (Ohne Pfand) + Kaufen (Mit Pfand) + {% if includeDeposit %} + Kaufen (Nur Pfand) + {% endif %} + {% else %} + Kaufen + {% endif %} +
+ {% endif %} +{% else %} +

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

+{% endif %} \ No newline at end of file diff --git a/k4ever/main/templates/main/startpage.html b/k4ever/main/templates/main/startpage.html index 38c0e11..c0c2040 100644 --- a/k4ever/main/templates/main/startpage.html +++ b/k4ever/main/templates/main/startpage.html @@ -1,238 +1,45 @@ {% extends "base.html" %} {% block "content" %} -
- {% if allMostDrinks or allMostSnacks %} - - - - - - - - - - - - - - - - - - - + {% if allMostDrinks or allMostSnacks %} +
-   - -

Die beliebtesten Artikel

- 		-

Deine Lieblingsartikel

- 		-

Zuletzt hattest du:

-
-

Getränke

- 		- {% if allMostDrinks %} - - {% for buyable in allMostDrinks %} - - - - - - {% endfor %} -
- - - {{ buyable.buyable__name }}
({{ buyable.num_buys }} mal) - 		- Kaufen - {% if buyable.buyable__deposit > 0 %} - (Ohne Pfand) Kaufen (Mit Pfand) - {% else %} - - {% endif %} - -
- {% else %} - Noch keine gekauft. - {% endif %} - 		- {% if usersMostDrinks %} - - {% for buyable in usersMostDrinks %} - - - - - - {% endfor %} -
- - - {{ buyable.buyable__name }}
({{ buyable.num_buys }} mal) - 		- Kaufen - {% if buyable.buyable__deposit > 0 %} - (Ohne Pfand) Kaufen (Mit Pfand) - {% else %} - - {% endif %} - -
- {% else %} - Noch keine gekauft. - {% endif %} - 		- {% if usersLastDrinks %} - - {% for buyable in usersLastDrinks %} - - - - - - {% endfor %} -
- - - {{ buyable.buyable__name }} - - Kaufen - {% if buyable.buyable__deposit > 0 %} - (Ohne Pfand) Kaufen (Mit Pfand) - {% else %} - - {% endif %} - -
- {% else %} - Noch keine gekauft. - {% endif %} -
-

Snacks

- 		- {% if allMostSnacks %} - - {% for buyable in allMostSnacks %} - - - - - - {% endfor %} -
- - - {{ buyable.buyable__name }}
({{ buyable.num_buys }} mal) - 		- Kaufen - {% if buyable.buyable__deposit > 0 %} - (Ohne Pfand) Kaufen (Mit Pfand) - {% else %} - - {% endif %} -
- {% else %} - Noch keine gekauft. - {% endif %} - 		- {% if usersMostSnacks %} - - {% for buyable in usersMostSnacks %} - - - - - - {% endfor %} -
- - - {{ buyable.buyable__name }}
({{ buyable.num_buys }} mal) - 		- Kaufen - {% if buyable.buyable__deposit > 0 %} - (Ohne Pfand) Kaufen (Mit Pfand) - {% else %} - - {% endif %} -
- {% else %} - Noch keine gekauft. - {% endif %} - 		- {% if usersLastSnacks %} - - {% for buyable in usersLastSnacks %} - - - - - - {% endfor %} -
- - - {{ buyable.buyable__name }} - - Kaufen - {% if buyable.buyable__deposit > 0 %} - (Ohne Pfand) Kaufen (Mit Pfand) - {% else %} - - {% endif %} -
- {% else %} - Noch keine gekauft. - {% endif %} -
+ + + + + + + + + + + + + + + + + + + + +
 Die beliebtesten ArtikelDeine Lieblingsartikel + Zuletzt hattest du
Getränke + {% include "main/product_list.html" with buyables=allMostDrinks %} + + {% include "main/product_list.html" with buyables=usersMostDrinks %} + + {% include "main/product_list.html" with buyables=usersLastDrinks %} +
Snacks + {% include "main/product_list.html" with buyables=allMostSnacks %} + + {% include "main/product_list.html" with buyables=usersMostSnacks %} + + {% include "main/product_list.html" with buyables=usersLastSnacks %} +
{% else %} {{ error }} Es hat scheinbar noch niemand etwas gekauft. Sei der Erste! {% endif %} -
- - {% comment %} -
- {% if usersMostSnacks or usersMostDrinks %} -

Deine Lieblingsartikel

- - - - - - - -
- Getränke - - Snacks -
- {% else %} - {{ error }} - Wie es aussieht, hast du noch nichts gekauft. Das kannst du ändern! - {% endif %} -
-
- {% if usersLastSnacks or usersLastDrinks %} -

Du hattest als letztes:

- - - - - - - -
- Getränke - - Snacks -
- {% else %} - {{ error }} - {% endif %} -
- {% endcomment %} {% endblock %} diff --git a/k4ever/media/css/style.css b/k4ever/media/css/style.css index 18b0815..b76ddc5 100644 --- a/k4ever/media/css/style.css +++ b/k4ever/media/css/style.css @@ -26,6 +26,10 @@ table, caption, tbody, tfoot, thead, tr, th, td { vertical-align: baseline; } +a:focus { + outline: none; +} + .content { margin: 5px; } @@ -34,7 +38,7 @@ body { line-height: 1; } -h1, h2, h3, h4, h5, h6 { +h1, h2, h3, h4, h5, h6, th { clear: both; font-weight: bold; font-family: "Istok Web", inherit; @@ -96,6 +100,7 @@ input[type=text]:focus, input[type=search]:focus, input[type=password]:focus { background-image: -ms-linear-gradient(top, #666666, #111111); background-image: -o-linear-gradient(top, #666666, #111111); background-image: linear-gradient(top, #666666, #111111); + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#666666', EndColorStr='#111111'); } @@ -131,8 +136,9 @@ input[type=text]:focus, input[type=search]:focus, input[type=password]:focus { color: white; border-bottom: 2px solid black; padding-top: 10px; - /*border-top: 2px solid black;*/ + -moz-box-shadow: 0 3px 8px 0 black inset; -webkit-box-shadow: 0 3px 8px 0 black inset; + box-shadow: 0 3px 8px 0 black inset; } #header .base_nav h1 { @@ -371,56 +377,103 @@ html body div#header div.search ul.ui-autocomplete li.ui-menu-item.focus { font-weight: bold; } -/* TABLE */ -/* Edited by Theri */ table.showitem { - border:1px solid #DFDFDF; - border-collapse: separate; - border-spacing: 5pt; + border: 0 none; + border-collapse: collapse; + width: 100%; } -table.showitem td { - vertical-align: middle; +table.showitem td.productImage { + width: 80px; + text-align: center; +} + +table.showitem td.productImage img { + max-width: 100%; + max-height: 64px; } table.showitem th { - vertical-align: middle; + font-size: 20px; text-align:center; } -table.details { - border-width: 0px; - margin-top: 25px; +table.showitem td.name { + padding: 0 10px; } -table.details th { - vertical-align: middle; - text-align: center; +table.showitem td.name span { + display: block; + font-weight: bold; } -table.details td { +table.showitem td, table.showitem th { vertical-align: middle; - text-align: center; } -.content a { - color: #3398CC; - text-decoration: none; +table.showitem tr td { + padding-bottom: 10px; } - -.content a.button { - text-align: center; + +table.showitem th[scope="row"] { + width: 20px; + padding: 0; + margin: 0; + -moz-transform: rotate(270deg); + -webkit-transform: rotate(270deg); + -ms-transform: rotate(270deg); + -o-transform: rotate(270deg); + transform: rotate(270deg); +} + +a.buyButton { display: block; - margin-top: 7px; - padding: 0 10px; + padding: 5px 10px; + height: 32px; + text-align: center; + border-radius: 6px; + float: left; + margin-right: 10px; + + background-image: -webkit-gradient(linear, left top, left bottom, from(#666666), to(#111111)); + background-image: -webkit-linear-gradient(top, #666666, #111111); + background-image: -moz-linear-gradient(top, #666666, #111111); + background-image: -ms-linear-gradient(top, #666666, #111111); + background-image: -o-linear-gradient(top, #666666, #111111); + background-image: linear-gradient(top, #666666, #111111); + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#666666', EndColorStr='#111111'); + + -moz-box-shadow: 0 1px 3px 0 black; + -webkit-box-shadow: 0 1px 3px 0 black; + box-shadow: 0 1px 3px 0 black; +} + +a.buyButton:hover { + background-image: -webkit-gradient(linear, left top, left bottom, from(#555555), to(#000000)); + background-image: -webkit-linear-gradient(top, #555555, #000000); + background-image: -moz-linear-gradient(top, #555555, #000000); + background-image: -ms-linear-gradient(top, #555555, #000000); + background-image: -o-linear-gradient(top, #555555, #000000); + background-image: linear-gradient(top, #555555, #000000); + + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#555555', EndColorStr='#000000'); } -.content a:hover { - background: #3398CC; - color: white; +a.buyButton:active { + -moz-box-shadow: 0 1px 3px 0 black, 0 1px 3px 0 black inset; + -webkit-box-shadow: 0 1px 3px 0 black, 0 1px 3px 0 black inset; + box-shadow: 0 1px 3px 0 black, 0 1px 3px 0 black inset; } -.content h1 { - font-size: 20px; - text-align: center; +a.buyButton.includingDeposit span { + background-image: url("img/payment_deposit.png"); + min-width: 65px; +} + +a.buyButton span { + display: block; + height: 100%; + min-width: 32px; + background: url("img/payment.png") no-repeat center center transparent; + text-indent: -10000px; } From f48d01ff1a2c3ec713efef1dc8a83e82fe3e7161 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 13 Oct 2011 03:02:55 +0200 Subject: [PATCH 09/12] client-barcode: Integrate feedback from Theresa into howto sheet --- client-barcode/doc/freitagskasse.svg | 42 +++++++++++++++------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/client-barcode/doc/freitagskasse.svg b/client-barcode/doc/freitagskasse.svg index 12e412b..d98e018 100644 --- a/client-barcode/doc/freitagskasse.svg +++ b/client-barcode/doc/freitagskasse.svg @@ -16,7 +16,7 @@ inkscape:version="0.48.2 r9819" sodipodi:docname="freitagskasse.svg"> HOWTO Freitagskasse v3 + id="title3609">HOWTO Freitagskasse v3.1 image/svg+xml - HOWTO Freitagskasse v3 + HOWTO Freitagskasse v3.1 Sebastian Pipping <sebastian@pipping.org> @@ -1714,7 +1714,7 @@ sodipodi:cy="-88.048378" sodipodi:rx="14.770664" sodipodi:ry="14.770664" - d="m -100.22934,-88.048378 a 14.770664,14.770664 0 1 1 -29.54132,0 14.770664,14.770664 0 1 1 29.54132,0 z" + d="m -100.22934,-88.048378 c 0,8.157613 -6.61305,14.770664 -14.77066,14.770664 -8.15761,0 -14.77066,-6.613051 -14.77066,-14.770664 0,-8.157613 6.61305,-14.770662 14.77066,-14.770662 8.15761,0 14.77066,6.613049 14.77066,14.770662 z" transform="translate(188.15166,537.71419)" /> 3 + transform="translate(0,161.9389)"> + id="g4416" + transform="translate(7.1428575,-17.709575)"> ... allein Nur Pfand + transform="matrix(1.25,0,0,-1.25,853.67689,1044.1709)"> @@ -2374,7 +2374,8 @@ + id="g6038" + transform="translate(-2.4999999e-6,-483.00422)"> + id="g5879" + transform="translate(0,161.9389)"> Date: Thu, 13 Oct 2011 19:08:00 +0200 Subject: [PATCH 10/12] client-barcode: Repair deposit, bug reported by Florian --- client-barcode/freitagslib/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-barcode/freitagslib/commands.py b/client-barcode/freitagslib/commands.py index 333ead8..f986c40 100644 --- a/client-barcode/freitagslib/commands.py +++ b/client-barcode/freitagslib/commands.py @@ -13,7 +13,7 @@ class DepositCommand(object): self._difference = amount def difference(self): - self._difference + return self._difference def run(self, user_name): net.deposit(self._difference, net.DEPOSIT_CASH, user_name) From aa204aea029f35fe153b81b1f7a847b083fd9273 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 13 Oct 2011 20:51:47 +0200 Subject: [PATCH 11/12] client-barcode: Increase visibility of commit reminder --- client-barcode/freitagskasse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-barcode/freitagskasse.py b/client-barcode/freitagskasse.py index 0d16bf5..ae4886e 100644 --- a/client-barcode/freitagskasse.py +++ b/client-barcode/freitagskasse.py @@ -146,7 +146,7 @@ class Status: warn_balance() print() - print(COLOR_SOME + 'Committen nicht vergessen.' + COLOR_RESET) + print(COLOR_MUCH + 'Committen nicht vergessen.' + COLOR_RESET) else: print('Kontostand beträgt: %s%.2f Euro%s' % (COLOR_MUCH, self.balance, COLOR_RESET)) if self.balance < 0: From 56673f9936c7ad8113e0c29b0da9935d54f49dff Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 13 Oct 2011 20:54:02 +0200 Subject: [PATCH 12/12] client-barcode: Turn "UNDO" into "STORNO" on howto sheet --- client-barcode/doc/freitagskasse.svg | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/client-barcode/doc/freitagskasse.svg b/client-barcode/doc/freitagskasse.svg index d98e018..e6d543c 100644 --- a/client-barcode/doc/freitagskasse.svg +++ b/client-barcode/doc/freitagskasse.svg @@ -16,7 +16,7 @@ inkscape:version="0.48.2 r9819" sodipodi:docname="freitagskasse.svg"> HOWTO Freitagskasse v3.1 + id="title3609">HOWTO Freitagskasse v3.2 image/svg+xml - HOWTO Freitagskasse v3.1 + HOWTO Freitagskasse v3.2 Sebastian Pipping <sebastian@pipping.org> @@ -1054,7 +1054,8 @@ id="rect3535-9" />1 Euro + id="g6092" + transform="translate(-1.09375e-6,0)"> 10 Euro + transform="translate(-3.9999988,0)"> COMMIT + transform="translate(-19.933595,0)"> UNDO + id="flowPara3537-0-75-7">STORNO