From 2e74d18787f0dacdb674028c6c84d52ceff1eba4 Mon Sep 17 00:00:00 2001 From: Bachurin Sergey Date: Wed, 29 Apr 2015 03:03:21 +0300 Subject: [PATCH] cabinet layout --- project/customer/context_processors.py | 11 ++++++++--- project/static/css/style.css | 11 +++++++++++ project/static/img/popup-cabinet.png | Bin 0 -> 2712 bytes project/static/img/popup-cart.png | Bin 0 -> 388 bytes project/static/img/popup-clock.png | Bin 0 -> 396 bytes project/static/img/popup-link.png | Bin 0 -> 378 bytes project/static/img/popup-list.png | Bin 0 -> 172 bytes project/static/img/popup-settings.png | Bin 0 -> 392 bytes project/static/img/popup-trash.png | Bin 0 -> 203 bytes project/static/img/triangle-popup.png | Bin 0 -> 470 bytes project/static/js/commons.js | 8 ++++++++ project/templates/base.html | 17 ++++++++++++++++- 12 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 project/static/img/popup-cabinet.png create mode 100644 project/static/img/popup-cart.png create mode 100644 project/static/img/popup-clock.png create mode 100644 project/static/img/popup-link.png create mode 100644 project/static/img/popup-list.png create mode 100644 project/static/img/popup-settings.png create mode 100644 project/static/img/popup-trash.png create mode 100644 project/static/img/triangle-popup.png diff --git a/project/customer/context_processors.py b/project/customer/context_processors.py index c6725ad..cbc9a05 100644 --- a/project/customer/context_processors.py +++ b/project/customer/context_processors.py @@ -5,11 +5,12 @@ from .models import License def license_check_soon_ends(request): + print 12434674658457 try: license_cookie = request.COOKIES.get('close_message_license') + license_15days = cache.get('license_15_%s' % (request.user.username,), None) if not license_cookie: now = datetime.today() - license_15days = cache.get('license_15_%s' % (request.user.username,), None) if license_15days is None: licenses_ends = License.objects.filter(company=request.user.profile, date_to__lte=now + timedelta(15), status__in=[-1, 1, 2], deleted=False) next_licenses = License.objects.filter(company=request.user.profile, status=1, deleted=False) @@ -20,9 +21,13 @@ def license_check_soon_ends(request): else: license_15days = '' + print '@1!!!!!', license_15days return { - 'license_15days': license_15days + 'license_15days': license_15days, + 'license_days': license_15days } - return { } + print '!!!!!', license_15days + return {'license_days': license_15days} except: + print 123123213 return { } diff --git a/project/static/css/style.css b/project/static/css/style.css index e4a59aa..8ab9fbc 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -610,3 +610,14 @@ tr.doc-row:hover {cursor:pointer;} .license-ways .col {width:200px;} .license-ways .mr-5 {margin-right:5px;} .license-ways .col-last {width:185px;} +#cabinet-popup {display:none;position:absolute;top:0;right:0;z-index:99999;margin-top:60px;box-sizing:border-box;padding:20px 25px 25px 25px;width:300px;height:380px;background:url(../img/popup-cabinet.png) center center no-repeat;} +#cabinet-popup h2 {font-size:16px;border-bottom:1px solid #fed13e;padding:0;margin:10px 0;} +.yellow_round {width:80px;height:80px;border-radius:40px;background:#fed13e;text-align:center;font-size:48px;font-weight:bold;line-height:80px;display:inline-block;} +.grey {color:#7d8084;} +a.popup-link {display:block;padding: 5px 0px 5px 25px;text-decoration:none;font-style:italic;color:#51558b;} +a.popup-buy-license {background:url(../img/popup-cart.png) no-repeat 0px center;} +a.popup-my-accs {background:url(../img/popup-list.png) no-repeat 3px center;} +a.popup-history {background:url(../img/popup-clock.png) no-repeat 3px center;} +a.popup-password {background:url(../img/popup-settings.png) no-repeat 3px center;} +a.popup-email {background:url(../img/popup-link.png) no-repeat 3px center;} +a.popup-unreg {background:url(../img/popup-trash.png) no-repeat 3px center;} diff --git a/project/static/img/popup-cabinet.png b/project/static/img/popup-cabinet.png new file mode 100644 index 0000000000000000000000000000000000000000..b2b26757f79dbde4c548b3354869fbcdf4af2583 GIT binary patch literal 2712 zcmdUxe>BtkAIGO|kra{|`i^p=BtNbsgj@Mhg#3yc8=u*PNg%eq<^0dwh4l=YG#U-}C)(zJK=pzwEFyk4*K zN;~7>vPD^283Y1tId#&}8w64?m!Bl1jdFrsgX83nR-98noKG|=4igfC1RV>F29SEE zqC&!u-pG*9gv*V{qacv7%_+xYzSy3rzNTp3E`^t3TZ9fmb)CkY6AJ4Ir5i1`d2axp zP}&sX>iYT@;sql|wHAi)QtoHPIHA*yem^2;|6cda>mGu4L7q5LoxSvKCyYT0FggI`d?cK4o>) za$Gk5D_FJY0c@wm0wm8}y=h3(B?-J`965)Q|hqw878K2 zFp_}+0Xj@22;WVkc@!*RLqkVUSXW-&O}t-FO)+U38(vS*v`}M(L71(rt(aU>cx_VE z%r-fBLg*@w>NObBWZ-BH5-;=W_)k5C{r&x^0u{%n5yR4oJnrHs*&M|q;Bw^YlE$!6 zqGutAk&%~k3B=8~PS zO}sNV465wB-h@Xoy_9Co=ha6h;=68*X)(j=r{b%Oblk4}byJ}qzrNk;^!r4F=lPQ( zg=&T1(#r7(`h6IR;`cNk_1XXy+4_@pvRpUk__G0eIo57BN+w>S$wfA#3x=C|S*k|^5G-=A|qwj_;yQC1e0LhQ&&NlDRtR8kgR zQd;T`!^xzNNWZ&u<;s=4!^6X?>2+)`Z3tx50KGvvCzW2ISjUboh(w~&5pnHA=AoEu zavo8=skX;p8Vgr*j!jHlCcTL4n(nPhh@GsuGMTm4E$6i3K1v%oVsH)q%sU)V5cc+x zf3izFyg0>fV-(tArZGEB0*~lITIc*!4OMyZkzcASVl)+?;QFQzwxo;6o$HC7o9?f^ z)WrzWaFLQoq^v-bu;QCq>dV_~H4@u}!c1eO>Ap%fa%MxfN4lq89lXm*AorFw%Y zNd&)uKE?8VXq(k*W32@e+~+z))-9AemZ6+{{P|VsMCgSJk4t&HHJGUH&VlC@!w%CQ zO_5_s0{zUH?f6l@lCz%(wu6(ClP!=ln!r6E_bel@(jqS6a@9vd{~M&?v-+Ujj0T2HB^#_pC{{-aUeh>MlxPJloe`Nml68#sge@gp9{GZ_8c=XLA`hRl&f2xOX z*8P{9y8+#CAhu(-s|q&cEbxJ#U~sQFk9es;6UA-q$32 zm5jAftbBg-BP0XCWH00M-ThyirTsUcG&3wn0P}m6Sn0kY=qbr=HVjW8^@SuB^5( zcz9HlySBD=v)<=Ee!*hu*1x!J-F4*B?CVT@oD!yA8KDPFL#j76Ws%E0gXMV%?|o;d^syE;}?$7?cD1?{DWV7J3x)*mQ`tQ`P|9K`F1cX^h@$I^49;|NPl;ra!J zfrIq}=ZHfIm%fX6ya$FDM|6M99@(T$m>+8o=%g0ebAt{9zf?&vw$u<&+ Bp^^Xq literal 0 HcmV?d00001 diff --git a/project/static/img/popup-cart.png b/project/static/img/popup-cart.png new file mode 100644 index 0000000000000000000000000000000000000000..0083e060c7e1e880f450d8f363085caa644956e9 GIT binary patch literal 388 zcmV-~0ek+5P)=h!xBXk45 zLk+cr+PH&K17Y3dN)lrPu}1clvYAohkTI!>g4H?buf zWLH)Iu^bRbKwZmBz`z~E7&wQ>n4Spr8BPO_L%r)tq<61DF-`+P5n%m_ zcoxQBA`r;cKzta8!=ajxaS;$7gN82yF$RJXb|5q|V$tM8fjA24`UGMP1cl)gXi3w7 iCifait{YhbAix0DCq*0b*sSva0000BAs{F&1VQiso*;r7gF6Wrn3darmk@&ff>)vGNTPmtG+pzn zsP3+5R8^HF+7gFiU+fT@im|v8@3A=~$!Fq?wG=s&$+x8fO)(OeB;1IO*nkeP9M6cH zMS%;^6(6E4PH6cP#>Coq%scb~g*e98~5V8*8W!PrP}6|6HW@W|%i4;{GoDR856aTHZv zr2?oghR_}fC?0t^7eqDN|aKFCu50000_xfy06u`L zaw2k2BFaT^St;&{l$$8IiIP&3qk~)(<+P=ga`gdRm6P&+>Y19x*kG;FNMZ_orWFcY%42MbNNX}{)^=;SCjbt20mgE;SZ(x^sC z!=l`mpG6rIS){qPrBTTZoBf+LWpL%x4}8M{prC8mzYIJ|{XJ7z{h36N2bi14w7voi Y05%{{ZcfG%!~g&Q07*qoM6N<$f=Ak&F8}}l literal 0 HcmV?d00001 diff --git a/project/static/img/popup-list.png b/project/static/img/popup-list.png new file mode 100644 index 0000000000000000000000000000000000000000..3c7ceaaa177c7dac99f7112c5fa1a4f7a928ea51 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X{5)M8Ln>}1ojG;t*69NW9vpFyyK&s5F-@Q#$?=iFq!mBy zI}(x>2yA#@Bze;H|HUVPFbP0l+XkKkkdVj literal 0 HcmV?d00001 diff --git a/project/static/img/popup-settings.png b/project/static/img/popup-settings.png new file mode 100644 index 0000000000000000000000000000000000000000..91b051da4020cb08aa5342f1c33ec669bccf45e6 GIT binary patch literal 392 zcmV;30eAk1P)7q55&w+_Ael=0b&^_u7Qd%K-Jiz z2OBC+eCPJ9Z*txz!xwM@{c0%02@1#_`D9a+ogveV@T164=_X3 z+9MlK4NZlh6y^ZL{y@AHNz+!Sm;+Re5L6G`3(?Rto&v;opkkYla-$EDVdg+Q6RHPp mz-y@K!~l>5&M*!@fB^t*LOQUjnmru=0000G# literal 0 HcmV?d00001 diff --git a/project/static/img/popup-trash.png b/project/static/img/popup-trash.png new file mode 100644 index 0000000000000000000000000000000000000000..860384c619b719f04ee3c24416faf7e24082e11a GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xay?xfLn>}1`S|&z9bo##v{8804LgN0x9}538e}a5HQO#T zNF=l*&1v9#b?1ME1Y5z!#0q_3z2$ {% if user.is_authenticated %}
- {{ request.user.profile.get_company_name|default:'Новый профиль' }} + {{ request.user.profile.get_company_name|default:'Новый профиль' }}  |  Выход
@@ -71,6 +71,21 @@ {% endblock %} {% block content %}{% endblock %} +
+

Платежные данные

+
Тариф:{{ license.tariff }}
+
Осталось
+
+ 26{{ license_days }} +
+ Купить лицензию + Мои счета + История расчетов +

Настройки

+ Сменить пароль + Сменить e-mail + Удалить учётную запись +
{% block bottom_wide %}{% endblock %} {% block footer %}