diff --git a/k4ever/buyable/templates/buyables/product_list.html b/k4ever/buyable/templates/buyables/product_list.html index a20ca8d..0174db7 100644 --- a/k4ever/buyable/templates/buyables/product_list.html +++ b/k4ever/buyable/templates/buyables/product_list.html @@ -9,7 +9,7 @@ {{ buyable.name }} - + {% if buyable.hasDeposit %} @@ -21,7 +21,7 @@ {{ buyable.price|floatformat:2 }}€ / {{ buyable.deposit|floatformat:2 }}€ - {{ buyable.deposit|floatformat:2 }}€ diff --git a/k4ever/buyable/templates/buyables/showItem.html b/k4ever/buyable/templates/buyables/showItem.html index 4b7dff5..3c15227 100644 --- a/k4ever/buyable/templates/buyables/showItem.html +++ b/k4ever/buyable/templates/buyables/showItem.html @@ -14,7 +14,7 @@

{{ item.name }}

Kaufen

-
+
{{ item.price|floatformat:2 }}€ @@ -23,7 +23,7 @@ {{ item.price|floatformat:2 }}€ / {{ item.deposit|floatformat:2 }}€ - {{ item.deposit|floatformat:2 }}€ diff --git a/k4ever/main/templates/base.html b/k4ever/main/templates/base.html index aa7558c..88c831d 100644 --- a/k4ever/main/templates/base.html +++ b/k4ever/main/templates/base.html @@ -11,6 +11,7 @@ + {% block extrahead %}{% endblock %} Freitagsrundenkasse{% block "title" %}{% endblock %} diff --git a/k4ever/main/templates/main/product_list.html b/k4ever/main/templates/main/product_list.html index e6605fd..d63e744 100644 --- a/k4ever/main/templates/main/product_list.html +++ b/k4ever/main/templates/main/product_list.html @@ -9,7 +9,7 @@ {{ buyable.buyable__name }} {% if buyable.num_buys %}({{ buyable.num_buys }} mal gekauft){% endif %} - + {% if buyable.buyable__deposit > 0 %} {{ buyable.buyable__price|floatformat:2 }}€ {{ buyable.buyable__price|floatformat:2 }}€ / {{ buyable.buyable__deposit|floatformat:2 }}€ diff --git a/k4ever/media/css/img/gritter-long.png b/k4ever/media/css/img/gritter-long.png new file mode 100755 index 0000000..578b891 Binary files /dev/null and b/k4ever/media/css/img/gritter-long.png differ diff --git a/k4ever/media/css/img/gritter.png b/k4ever/media/css/img/gritter.png new file mode 100755 index 0000000..0ca3bc0 Binary files /dev/null and b/k4ever/media/css/img/gritter.png differ diff --git a/k4ever/media/css/img/ie-spacer.gif b/k4ever/media/css/img/ie-spacer.gif new file mode 100644 index 0000000..5bfd67a Binary files /dev/null and b/k4ever/media/css/img/ie-spacer.gif differ diff --git a/k4ever/media/css/img/locked.png b/k4ever/media/css/img/locked.png new file mode 100644 index 0000000..3ed70ff Binary files /dev/null and b/k4ever/media/css/img/locked.png differ diff --git a/k4ever/media/css/img/trees.jpg b/k4ever/media/css/img/trees.jpg new file mode 100644 index 0000000..00b2d5d Binary files /dev/null and b/k4ever/media/css/img/trees.jpg differ diff --git a/k4ever/media/css/jquery.gritter.css b/k4ever/media/css/jquery.gritter.css new file mode 100755 index 0000000..2489c23 --- /dev/null +++ b/k4ever/media/css/jquery.gritter.css @@ -0,0 +1,89 @@ +/* the norm */ +#gritter-notice-wrapper { + position:fixed; + top:20px; + right:20px; + width:301px; + z-index:9999; +} +#gritter-notice-wrapper.top-left { + left: 20px; + right: auto; +} +#gritter-notice-wrapper.bottom-right { + top: auto; + left: auto; + bottom: 20px; + right: 20px; +} +#gritter-notice-wrapper.bottom-left { + top: auto; + right: auto; + bottom: 20px; + left: 20px; +} +.gritter-item-wrapper { + position:relative; + margin:0 0 10px 0; + background:url('img/ie-spacer.gif'); /* ie7/8 fix */ +} +.gritter-top { + background:url(img/gritter.png) no-repeat left -30px; + height:10px; +} +.hover .gritter-top { + background-position:right -30px; +} +.gritter-bottom { + background:url(img/gritter.png) no-repeat left bottom; + height:8px; + margin:0; +} +.hover .gritter-bottom { + background-position: bottom right; +} +.gritter-item { + display:block; + background:url(img/gritter.png) no-repeat left -40px; + color:#eee; + padding:2px 11px 8px 11px; + font-size: 11px; + font-family:verdana; +} +.hover .gritter-item { + background-position:right -40px; +} +.gritter-item p { + padding:0; + margin:0; +} +.gritter-close { + display:none; + position:absolute; + top:5px; + left:3px; + background:url(img/gritter.png) no-repeat left top; + cursor:pointer; + width:30px; + height:30px; +} +.gritter-title { + font-size:14px; + font-weight:bold; + padding:0 0 7px 0; + display:block; + text-shadow:1px 1px #000; /* Not supported by IE :( */ +} +.gritter-image { + width:48px; + height:48px; + float:left; +} +.gritter-with-image, +.gritter-without-image { + padding:0 0 5px 0; +} +.gritter-with-image { + width:220px; + float:right; +} diff --git a/k4ever/media/css/style.css b/k4ever/media/css/style.css index 15c191e..38dac52 100644 --- a/k4ever/media/css/style.css +++ b/k4ever/media/css/style.css @@ -1,6 +1,8 @@ @import "http://fonts.googleapis.com/css?family=Open+Sans:400italic,400,600,700.css"; @import "http://fonts.googleapis.com/css?family=Ubuntu:400,700.css"; + +@import "jquery.gritter.css"; /* IF IM NOT A .LESS FILE DO NOT EDIT ME, BUT EDIT THE LESS FILE INSTEAD :) @see http://lesscss.org/ */ /* @@ -217,7 +219,6 @@ p { display: table-row; } #header .search ul.ui-autocomplete li.ui-menu-item:hover, #header .search ul.ui-autocomplete li.ui-menu-item.focus { - color: white; 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); @@ -229,6 +230,9 @@ p { -webkit-box-shadow: 0 0 5px #666666; box-shadow: 0 0 5px #666666; } +#header .search ul.ui-autocomplete li.ui-menu-item:hover a, #header .search ul.ui-autocomplete li.ui-menu-item.focus a { + color: white !important; +} #header .search ul.ui-autocomplete li.ui-menu-item a span { line-height: 1; vertical-align: top; @@ -534,6 +538,9 @@ table.itemListContainer > tbody > tr:first-child ~ tr > td { background-image: url("img/payment_deposit.png"); min-width: 65px; } +.button.buy.locked > span { + background: url("img/locked.png") no-repeat center 0; +} .button:hover { background-color: #000000 !important; background-image: -webkit-gradient(linear, left top, left bottom, from(#333333), to(#000000)); diff --git a/k4ever/media/css/style.less b/k4ever/media/css/style.less index ea7ad40..488ffe5 100644 --- a/k4ever/media/css/style.less +++ b/k4ever/media/css/style.less @@ -14,6 +14,8 @@ @import "http://fonts.googleapis.com/css?family=Open+Sans:400italic,400,600,700.css"; @import "http://fonts.googleapis.com/css?family=Ubuntu:400,700.css"; +@import "jquery.gritter.css"; + /* this is a css style reset. there’s much discussion if something like this is helpful and appropriate. well... it’s here for now, so please don’t @@ -226,9 +228,12 @@ p { display: table-row; &:hover, &.focus { - color: white; .vertical-linear-gradient(@clrLightBlue, @clrMediumBlue); .box-shadow(0 0 5px @clrMediumGrey); + + a { + color: white !important; + } } a { @@ -540,6 +545,10 @@ table.itemListContainer { background-image: url("@{fldImages}/payment_deposit.png"); min-width: 65px; } + + &.locked > span { + background: url("@{fldImages}/locked.png") no-repeat center 0; + } } &:hover { diff --git a/k4ever/media/js/jquery.gritter.min.js b/k4ever/media/js/jquery.gritter.min.js new file mode 100644 index 0000000..9ca8edd --- /dev/null +++ b/k4ever/media/js/jquery.gritter.min.js @@ -0,0 +1,11 @@ +/* + * Gritter for jQuery + * http://www.boedesign.com/ + * + * Copyright (c) 2011 Jordan Boesch + * Dual licensed under the MIT and GPL licenses. + * + * Date: July 9, 2011 + * Version: 1.7.1 + */ +(function(b){b.gritter={};b.gritter.options={position:"",fade_in_speed:"medium",fade_out_speed:1000,time:6000};b.gritter.add=function(f){try{return a.add(f||{})}catch(d){var c="Gritter Error: "+d;(typeof(console)!="undefined"&&console.error)?console.error(c,f):alert(c)}};b.gritter.remove=function(d,c){a.removeSpecific(d,c||{})};b.gritter.removeAll=function(c){a.stop(c||{})};var a={position:"",fade_in_speed:"",fade_out_speed:"",time:"",_custom_timer:0,_item_count:0,_is_setup:0,_tpl_close:'
',_tpl_item:'',_tpl_wrap:'
',add:function(g){if(!g.title||!g.text){throw'You need to fill out the first 2 params: "title" and "text"'}if(!this._is_setup){this._runSetup()}var i=g.title,n=g.text,e=g.image||"",l=g.sticky||false,m=g.class_name||"",k=b.gritter.options.position,d=g.time||"";this._verifyWrapper();this._item_count++;var f=this._item_count,j=this._tpl_item;b(["before_open","after_open","before_close","after_close"]).each(function(p,q){a["_"+q+"_"+f]=(b.isFunction(g[q]))?g[q]:function(){}});this._custom_timer=0;if(d){this._custom_timer=d}var c=(e!="")?'':"",h=(e!="")?"gritter-with-image":"gritter-without-image";j=this._str_replace(["[[username]]","[[text]]","[[close]]","[[image]]","[[number]]","[[class_name]]","[[item_class]]"],[i,n,this._tpl_close,c,this._item_count,h,m],j);this["_before_open_"+f]();b("#gritter-notice-wrapper").addClass(k).append(j);var o=b("#gritter-item-"+this._item_count);o.fadeIn(this.fade_in_speed,function(){a["_after_open_"+f](b(this))});if(!l){this._setFadeTimer(o,f)}b(o).bind("mouseenter mouseleave",function(p){if(p.type=="mouseenter"){if(!l){a._restoreItemIfFading(b(this),f)}}else{if(!l){a._setFadeTimer(b(this),f)}}a._hoverState(b(this),p.type)});return f},_countRemoveWrapper:function(c,d,f){d.remove();this["_after_close_"+c](d,f);if(b(".gritter-item-wrapper").length==0){b("#gritter-notice-wrapper").remove()}},_fade:function(f,c,h,d){var h=h||{},g=(typeof(h.fade)!="undefined")?h.fade:true;fade_out_speed=h.speed||this.fade_out_speed,manual_close=d;this["_before_close_"+c](f,manual_close);if(d){f.unbind("mouseenter mouseleave")}if(g){f.animate({opacity:0},fade_out_speed,function(){f.animate({height:0},300,function(){a._countRemoveWrapper(c,f,manual_close)})})}else{this._countRemoveWrapper(c,f)}},_hoverState:function(d,c){if(c=="mouseenter"){d.addClass("hover");d.find(".gritter-close").show();d.find(".gritter-close").click(function(){var e=d.attr("id").split("-")[2];a.removeSpecific(e,{},d,true)})}else{d.removeClass("hover");d.find(".gritter-close").hide()}},removeSpecific:function(c,g,f,d){if(!f){var f=b("#gritter-item-"+c)}this._fade(f,c,g||{},d)},_restoreItemIfFading:function(d,c){clearTimeout(this["_int_id_"+c]);d.stop().css({opacity:""})},_runSetup:function(){for(opt in b.gritter.options){this[opt]=b.gritter.options[opt]}this._is_setup=1},_setFadeTimer:function(f,d){var c=(this._custom_timer)?this._custom_timer:this.time;this["_int_id_"+d]=setTimeout(function(){a._fade(f,d)},c)},stop:function(e){var c=(b.isFunction(e.before_close))?e.before_close:function(){};var f=(b.isFunction(e.after_close))?e.after_close:function(){};var d=b("#gritter-notice-wrapper");c(d);d.fadeOut(function(){b(this).remove();f()})},_str_replace:function(v,e,o,n){var k=0,h=0,t="",m="",g=0,q=0,l=[].concat(v),c=[].concat(e),u=o,d=c instanceof Array,p=u instanceof Array;u=[].concat(u);if(n){this.window[n]=0}for(k=0,g=u.length;k