From 8f6fd85044a7b566e0a4f10dc2953cd03608b919 Mon Sep 17 00:00:00 2001 From: PekopT Date: Fri, 14 Oct 2016 21:33:59 +0300 Subject: [PATCH] #PR-48 --- assets/css/main.css | 2 +- assets/img/social/fb.png | Bin 0 -> 449 bytes assets/img/social/gplus.png | Bin 0 -> 974 bytes assets/img/social/ok.gif | Bin 0 -> 2945 bytes assets/img/social/tw.png | Bin 0 -> 742 bytes assets/img/social/vk.png | Bin 0 -> 621 bytes assets/img/social/yt.png | Bin 0 -> 841 bytes templates/registration/login.html | 95 ++++++------------ templates/registration/registration_form.html | 49 +-------- templates/registration/social.html | 38 +++++++ 10 files changed, 74 insertions(+), 110 deletions(-) create mode 100644 assets/img/social/fb.png create mode 100644 assets/img/social/gplus.png create mode 100644 assets/img/social/ok.gif create mode 100644 assets/img/social/tw.png create mode 100644 assets/img/social/vk.png create mode 100644 assets/img/social/yt.png create mode 100644 templates/registration/social.html diff --git a/assets/css/main.css b/assets/css/main.css index 35834f1..ed7a9fe 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -6050,7 +6050,7 @@ a.linkS2[data-target="#withdraw-money"]{ .addWork { font-style: italic; padding: 17px 23px 17px 48px; - margin-top: 20px; + /*margin-top: 20px;*/ margin-left: 0; border-radius: 50px; border: 1px solid #42B476; diff --git a/assets/img/social/fb.png b/assets/img/social/fb.png new file mode 100644 index 0000000000000000000000000000000000000000..9fe919356d150ab47b6aa769208d4890f35829f4 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-mUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6R~NK=9LfcRi5e zEbxddW?A4!REysM_XnXR_x3${`2qe^o4se4`2Auv2mYF z+l)nf44Q%X@MdxO6?yj?t|+g+SF>=}%$_YW3oc)sls4m%Alq~E?|JDria)UVzL7FB z{S9)s#McuE%s}7eG%WkdVS8{x=R{1;!PS66fJeHYfgxatL9s{qq-IcPdb;|#taD0e F0ss|uuy+6e literal 0 HcmV?d00001 diff --git a/assets/img/social/gplus.png b/assets/img/social/gplus.png new file mode 100644 index 0000000000000000000000000000000000000000..b01fba646dd60492ffecb16ebce42b8947a1560b GIT binary patch literal 974 zcmV;<12O!GP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv00000008+zyMF)x010qNS#tmY3labT3lag+-G2N400S~fL_t(&-tC!LNK{c6 z$A9C@lscK3k(y=eWJP5Ql$I1_5H77$7Fm>0VNyL5K@s%SN)h(ZLr`SdLiiAYQWiZZ zCS{QuPOD{RmS$?>zV`4bgQ*eDo#rC<|MH!4&v(x~zkAR3opWY%oe7IO83b~1_5d^x z4MgSAK-4A;L~YVQ)Fur?ZPGy0CWE5A%?O2s(GWNl3`S^fgpwk7`2<|_VDbb{A8_}8 zl#9@*+zCP%5WNw$9f5h_kZ})^Vxgr8W`@D`V=#A_&9|);t{hhsLOGB%dj#V9XGlqe zjt;q=p9%Lb!}|Tu+5+d|q4JABDlGeB#N7kJR!h0)nGK>_&(r1Y8;3w>q(dN-0U2YK zK>}E-d$%`Op{_>CBS-h$hqo^*S}E3PAZ@L-vWIuyKKia1TwmLFd%#54d`PU*KuX_2 zW1WP+I%Sc0Onxu8U<n$5$tTRFp#M zRfvj{=@cH*zpu3#?wof>&?~e1eQ+Hv?1P$0*@_ewN~*QwKyd*y)r+5pH^d!>QDYSc zQ6|{kOt3sgrq7vOy;pd>0m3)Is$H_doD~L-Z`;}}IdC{yGT#7Y{}=J`hl7`3>=d|s zwC`<7dmE%DLy1M|I$iJf2CG=7foweje&ZoO3mWVH?ps?W_Iu^Q$Dd(T2(kkqZ! z@cM;hFug&hojDkurph79j(~P72uLOhjgTX4z$7pYhq_uh4Ze8^*=bN!?hpWFK~$hY w^K*~}qBdzDYLf<{HfbPglLn$TX&`FTZ#@I=*3w%l?f?J)07*qoM6N<$g5ETwXaE2J literal 0 HcmV?d00001 diff --git a/assets/img/social/ok.gif b/assets/img/social/ok.gif new file mode 100644 index 0000000000000000000000000000000000000000..1ed767fe466edd8a62c91957df52f856efd9b0fc GIT binary patch literal 2945 zcmaJ?XIxWR9*x04M3B(JOF#_~2qL5b2BJud7*t#=E9ih@NP>x}Bmn}V(m@8xsOzX$ z5M6u0#<=LrP*e~^Q5;3Z5rm7-0U4AUHC2R13C7?WaX zfa9wuSfV*6nmo^;gmiAKHfKE*gQ|sMycYa(0YvuVPt`Y_XSL-L1~?8RlaKxxRx80BpTx zHX6+a(5%y#v`S?Tc9;P-t0pw*a8vIy{qJqEZH{AXV4URyo=u(DI$N9Tqpq(~Wn)08 zt2V=JM2In~#&jn)%hTozYm4z_!twY(eCmY+lCyZ1M2Me&eZJ37DsqtNE=$K4 z3%yi4d*x2z1P?I$@yhV-p;0zq=jJXpmhhdh7;noiAi~G8o-KGzZP4`Rmy{~kQrwk7&3~iTm zS2946E%>$xl+4zakw?>U6IuAt9ZSI$MUWU8bx21W#9yAmbwxLWCv*7~>$pEMSm{)Ngk)531#JG4Ag(jg{?n}a@LK>aJl%P_WTiN_D^u)bi(I_?}44n`hhmR9R zGg)kEwuredd-ZyHHisU{K!-0yEs>I?JRy%Mp`oNaE?-QRhM{Q;K?;*>nNMxw(5O!k z2`3C4IrRWFRWn*3Vxoev_y9V75gxUOfF%S5kw_$e6cJCr^cffz z_y3_h-WRl3vX=Rm-~TBrUY{jo;?^?7f^-p`X@Sq5DkUUGi|i zP^Z*REcWHYX>2yJ=%$!iK-EU$=Hm{NGl`ty;MvmbyG<86`R@G9r9w*pkKM&=At1 z;GjUF<%7Zo_%HNZ;EVC`_L`6OM9rH!$HN_o0NmiNF3wJlFo)UpcC&0}+RU*2X1W!0 z8U*60n+};8{!^E!za_-R3@Jzpjjpb&FR*d;OOh712K%O>R~)C_sCxK4;2pL5<@Ga7 z`%uwk9v4zAyklVnwsS7+dv-F1deASq z<@Uvn^RXI_BHQ4)LzmZGSo^-iH~01REse#=LT=tU$m3cM$JWEVGfOoeTTZM@7{4q! zmE8liPAP(k`-W|=y_+%KT`z;*E|6Wn(L489%bcZMCDe-6BY_;g^YRUTO_lDwvPtHx zp(m8m`y1P8?~IVXTa~*3TD9E1X+^~2?6!(v$H=t&S@TvKPN1NBcQYfLnl>(KTKJTJ zS)F_r6{fn$`S3KX2sXIDR%Y%d6jMtcEhaX9e7f`A+|jW&7(l5zWy4%w^BrvF;zlgD- z?cWm1I&G|KIa%0$wApIX>(XFVd48n*42LDt2E%V8R<0n?@Rt^xaX{5xJXb5o{btAWH(I1;|^%Y!$}bbihq!Pe|d(vR0fQc+Q? z#fedk&PO_7Z~YFfCrs4rjL2`Qx4|42!d#MwLuWBmSYd<9e7l)mnT#v)NAC2%>DCag zOh{iXoF4=8IDenuh3xEAwBnn%&t~|uBBt3N?NUEOyH1t2><_ULASv%GFY95r$xT<=Uv^C5IhV9FTu$nK#x1f^Gx7~r-Ug%N36E=;hk=R2p zo66PY?YUh!P3AT=GIs`6+s)a(M)Uq4SQ%wiNW$KQ#y;`X^&Lv!m&|&LGC4qJcR`Oi zv{qKf{Bd^ONs3d(*=ykN6;gcu(~8CMduA`o^(nU{S6|Z)pYQ0=Pt;jmx5BxG6z{cy zw&y`@?<|g4p{QSO-tI(brWsY8^zcTzb3yQCA82z=>HLkA-FxWrmj{esXA{I`sjLZS zHZX$%%WxlG5_iG1klgZskt6j6Yv1sQ`}=aI=THzgBT9W>)p`3^P)}HCL_~8p1b9+u zO)8Cyg5?(=x=LoKr!_dG#9I?POKcOG8{oCFB7Av|?Hb=k-=WCq+WN-1psXaq zt_nse>1?za-Cs&wRpq3kQFevMcgL4kxtymy^jk`RvZ|}#KQ%AIRMp!i+noVUl@`0< aq4um*XOOR(A1$ht?_q6uFbfKWEdDp8^+Hzw literal 0 HcmV?d00001 diff --git a/assets/img/social/tw.png b/assets/img/social/tw.png new file mode 100644 index 0000000000000000000000000000000000000000..f9a545f29a9edf26edf76370f17919c09bad0eae GIT binary patch literal 742 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-mUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6R~NK=9LfcRi5e zEbxddW?GPkpYhG#V*y`NgwKOTP z@IuZ;zNQBc0@z<`@x>m!xU#vv=|Mo@#f^SKnjJ|?1iFKca!u9J=m89a=B`ybZ z?4M3mlrQgVud95<@cy(J!|_Y5Uek6z<+wf3d19E`<&zxE2kn=en#_>o-gZ)jr@bUh z%Xb~`@7UwwYLnJ)H>xyAo8ap@Q|i;g{8d{H2R856UuzND9CP>KwcWheKekSt# zhmp|F$mge1XWzVP#eIKP#(~4Z5BK-U*M_95yzyr53A_Dno9-XJE3DXb?3?`G_eY*z zi(I`szH7s!Tk;on)*JP#`@7raaNGK{@}DAVpH|&S*?H&4`=n!UcD3G3jpY#DC_5u+ zMNna3&AHml6503+=QAQY%fz#5R^62CH_Y9!H|dlr(}XwQ3lwhr+_HIfsa<}F-o9j| z%iW8;*j zC!`>lF@O1{rv^V49eNy-ZoPf6Qaan7J2JclDeDi;)0KKubM8^rwo|t!{noq3mpE58 zs{X)q{$Cc;KNyLbN_==NqT9|dIy=3xyIS6N-m{}`57i65RDIQ^ff;)zj;#~?$+#hB VlhLfHJ$FD!&ePS;Wt~$(695fMN?QN` literal 0 HcmV?d00001 diff --git a/assets/img/social/vk.png b/assets/img/social/vk.png new file mode 100644 index 0000000000000000000000000000000000000000..39c8318faa31bc51aa84afca6a35f15d030ffa72 GIT binary patch literal 621 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-mUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6R~NK=9LfcRi5e zEbxddW? z&xbzmnZNt_J@$7#$;H}Q{}}JY=Qng32%bt*+H%k(qq*|}oA5$jH79AG7PEi79jzsY zzWzL!|M+M*Yf#*=&$C-HY&y?=V3iA&Oe*EARuVI2pRKXrWU70@2HEa~3bSlWrz%gH z$mQY9>Kn7>nW5nu_437E#AZg`a4=Ipto31rxmIQy|z00Y#;xE6&fEbax*duraWR#55HlxYlY0jeSYiJzD+x; zT=<`9<1BZp=pT+@y7fi^xr-W3PR!G3YbvnLbt#f6%JQ_71iEeg?Y@@|`I&VVS*|{; zRU0f9Nd2uQ+_iPiM vKM~q^M0w*KwQt9}jAn4;8VKG>KnqoQ&uuj+j92(HK{4;?>gTe~DWM4fku~|5 literal 0 HcmV?d00001 diff --git a/assets/img/social/yt.png b/assets/img/social/yt.png new file mode 100644 index 0000000000000000000000000000000000000000..65a605375668e7246aaef6ef080cae4e93f14907 GIT binary patch literal 841 zcmV-P1GfB$P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv00000008+zyMF)x010qNS#tmY3labT3lag+-G2N400ON^L_t(&-tCyrD{NsH z$3KTVVrZ1eucj%nQKbCH%0gLL$bz!8u%NNAz?Ov#v1VaOlz#vVGNfiPl!TOxCmCOSfxR>x1p^Kd_J&P#4|%f(A^E0nNU^+nkH6hkfS4beumv$+4$QV zTwg<0mf^QbEl4y9_xEsno6?P^9^`MuViHDi&%~9N_rpLgFD1-oX29ctKtO=T#|^)g zmXenbMMV$_K`;n58#o+rd<>BYl$OHXom8-k3k5+kGQe(^u*uH;v%2;%jGmq(~`qy z*R=&>JW^Q+OG~i64v&x0b5&G8Zf;`E$_muhLPy8vYv_68&~LtbB{VtKt{ z0bX9jGw~epc;MhbKI<&W#(@0m)E*s$(^D856AQ4q3d6(FAulh(#Dsizxe^5;tsoZ5 z*XFgiLsOF^_1+%z^gwenoSb}pjZb7uj(kU&CN>&{*;xT_ICL*-3`jVfTxbjoKvk7o z8_%O8WlU&AA|HR#G}zyN-#p&jz{7*|UREpk{o)n3TOLN*K>`7>Hk*`PkX-Ql<^M=d zj4dH>eQPW%h -
-
+ {% include 'partials/header.html' %} +
+
+

