From a79325ee391c11012a62ec851b42e48d11be1bf6 Mon Sep 17 00:00:00 2001 From: Dmitriy Shesterkin Date: Thu, 29 Jun 2017 22:07:52 +0300 Subject: [PATCH] add status icon for license, change icons --- docker-compose.yml | 10 ++++++ static/css/style.css | 22 ++++++++++++ static/img/check.png | Bin 0 -> 2373 bytes static/img/check.svg | 10 ++++++ static/img/delete.png | Bin 0 -> 2948 bytes static/img/delete.svg | 13 +++++++ static/img/not-check.png | Bin 0 -> 3068 bytes static/img/not-check.svg | 13 +++++++ templates/customer/profile/orders_list.html | 36 ++++++++++++++++---- 9 files changed, 97 insertions(+), 7 deletions(-) create mode 100644 static/img/check.png create mode 100644 static/img/check.svg create mode 100644 static/img/delete.png create mode 100644 static/img/delete.svg create mode 100644 static/img/not-check.png create mode 100644 static/img/not-check.svg diff --git a/docker-compose.yml b/docker-compose.yml index 2614db7..83a296e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,8 @@ services: container_name: dokumentor-web build: . volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - ./:/opt/app ports: - "32768:80" @@ -23,6 +25,8 @@ services: expose: - "5432" volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - ./db:/var/lib/postgresql/data environment: - POSTGRES_USER=dokumentor @@ -32,6 +36,9 @@ services: restart: always container_name: dokumentor-redis image: redis:alpine + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro expose: - "6379" @@ -42,6 +49,9 @@ services: environment: - RABBITMQ_DEFAULT_USER=dokumentor - RABBITMQ_DEFAULT_PASS=dokumentor + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro expose: - "5672" - "5671" diff --git a/static/css/style.css b/static/css/style.css index e9761a8..e4d7fa4 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1026,3 +1026,25 @@ input[type=number] { display: inline-block; vertical-align: middle; } + +.delete_license { + opacity: 0.5; + -webkit-transition: opacity 0.5s ease-in-out; + -moz-transition: opacity 0.5s ease-in-out; + -ms-transition: opacity 0.5s ease-in-out; + -o-transition: opacity 0.5s ease-in-out; + transition: opacity 0.5s ease-in-out; +} + +.delete_license:hover { + opacity: 1; + -webkit-transition: opacity 0.5s ease-in-out; + -moz-transition: opacity 0.5s ease-in-out; + -ms-transition: opacity 0.5s ease-in-out; + -o-transition: opacity 0.5s ease-in-out; + transition: opacity 0.5s ease-in-out; +} + +.status-license { + opacity: 0.5; +} diff --git a/static/img/check.png b/static/img/check.png new file mode 100644 index 0000000000000000000000000000000000000000..e3f914c1335601c95a1477bc0e1f67e26318f6e5 GIT binary patch literal 2373 zcmV-L3A*-)P)QHD3c(nqZma!q@rCcQ=;r9T}(04Qmg;(C2< znkvi`rU@irf-qEQMvkb{E`j817B&i7h2ugg1_nl}{2^hzuwVGsGq8azY+}0t!j zBlHSft-h0B(vNL?z!!WfoJ>^2tAs;>iKJGQ;}gE&W5>&6MYu+2<=v1r(fEk3_}pQwpOl_`Q1XZ1ccg;n24=y zWUxG4A%se(E5C@5Sc4Xxvs(mLL5Hq~Sc84H%$0Ko3Y3igi-nkpJt$$e+m0isep0jk z5<46OAxq>%)_^*tKU}m-2FWrr+D;+URUB{vH@Qoh4D-bZH@Qmrm@+4$|4z&8@x{xl z-)Q-p%!T(CJ;S>qkEU!dK)CWYBxV9s#Ce8o5~A(l%=zSTh?Ev-1|B6f>p9#F7M#fn zY0BzU(fh-p6Jceu=w!NzKl3UvYyX|Ngzk!9TRm`@_&uf3jPfxlxLGL04Fe;j=D4t_ z8Fk~;sT02R*XUwRtf?IKWTf2^ zv{F2n{xgMHs`L55jvVx@A$IGa-H7wy?<@U;=r<}?s(^JTA9kyCc4K&U4u-0YhIqVM z9MlXuA?AcI0%fyX9)8c}78!NIuOmiW@_dKD5=K-mSHauD@Mwjn^HC&Z zmq;srrp>Tuf&4C1%R!y6YwwHd!WJICC)+m)jGCe{MFk`)dQnB& z`8XfuBOw>b(^F%-{Y7Ong)d|3@+^8^#^wmz$x*pf1@8zWq7^xv_a(%&Ed~jT4NCW_ z{92(^cghE{eZ9aCHY#j5;N5p_v?A~GB{G=xc^ucDZv-YePZggFas7Oikqp!K>v5|4 zK4*X8;v^Scu3zf?hFF%q7Xt<%DLaJz_C9|}hG{g}t-5b>@}p6V4qWwP*V_zLSf-|JKf?lWkj)avz2a!dzvyV5>Jx`>oPznn#?k zy01LhP2*c!n;!X-+tSH=j2UE%%D)lfoNTs?73{NxIN`;e_d6_294upXbqi@4yJ)ij zg9aI^@;!nJJB;E+8tgEn-R8)S3ty{sbmKE~k;6iDh0o)pq+BdNzRT##F7>}ah?6r^ z__5$KzGiik19H(Pd>m<3Q8WD>K4CZRC(96&(GripIAO^9q0o%KdGsL%6sK^W**>rZOBP+zF9uvMPZh{Nt4GZ z^6NK)Z%N5GMSWf~^vmL_kG}imCpoB*^*ZxmER9Ykk9XC0Q+vYqiD*)il0k5*g*3K9 zXao0k!b`T5&K;Ni+v~hKSwK=)Eyl;~0`rzQ8KAbSJ#AjO`;2O>oWtD1e75i%c zhkUsr(c7-BWdZqX%L80D6qYS`(by{Y)t((JQw?4(4aiU1_~96?Q^^{&vNhnd{XY2< zy;GhE%tzb!;kZs1nZyZ87TW|kWq--Qi^31W9N{XVU4`Va0#UQV+bEcIYG9l7 zvVA(v;MQ8ks|O>Ul4Q3Wz$xE+Vx?|DtEv^xZ5HURsVXZEvor9tRJ`7-8kQ(_3*}wn zh6A{S(@er9=`ta1IDkthvO-$Qq-5g&4xI^K-nIy3Qkvrc?%>d=FfuqGlu5DU0M3k~ zs;n8BD+PSrE0dCr1Gs`Sufo@@G9l?WfU8_&iL8`KN#+2Ka+Q#l=|j6XQZ1{y&K9%$ zGAZ?U37jOYfVj>>oxbw%buuZrKc?!kaiV~iSCL0w#Gcy=+?0f9Im5dm&Qpll`_MK@ zcG`0$Kt-C-6RWpLUs}=|wPUyW3L&(Sk86L3kyzVCSlR5vrF&v>wrZPqHd*^$EOf$` zM`9qB%-=JlqvgWqV7?=_<46pj@jdu=g?zLYcC)Mzjtj1z>8|zRBfjEu$IC=T$c#3W zZL8JE#3y{i$HEEwT6=^I0#{@;F?k+iyH~)MhI?(*rVuh(Q8L@*uZi{xz7v8CY+)1I zK}bkD6RQbfagP1GGlglwBw>Qk> + + + Shape + Created with Sketch. + + + + + \ No newline at end of file diff --git a/static/img/delete.png b/static/img/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..ef2cc3fcbb344fe79ced1d0dfcaaa1ce3ee1e567 GIT binary patch literal 2948 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 + + + Group 2 + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/static/img/not-check.png b/static/img/not-check.png new file mode 100644 index 0000000000000000000000000000000000000000..03852a5802cc5f7ccf794cea6603a372e96e8e35 GIT binary patch literal 3068 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 KMNUMnLSTaABi>~I literal 0 HcmV?d00001 diff --git a/static/img/not-check.svg b/static/img/not-check.svg new file mode 100644 index 0000000..526feaf --- /dev/null +++ b/static/img/not-check.svg @@ -0,0 +1,13 @@ + + + + Group + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/templates/customer/profile/orders_list.html b/templates/customer/profile/orders_list.html index 1b8e70e..0ad3373 100644 --- a/templates/customer/profile/orders_list.html +++ b/templates/customer/profile/orders_list.html @@ -11,15 +11,35 @@ {{ object.order_date }} {% if object.type %} -

Счет № {{object.id}} - Лицензия на {{ object.get_term }}, - {% if object.pay_sum > 0 %}{{ object.pay_sum|get_plural:"рубль,рубля,рублей" }}{% else %}бесплатно{% endif %}

-

{% if object.paid_date %}{{ object.get_payform_display }}{% else %}{{ object.get_action_link|safe }}{% endif %}

+ {% else %} -

Лицензия № {{object.id}} на {{ object.get_term }}, - {% if object.pay_sum > 0 %}{{ object.pay_sum|get_plural:"рубль,рубля,рублей" }}{% else %}бесплатно{% endif %}

-

{% if object.term > 0 %}{{ object.get_action_link|safe }}{% else %}Пробный период{% endif %}

+
+

Лицензия № {{object.id}} на {{ object.get_term }}, + {% if object.pay_sum > 0 %}{{ object.pay_sum|get_plural:"рубль,рубля,рублей" }}{% else %}бесплатно{% endif %}

+

{% if object.term > 0 %}{{ object.get_action_link|safe }}{% else %}Пробный период{% endif %}

+
{% endif %} + + {% if 'активна' in object.get_paid_status %} +
+ + + +
+ {% endif %} + {% if 'выдана' in object.get_paid_status and not object.type %} +
+ + + +
+ {% endif %} + {% if object.type %}