Revert "PR-55 Подвал, форма нового заказа и кнопки на главной"

This reverts commit 37cdbe19e0.

assets/sass/components/custom-components.sass

@@ -194,7 +194,6 @@ textarea.description
     font-size: 16px
     border-radius: 50%
     margin-left: 25px
-    margin-right: 25px
     -webkit-transition: all 0.3s ease-out
     -moz-transition: all 0.3s ease-out
     transition: all 0.3s ease-out

assets/sass/old_main.sass

@@ -320,7 +320,6 @@
   .mainScore
     position: relative
     > .row
-      padding: 0 15px
       border-right: 1px solid #CFCFCF
       border-left: 1px solid #CFCFCF
 

projects/templates/project_filter.html

@@ -1,16 +1,20 @@
-{% extends 'partials/_base.html' %}
+{% extends 'partials/base.html' %}
 {% load staticfiles %}
 {% load sass_tags %}
-{% block personal_css %}
+{% block head_css %}
-    <link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
+{#    <link rel='stylesheet' href='{% static "lib/proekton-components/css/fonts.css" %}'>#}
+{#    <link rel='stylesheet' href='{% static "lib/proekton-components/css/selected-container.css" %}'>#}
+{#    <link rel='stylesheet' href='{% static "lib/proekton-components/css/editable-container.css" %}'>#}
+{#    <link rel='stylesheet' href='{% static "lib/proekton-components/css/select-box.css" %}'>#}
     <link rel='stylesheet' href='{% sass_src "lib/proekton-components/sass/components.sass" %}'>
     <link rel='stylesheet' href='{% static "css/project_filter.css" %}'>{#  other  #}
     <link rel='stylesheet' href='{% static "css/font-awesome.min.css" %}'>
 {% endblock %}
 {% block content %}
-    <div class="old-main">
+    {% include 'partials/header.html' %}
+
     <div class="container mainScore ">
-            <div class="row">
+        <div class=" ">
             <div class="col-lg-12 ">
                 <p class="titleScore">Поиск заказов</p>
             </div>
@@ -21,12 +25,14 @@
                 <div id="projectsBlock">
                     {% include 'partials/inc-projects-results.html' %}
                 </div>
-                </div>
+
+                {% include 'partials/footer.html' %}
             </div>
         </div>
     </div>
 {% endblock %}
-{% block personal_js %}
+{% block js_block %}
+    {{ block.super }}
     <script src='{% static "lib/proekton-components/js/build/init.js" %}'></script>
     <script src='{% static "js/build/project_filter.js" %}'></script>
 

templates/home.html

@@ -28,6 +28,7 @@
                         {% else %}
                             <a class="to-profile" href="{% url 'registration_register' %}?type=customer">Я заказчик</a>
                         {% endif %}
+                        <p>
                         <ul class="customer-list">
                             <li>
                                 <div class="icon-1"></div>
@@ -67,18 +68,20 @@
                                 </div>
                             </li>
                         </ul>
+                        </p>
                         <a class="create" href="{% url 'projects:customer-project-create' %}">Разместить заказ</a>
                     </div>
                 </div>
                 <div class="col-lg-5 mod-no-padding">
                     <div class="infoBlock contractor">
                         {% if request.user.is_authenticated and request.user.is_contractor %}
-                            <a class="to-profile" href="{% url 'users:contractor-profile' pk=request.user.pk %}">
+                            <a class="to-profile" href="{% url 'users:contractor-profile' pk=request.user.pk %}">Я
-                                Я исполнитель</a>
+                                исполнитель</a>
                         {% else %}
-                            <a class="to-profile" href="{% url 'registration_register' %}?type=contractor">
+                            <a class="to-profile" href="{% url 'registration_register' %}?type=contractor">Я
-                                Я исполнитель</a>
+                                исполнитель</a>
                         {% endif %}
+                        <p>
                         <ul class="contractor-list">
                             <li>
                                 <div class="icon-7"></div>
@@ -117,6 +120,7 @@
                                 </div>
                             </li>
                         </ul>
+                        </p>
                         <a class="create" href="{% url 'work_sell:create' %}">Разместить проект</a>
                     </div>
                 </div>

templates/partials/sass/home.sass

@@ -38,9 +38,8 @@
     &.customer-list,
     &.contractor-list
       text-align: left
-      //padding-left: 60px
+      padding-left: 60px
-      //padding-right: 20px
+      padding-right: 20px
-      padding: 20px 20px 0 60px
       li
         display: flex
         align-items: center

users/templates/contractor_filter.html

@@ -11,7 +11,7 @@
 {% block content %}
     <div class="old-main">
         <div class="container mainScore ">
-            <div class="row">
+            <div class="row" style="padding: 0 15px">
                 <div class="col-lg-12 ">
                     <p class="titleScore">Поиск Исполнителей</p>
                 </div>

users/templates/contractor_office.html

@@ -1,19 +1,13 @@
-{% extends 'partials/_base.html' %}
+{% extends 'partials/base.html' %}
 
 {% load specializtions_tags %}
 {% load thumbnail %}
 {% load user_tags %}
-{% load sass_tags %}
-
-{% block personal_css %}
-    <link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
-{% endblock %}
 
 {% block content %}
-
     {% include 'partials/modals/add_team_member.html' %}
+    {% include 'partials/header.html' %}
 
-    <div class="old-main">
     <div class="container mainScore">
         <div class="row">
             <div class="col-lg-12">
@@ -60,16 +54,14 @@
                             <form method="post" action="{% url 'users:team-create' %}">{% csrf_token %}
                                 <div class="modal-body">
                                     <div class="textAreaBlock2 text-nn box-sizing disTab">
-                                            <p>Название <span
+                                        <p>Название <span style="color: red">{{ form_team.name.errors.as_text }}</span>
-                                                    style="color: red">{{ form_team.name.errors.as_text }}</span>
                                         </p>
                                         <input type="text" class="box-sizing" name="{{ form_team.name.html_name }}">
                                     </div>
                                 </div>
 
                                 <div class="modal-footer">
-                                        <button type="button" class="btn btn-default" data-dismiss="modal">Закрыть
+                                    <button type="button" class="btn btn-default" data-dismiss="modal">Закрыть</button>
-                                        </button>
                                     <button type="submit" class="btn btn-primary">Сохранить</button>
                                 </div>
                             </form>
@@ -104,8 +96,7 @@
                             </div>
 
                             <div class="menuUser disTab">
-                                    <a href="#" onclick="return false" data-toggle="modal"
+                                <a href="#" onclick="return false" data-toggle="modal" data-target="#addTeamMemberModal"
-                                       data-target="#addTeamMemberModal"
                                    class="add-man -add-team-member">
                                     добавить участника
                                 </a>
@@ -205,8 +196,7 @@
                                             <div class="insetCol box-sizing disTab">
                                                 <div class="imgGal"
                                                      style="background:rgba(0, 0, 0, 0) url('<%- portfolio.photos[0].img %>') no-repeat scroll center center / cover">
-                                                        <a class="open-modal-image"
+                                                    <a class="open-modal-image" href="<%- portfolio.photos[0].img %>">
-                                                           href="<%- portfolio.photos[0].img %>">
                                                         <div class="imgFigure"></div>
                                                     </a>
                                                 </div>
@@ -235,8 +225,7 @@
                                             <div class="insetCol box-sizing disTab">
                                                 <div class="imgGal"
                                                      style="background:rgba(0, 0, 0, 0) url('<%- workSell.photos[0].img %>') no-repeat scroll center center / cover ;">
-                                                        <a class="open-modal-image"
+                                                    <a class="open-modal-image" href="<%- workSell.photos[0].img %>">
-                                                           href="<%- workSell.photos[0].img %>">
                                                         <div class="imgFigure"></div>
                                                     </a>
                                                 </div>
@@ -248,8 +237,7 @@
                                                 </div>
                                             </div>
                                             <div class="insetCol2 box-sizing disTab">
-                                                    <a href="<%- workSellAbsUrl %>"><%- trunc({length: 50},
+                                                <a href="<%- workSellAbsUrl %>"><%- trunc({length: 50}, workSell.name)
-                                                        workSell.name)
                                                     %></a>
                                             </div>
                                         </div>
@@ -304,12 +292,12 @@
                 </div>
             {% endif %}
 
-            </div>
+            {% include 'partials/footer.html' %}
         </div>
     </div>
 {% endblock %}
 
-{% block personal_js %}
+{% block js_block %}
     <script>
         (function () {
             // Pagination ---------------------------------------------------

users/templates/contractor_office_chat_projects.html

@@ -1,17 +1,14 @@
-{% extends 'partials/_base.html' %}
+{% extends 'partials/base.html' %}
 
 {% load staticfiles %}
 {% load project_tags %}
 {% load specializtions_tags %}
 {% load thumbnail %}
-{% load sass_tags %}
 
-{% block personal_css %}
-    <link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
-{% endblock %}
 
 {% block content %}
-    <div class="old-main">
+    {% include 'partials/header.html' %}
+
     <div class="container mainScore">
         <div class="row">
             <div class="col-lg-12">
@@ -130,14 +127,16 @@
                 </div>
                 <!-- End block Tab2-->
             {% include 'order_info.html' %}
+
             </div>
-        </div>
+
+            {% include 'partials/footer.html' %}
         </div>
     </div>
 {% endblock %}
 
 
-{% block personal_js %}
+{% block js_block %}
       <script type="text/javascript">
            var userId = {{ request.user.pk }};
            var domain = '{{ request.META.HTTP_HOST }}';

users/templates/contractor_office_open_projects.html

@@ -1,17 +1,13 @@
-{% extends 'partials/_base.html' %}
+{% extends 'partials/base.html' %}
 
 {% load project_tags %}
 {% load specializtions_tags %}
 {% load thumbnail %}
-{% load sass_tags %}
-
-{% block personal_css %}
-    <link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
-{% endblock %}
 
 
 {% block content %}
-    <div class="old-main">
+    {% include 'partials/header.html' %}
+
     <div class="container mainScore" >
 		<div class="row">
 			<div class="col-lg-12">
@@ -22,23 +18,18 @@
 			
 			<div class="buttonGP disTab">
 				<div class="btn-group valProject2" role="group">
-                        <a href="#" data-param-name="owner" data-default onclick="return false"
+  					<a href="#" data-param-name="owner" data-default onclick="return false" class="btn btn-default -nav">Все</a>
-                           class="btn btn-default -nav">Все</a>
+  					<a href="#" data-param-name="owner" data-param-val="private" onclick="return false" class="btn btn-default -nav">Личные</a>
-                        <a href="#" data-param-name="owner" data-param-val="private" onclick="return false"
+  					<a href="#" data-param-name="owner" data-param-val="teams" onclick="return false" class="btn btn-default -nav">От имени группы</a>
-                           class="btn btn-default -nav">Личные</a>
-                        <a href="#" data-param-name="owner" data-param-val="teams" onclick="return false"
-                           class="btn btn-default -nav">От имени группы</a>
 				</div>
 				
 				<div class="btn-group valProject2" role="group">
-                        <a href="#" data-param-name="archived" data-default onclick="return false"
+  					<a href="#" data-param-name="archived" data-default onclick="return false" class="btn btn-default -nav">
-                           class="btn btn-default -nav">
   						Открытые проекты
 						<span><mark>{{ open_project_count }}</mark><!-- / <span>0</span>--></span>
   					</a>
   					
-                        <a href="#" data-param-name="archived" data-param-val="on" onclick="return false"
+  					<a href="#" data-param-name="archived" data-param-val="on" onclick="return false" class="btn btn-default -nav">
-                           class="btn btn-default -nav">
   						Архив
   						<span><mark></mark><span>{{ archived_project_count }}</span></span>
   					</a>
@@ -100,13 +91,11 @@
                                 </li>
                                 
                                 <li class="-hide-if-archived" style="display: none">
-                                        <form action="{% url 'projects:reject-project-answer' pk=project|get_answer:contractor|pk %}"
+                                    <form action="{% url 'projects:reject-project-answer' pk=project|get_answer:contractor|pk %}" method="POST" novalidate>
-                                              method="POST" novalidate>
                                         {% csrf_token %}
                                         <input type="hidden" name="next" value="{{ request.path }}">
                                         
-                                            <a href="#" onclick="$(this).closest('form').submit(); return false"
+                                        <a href="#" onclick="$(this).closest('form').submit(); return false" title="{{ project|get_answer:contractor|pk }}">
-                                               title="{{ project|get_answer:contractor|pk }}">
                                             Отказаться и переместить в архив
                                         </a>
                                     </form>
@@ -116,12 +105,13 @@
                     </div>
                 {% endfor %}
 			</div>
-            </div>
+            
+            {% include 'partials/footer.html' %}
         </div>
     </div>
 {% endblock %}
 
-{% block personal_js %}
+{% block js_block %}
     <script>
         (function() {
             var $navLinks = $('a.-nav')

work_sell/templates/worksells_list.html

@@ -1,30 +1,11 @@
-{#{% extends 'partials/base.html' %}#}
+{% extends 'partials/base.html' %}
-
+
-{#{% load staticfiles %}#}
-{#{% load thumbnail %}#}
-{#{% block content %}#}
-{##}
-{##}
-{#    {% include 'partials/header.html' %}#}
-{#    #}
-{#    <div class="container footer-border">#}
-{#        {% include 'partials/footer.html' %}#}
-{#    </div>#}
-{#{% endblock %}#}
-
-
-{% extends 'partials/_base.html' %}
-{% load sass_tags %}
-{% load static %}
-{% load thumbnail %}
 {% load staticfiles %}
+{% load thumbnail %}
+{% block content %}
 
-{% block personal_css %}
-    <link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
-{% endblock %}
 
-{% block content %}
+{% include 'partials/header.html' %}
-    <div class="old-main">
     <div class="container mainScore">
         <div class="row">
             <div class="col-lg-12">
@@ -55,8 +36,7 @@
                                  <input type="hidden" class="-spec-select -spec-select-level-4" style="width: 100%">
                             </div>
 
-                            <input type="hidden" name="{{ form.specialization.html_name }}"
+                            <input type="hidden" name="{{ form.specialization.html_name }}" value="{{ form.specialization.value }}" class="-chosen-spec-id">
-                                   value="{{ form.specialization.value }}" class="-chosen-spec-id">
                         </div>
 
 
@@ -83,6 +63,7 @@
                         </div>
 
 
+
                         <div class="resSearchF1">
                             <div class="col-lg-3">
                                 <p class="titleResF1">Расширенный поиск</p>
@@ -96,6 +77,13 @@
                         </div>
 
 
+
+
+
+
+
+
+
                         <div class="slideRes disTab activeSlide">
                             <div class="titleF1 disTab">
                                 <div class="col-lg-3">Классификация здания</div>
@@ -115,6 +103,9 @@
                         </div>
 
 
+
+
+
                         <div class="slideRes disTab activeSlide">
                             <div class="titleF1 disTab">
                                 <div class="col-lg-3">Местоположение</div>
@@ -122,22 +113,18 @@
 
                             <div class="polsF1 disTab">
                                 <div class="col-lg-3">
-                                    <input type="hidden" class="-location-select -location-select-country"
+                                    <input type="hidden" class="-location-select -location-select-country" style="width: 100%">
-                                           style="width: 100%">
                                 </div>
 
                                 <div class="col-lg-3">
-                                    <input type="hidden" class="-location-select -location-select-region"
+                                    <input type="hidden" class="-location-select -location-select-region" style="width: 100%">
-                                           style="width: 100%">
                                 </div>
 
                                 <div class="col-lg-3">
-                                    <input type="hidden" class="-location-select -location-select-city"
+                                    <input type="hidden" class="-location-select -location-select-city" style="width: 100%">
-                                           style="width: 100%">
                                 </div>
 
-                                <input type="hidden" id="chosenLocationId" name="{{ realty_form.location.html_name }}"
+                                <input type="hidden" id="chosenLocationId" name="{{ realty_form.location.html_name }}" value="{{ realty_form.location.value }}">
-                                       value="{{ realty_form.location.value }}">
                             </div>
 
 
@@ -193,8 +180,7 @@
             </div>
             
             
-{#            {% include 'partials/footer.html' %}#}
+            {% include 'partials/footer.html' %}
-        </div>
         </div>
     </div>
 {% endblock %}