From 2395f6dce2e7e8dabadacd16fed2848107775f14 Mon Sep 17 00:00:00 2001 From: booblegum Date: Thu, 29 Dec 2016 16:58:23 +0300 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"PR-55=20=D0=9F=D0=BE=D0=B4=D0=B2?= =?UTF-8?q?=D0=B0=D0=BB,=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=20=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0?= =?UTF-8?q?=20=D0=B8=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20=D0=BD=D0=B0?= =?UTF-8?q?=20=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE=D0=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 37cdbe19e0afcf91e441a3f4beb8b2b8291a69dd. --- assets/sass/components/custom-components.sass | 1 - assets/sass/old_main.sass | 1 - projects/templates/project_filter.html | 38 +- templates/home.html | 12 +- templates/partials/sass/home.sass | 5 +- users/templates/contractor_filter.html | 2 +- users/templates/contractor_office.html | 478 +++++++++--------- .../contractor_office_chat_projects.html | 17 +- .../contractor_office_open_projects.html | 212 ++++---- work_sell/templates/worksells_list.html | 122 ++--- 10 files changed, 429 insertions(+), 459 deletions(-) diff --git a/assets/sass/components/custom-components.sass b/assets/sass/components/custom-components.sass index a661d75..c465fa1 100644 --- a/assets/sass/components/custom-components.sass +++ b/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 diff --git a/assets/sass/old_main.sass b/assets/sass/old_main.sass index 44d0752..55e381e 100644 --- a/assets/sass/old_main.sass +++ b/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 diff --git a/projects/templates/project_filter.html b/projects/templates/project_filter.html index 9eded84..938f856 100644 --- a/projects/templates/project_filter.html +++ b/projects/templates/project_filter.html @@ -1,32 +1,38 @@ -{% extends 'partials/_base.html' %} +{% extends 'partials/base.html' %} {% load staticfiles %} {% load sass_tags %} -{% block personal_css %} - +{% block head_css %} +{# #} +{# #} +{# #} +{# #} {# other #} {% endblock %} {% block content %} -
-
-
-
-

Поиск заказов

-
- {# FILTER#} - {% include 'partials/inc-projects-filter.html' %} + {% include 'partials/header.html' %} + +
+
+
+

Поиск заказов

+
+ {# FILTER#} + {% include 'partials/inc-projects-filter.html' %} -
-
- {% include 'partials/inc-projects-results.html' %} -
+
+
+ {% include 'partials/inc-projects-results.html' %}
+ + {% include 'partials/footer.html' %}
{% endblock %} -{% block personal_js %} +{% block js_block %} + {{ block.super }} diff --git a/templates/home.html b/templates/home.html index 8ae976c..1ec8623 100644 --- a/templates/home.html +++ b/templates/home.html @@ -28,6 +28,7 @@ {% else %} Я заказчик {% endif %} +

  • @@ -67,18 +68,20 @@
+

Разместить заказ
{% if request.user.is_authenticated and request.user.is_contractor %} - - Я исполнитель + Я + исполнитель {% else %} - - Я исполнитель + Я + исполнитель {% endif %} +

  • @@ -117,6 +120,7 @@
+

Разместить проект
diff --git a/templates/partials/sass/home.sass b/templates/partials/sass/home.sass index e1edad1..945575e 100644 --- a/templates/partials/sass/home.sass +++ b/templates/partials/sass/home.sass @@ -38,9 +38,8 @@ &.customer-list, &.contractor-list text-align: left - //padding-left: 60px - //padding-right: 20px - padding: 20px 20px 0 60px + padding-left: 60px + padding-right: 20px li display: flex align-items: center diff --git a/users/templates/contractor_filter.html b/users/templates/contractor_filter.html index 1354799..3b9e68d 100644 --- a/users/templates/contractor_filter.html +++ b/users/templates/contractor_filter.html @@ -11,7 +11,7 @@ {% block content %}
-
+

Поиск Исполнителей

diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index c0c5cb5..fb02c5f 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -1,315 +1,303 @@ -{% extends 'partials/_base.html' %} +{% extends 'partials/base.html' %} {% load specializtions_tags %} {% load thumbnail %} {% load user_tags %} -{% load sass_tags %} - -{% block personal_css %} - -{% endblock %} {% block content %} - {% include 'partials/modals/add_team_member.html' %} + {% include 'partials/header.html' %} -
-
-
-
-

Личный кабинет

-
+
+
+
+

Личный кабинет

+
- {% include 'partials/contractor_profile_tabs.html' %} - -
-
- {% if contractor.team %} - - {{ contractor.team.name }} - {% get_new_count_message contractor.team request.user %} - - {% else %} - - {% endif %} -
+ {% include 'partials/contractor_profile_tabs.html' %} + +
+
+ {% if contractor.team %} + + {{ contractor.team.name }} + {% get_new_count_message contractor.team request.user %} + + {% else %} + + {% endif %} +
-
- {% for team in contractor.teams.all %} - - {{ team.name }} - {% get_new_count_message team request.user %} - - {% endfor %} -
+
+ {% for team in contractor.teams.all %} + + {{ team.name }} + {% get_new_count_message team request.user %} + + {% endfor %} +
- {% endblock %} diff --git a/users/templates/contractor_office_open_projects.html b/users/templates/contractor_office_open_projects.html index a0bea10..5fbf398 100644 --- a/users/templates/contractor_office_open_projects.html +++ b/users/templates/contractor_office_open_projects.html @@ -105,8 +105,9 @@
{% endfor %}
- +
{% include 'partials/footer.html' %} +
{% endblock %}