#PR-48

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;

templates/registration/login.html

@@ -12,59 +12,26 @@
         <form method="post">{% csrf_token %}
           {{ form.non_field_errors }}
           <div class="col-lg-12 select-reg">
-                <input type="text" name="{{ form.username.name }}" value="{{ form.username.value }}" class="box-sizing email-reg"
+            <input type="text" name="{{ form.username.name }}" value="{{ form.username.value }}"
+                   class="box-sizing email-reg"
                    placeholder="Электронная почта">
             {{ form.username.errors }}
           </div>
           <div class="col-lg-12 select-reg">
-                <input type="password" name="{{ form.password.name }}" value="{{ form.password.value }}"class="box-sizing pass-reg" placeholder="Пароль">
+            <input type="password" name="{{ form.password.name }}" value="{{ form.password.value }}"
+                   class="box-sizing pass-reg" placeholder="Пароль">
             {{ form.password.errors }}
           </div>
           <div class="col-lg-12 select-reg">
             <div class="check-reg">
               <label><input type="checkbox" name="check-reg"><span></span></label>
               <p style="width: 35%;margin-top: 2px;">Запомнить</p>
-						 <p style="width: 50%;float: right;text-align: right;margin-top: 2px;"><a href="{% url 'password_reset_recover' %}">Забыли пароль ?</a></p>
+              <p style="width: 50%;float: right;text-align: right;margin-top: 2px;"><a
+                  href="{% url 'password_reset_recover' %}">Забыли пароль ?</a></p>
             </div>
           </div>
 
-                                <div class="col-lg-12" style="margin-top: 10px;">
+          {% include 'registration/social.html' %}
-                        <div class="col-xs-12 text-center">
-                            <div class="btn-group" role="group">
-
-                                <div class="pull-left -social -fb">
-                                    <a href="{% url 'social:begin' 'facebook' %}?user_type={% if request.GET.type == 'customer' %}Заказчики{% else %}Исполнители{% endif %}">
-                                        <img src="http://nepesh.com/static/img/social/fb.png" alt="fb">
-                                    </a>
-                                </div>
-
-                                <div class="pull-left -social -tw">
-                                    <a href="{% url 'social:begin' 'twitter' %}?user_type={% if request.GET.type == 'customer' %}Заказчики{% else %}Исполнители{% endif %}">
-                                        <img src="http://nepesh.com/static/img/social/tw.png" alt="tw">
-                                    </a>
-                                </div>
-
-                                <div class="pull-left -social -gplus">
-                                    <a href="{% url 'social:begin' 'google-oauth2' %}">
-                                        <img src="http://nepesh.com/static/img/social/gplus.png" alt="gplus">
-                                    </a>
-                                </div>
-
-                                <div class="pull-left -social -vk">
-                                    <a href="{% url 'social:begin' 'vk-oauth2' %}">
-                                        <img src="http://nepesh.com/static/img/social/vk.png" alt="vk">
-                                    </a>
-                                </div>
-
-                                <div class="pull-left -social -ok">
-                                    <a href="{% url 'social:begin' 'odnoklassniki-oauth2' %}">
-                                        <img src="http://nepesh.com/static/img/social/ok.gif" alt="yt">
-                                    </a>
-                                </div>
-
-                            </div>
-                        </div>
-                    </div>
 
           <div class="col-lg-12 select-reg">
             <button class="reg-sub">Вход</button>

templates/registration/registration_form.html

@@ -60,49 +60,8 @@
                     </div>
                     <div class="clearfix"></div>
 
-                    <div class="col-lg-12" style="margin-top: 25px;">
+                    {% include 'registration/social.html' %}
-                        <div class="col-xs-12 text-center">
-                            <div class="btn-group" role="group">
 
-                                <div class="pull-left -social -fb">
-                                    <a href="{% url 'social:begin' 'facebook' %}?user_type={% if request.GET.type == 'customer' %}Заказчики{% else %}Исполнители{% endif %}">
-                                        <img src="http://nepesh.com/static/img/social/fb.png" alt="fb">
-                                    </a>
-                                </div>
-
-                                <div class="pull-left -social -tw">
-                                    <a href="{% url 'social:begin' 'twitter' %}?user_type={% if request.GET.type == 'customer' %}Заказчики{% else %}Исполнители{% endif %}">
-                                        <img src="http://nepesh.com/static/img/social/tw.png" alt="tw">
-                                    </a>
-                                </div>
-
-                                <div class="pull-left -social -gplus">
-                                    <a href="{% url 'social:begin' 'google-oauth2' %}">
-                                        <img src="http://nepesh.com/static/img/social/gplus.png" alt="gplus">
-                                    </a>
-                                </div>
-
-                                <div class="pull-left -social -vk">
-                                    <a href="{% url 'social:begin' 'vk-oauth2' %}">
-                                        <img src="http://nepesh.com/static/img/social/vk.png" alt="vk">
-                                    </a>
-                                </div>
-
-{#                                <div class="pull-left -social -vk">#}
-{#                                    <a href="{% url 'social:begin' 'mailru-oauth2' %}">#}
-{#                                        <img src="http://nepesh.com/static/img/social/vk.png" alt="vk">#}
-{#                                    </a>#}
-{#                                </div>#}
-
-                                <div class="pull-left -social -ok">
-                                    <a href="{% url 'social:begin' 'odnoklassniki-oauth2' %}">
-                                        <img src="http://nepesh.com/static/img/social/ok.gif" alt="yt">
-                                    </a>
-                                </div>
-
-                            </div>
-                        </div>
-                    </div>
                     <div class="col-lg-12 select-reg">
                         <div class="check-reg">
                             <label><input type="checkbox" name="{{ form.tos.name }}" {{ form.tos.value }} /><span></span></label>

templates/registration/social.html

@@ -0,0 +1,38 @@
+{% load static %}
+<div class="col-lg-12" style="margin-top: 25px;">
+  <div class="col-xs-12 text-center">
+    <div class="btn-group" role="group">
+
+      <div class="pull-left -social -fb">
+        <a href="{% url 'social:begin' 'facebook' %}?user_type={% if request.GET.type == 'customer' %}Заказчики{% else %}Исполнители{% endif %}">
+          <img src="{% static 'img/social/fb.png' %}" alt="fb">
+        </a>
+      </div>
+
+      <div class="pull-left -social -tw">
+        <a href="{% url 'social:begin' 'twitter' %}?user_type={% if request.GET.type == 'customer' %}Заказчики{% else %}Исполнители{% endif %}">
+          <img src="{% static 'img/social/tw.png' %}" alt="tw">
+        </a>
+      </div>
+
+      <div class="pull-left -social -gplus">
+        <a href="{% url 'social:begin' 'google-oauth2' %}">
+          <img src="{% static 'img/social/gplus.png' %}" alt="gplus">
+        </a>
+      </div>
+
+      <div class="pull-left -social -vk">
+        <a href="{% url 'social:begin' 'vk-oauth2' %}">
+          <img src="{% static 'img/social/vk.png' %}" alt="vk">
+        </a>
+      </div>
+
+      <div class="pull-left -social -ok">
+        <a href="{% url 'social:begin' 'odnoklassniki-oauth2' %}">
+          <img src="{% static 'img/social/ok.gif' %}" alt="yt">
+        </a>
+      </div>
+
+    </div>
+  </div>
+</div>