Вход на сайт

-
-
+
+
{% csrf_token %} - {{ form.non_field_errors }} -
- - {{ form.username.errors }} -
-
- + {{ form.non_field_errors }} +
+ + {{ form.username.errors }} +
+
+ {{ form.password.errors }} +
+
+
+ +

Запомнить

+

Забыли пароль ?

-
-
- -

Запомнить

-

Забыли пароль ?

-
-
- -
-
-
- -
- - fb - -
- -
- - tw - -
+
-
- - gplus - -
+ {% include 'registration/social.html' %} -
- - vk - -
- -
- - yt - -
- -
-
-
- -
- -
+
+ +
+
+ {% include 'partials/footer.html' %}
- {% include 'partials/footer.html' %} -
-
+
{% endblock %} diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index b56312e..41428ef 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -9,7 +9,7 @@
{% csrf_token %} {{ form.non_field_errors }} - + {% if not hide_user_type %}
{# {% if request.GET.type == 'customer' %}#} @@ -23,12 +23,12 @@ {# {% endfor %}#} {# #} {# {% endif %}#} - + {{ form.user_type }} {{ form.user_type.errors }}
{% endif %} - +
@@ -60,49 +60,8 @@
-
-
-
- -
- - fb - -
- -
- - tw - -
- -
- - gplus - -
+ {% include 'registration/social.html' %} -
- - vk - -
- -{#
#} -{# #} -{# vk#} -{# #} -{#
#} - -
- - yt - -
- -
-
-
diff --git a/templates/registration/social.html b/templates/registration/social.html new file mode 100644 index 0000000..ec8d509 --- /dev/null +++ b/templates/registration/social.html @@ -0,0 +1,38 @@ +{% load static %} +
+
+
+ +
+ + fb + +
+ +
+ + tw + +
+ +
+ + gplus + +
+ +
+ + vk + +
+ +
+ + yt + +
+ +
+
+
\ No newline at end of file