PR-14 Модификация шапки аккаунт Исполнителя, иконку в личку

Полностью переделан header
Правки для PR-9

README.md

@@ -106,3 +106,8 @@ python manage.py generate_reviews
 ```
 sudo python3 -m smtpd -n -c DebuggingServer localhost:25
 ```
+
+## Local char server
+```
+python3 -m tornado.autoreload chat/chat.py
+```

assets/css/main.css

@@ -85,15 +85,15 @@ a, a:hover, a:focus, a:active {
     background-color: black;
 }
 
-.logo {
+/*.logo {*/
-    width: 183px;
+    /*width: 183px;*/
-    height: 36px;
+    /*height: 36px;*/
-    background: url('../img/logo.png') no-repeat center;
+    /*background: url('../img/logo.png') no-repeat center;*/
-    background-size: cover;
+    /*background-size: cover;*/
-    float: left;
+    /*float: left;*/
-    margin: 18px 0 21px 10px;
+    /*margin: 18px 0 21px 10px;*/
-    cursor: pointer;
+    /*cursor: pointer;*/
-}
+/*}*/
 
 .mainMenu {
     float: left;

assets/lib/proekton-components/sass/parts/_select-box.sass

@@ -4,6 +4,9 @@
 
 .select-box-container
   display: block
+  li, ul
+    margin: 0
+    padding: 0
 
 .select-box-header
   white-space: nowrap
@@ -37,10 +40,6 @@
   margin: 0
   padding: 0
 
-.select-box-options li, ul
-  margin: 0
-  padding: 0
-
 .select-box-options ul
   border-right: 1px solid #{map_get($component_colors, border)}
 

assets/sass/components/custom-components.sass

@@ -167,7 +167,7 @@ textarea.description
 
   .border
     flex: 1 1 auto
-    margin: 10px 0 0 25px
+    margin-top: 10px
     border-top: 1px solid #CFCFCF
 
 .btn-plus

assets/sass/main.sass

@@ -46,8 +46,6 @@ body
   padding-top: $pad
   padding-bottom: $pad
   margin-top: $pad
-  border-top: 1px solid  #{map_get($component_colors, border)}
-  border-bottom: 1px solid  #{map_get($component_colors, border)}
 
 .select-text
   color: #{map_get($component_colors, select)}

common/templatetags/common_tags.py

@@ -150,6 +150,7 @@ def get(dic, key):
 
 @register.filter
 def max_count(value, max_value):
+    value = int(value) or 0
     if value > max_value:
         return '99+'
     return str(value)

projects/templates/customer_project_create.html

@@ -13,7 +13,7 @@
 
 {% block content %}
     {% include 'partials/modals/project_work_type_suggestion.html' %}
-    {% include 'partials/modals/modal-registration_form.html' %}
+        {% include 'partials/modals/modal-registration_form.html' %}
     {% include 'partials/header.html' %}
     <div class="container main-scope">
         <div class="row title-scope">
@@ -53,6 +53,7 @@
                             <div class="" id="select-box-1"></div>
                         </div>
                         <div class="col-lg-3">
+                            <div class="header">&nbsp;</div>
                             <div href="#" onclick="return false" data-toggle="modal"
                                  data-target="#projectWorkTypeSuggestionModal"
                                  class="btn btn-simple btn-plus">Нет нужной специальности хочу добавить
@@ -266,16 +267,15 @@
                                 </div>
                             </div>
                         </div>
-                        {#                    <div class="row">#}
+                        <div class="row">
-                        {#                        <div class="col-lg-12">#}
-                        {#                            <div class="separator">#}
-                        {#                                <div class="border"></div>#}
-                        {#                            </div>#}
-                        {#                        </div>#}
-                        {#                    </div>#}
-                        <!-- bottom block -->
-                        <div class="row logical-block">
                             <div class="col-lg-12">
+                                <div class="row">
+                                    <div class="col-lg-12">
+                                        <div class="separator">
+                                            <div class="border"></div>
+                                        </div>
+                                    </div>
+                                </div>
                                 <div class="row">
                                     <div class="col-lg-12">
                                         <label class="header mod-align-center">
@@ -344,10 +344,16 @@
                                                     {% if form.cro.value %} checked{% endif %}>
                                         </div>
                                     </div>
-                                </div> <!-- //bottom block -->
+                                </div>
+                                <div class="row">
+                                    <div class="col-lg-12">
+                                        <div class="separator">
+                                            <div class="border"></div>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
-
                     </div> <!-- slide -->
 
                     <div class="row top-line">
@@ -374,9 +380,9 @@
                                 {% else %}
                              style="display: none"
                                 {% endif %}
-                            {% if  unregister_user %}
+                                {% if  unregister_user %}
-                                style="display: none"
+                             style="display: none"
-                            {% endif %}>
+                                {% endif %}>
                             <div class="col-lg-12" style="text-align: center">
                                 <a onclick="return false" class="btn-simple" data-toggle="modal"
                                    data-target="#registrationFormModal">

templates/home.html

@@ -121,7 +121,7 @@
                             </li>
                         </ul>
                         </p>
-                        <a class="create" href="{% url 'work_sell:create' %}">Добавить проект</a>
+                        <a class="create" href="{% url 'work_sell:create' %}">Разместить проект</a>
                     </div>
                 </div>
             </div>
@@ -133,7 +133,11 @@
             </div>
         </div>
     </div>
-    {% include 'partials/footer.html' %}
+    <div style="background-color: #F7F7F7;">
+        <div class="container">
+            {% include 'partials/footer.html' %}
+        </div>
+    </div>
 {% endblock %}
 
 {% block old_js %}

templates/partials/base.html

@@ -1,4 +1,5 @@
-<!doctype html>{% load staticfiles %}
+<!doctype html>
+{% load staticfiles %}
 {#{% load compress %}#}
 <html lang="ru">
 <head>
@@ -135,7 +136,7 @@
             var queryString = '{{ request.get_full_path }}';
 
             if ((queryString.indexOf('/chat') != 0) && (queryString.indexOf('/users/contractor-office/work-projects') != 0)) {
-                domain = domain.replace(':' + port, ':8888');
+                domain = domain.replace(':' + port, '');
                 if (window.location.protocol == 'https:') {
                     var ws = "wss://";
                 } else {

templates/partials/header.html

@@ -12,175 +12,174 @@
 {% endif %}
 
 <link rel='stylesheet' href='{% sass_src "partials/sass/header.sass" %}'>
-
+<header>
-<div class="wrTop {% if request.user.is_authenticated %} disTab {% endif %}">
+    <div class="container">
-    <div class="container-fluid topMain">
         <div class="row">
-            <div style="float: left">
+            <div class="logo">
                 <a href="/">
-                    <div class="logo"></div>
+                    <img src="{% static 'img/logo.png' %}">
                 </a>
             </div>
-
+            <div class="user-nav">
-            {% activeurl %}
+                <ul class="user-items">
-                <div style="height: 100%; display: inline-block; text-align: center">
+                    {% if request.user.is_contractor %}
+                        <li>
+                            <div class="user-info">
+                                <a href="{% url 'wallets:score-detail' pk=request.user.pk %}"
+                                   class="cash">{{ user_balance|floatformat:2 }}р</a>
+                                <a href="{% url 'chat:chat-user' %}#order{{ fist_order_id }}"
+                                   class="icon_hand">{{ num_orders_in_work }}</a>
+                                <a href="{% url 'chat:chat-user' %}" class="icon_chat js-all-messages">
+                                    {{ new_messages_count| max_count:99 }}
+                                </a>
+                            </div>
+                        </li>
+                    {% endif %}
+                    <li>
+                        <div class="imgProfile">
+                            {% if request.user.is_contractor %}
+                                <a href="{{ profile_url }}">
+                                    {% if request.user.avatar %}
+                                        {% thumbnail request.user.avatar "75x75" crop="center" as im %}
+                                            <img src="{{ im.url }}" alt="profile-image">
+                                        {% endthumbnail %}
+                                    {% else %}
+                                        <img src="{% static 'img/profile.jpg' %}" alt="profile-image">
+                                    {% endif %}
+                                </a>
+                            {% elif request.user.is_customer %}
+                                <a href="{{ profile_url }}">
+                                    {% if request.user.avatar %}
+                                        {% thumbnail request.user.avatar "75x75" crop="center" as im %}
+                                            <img src="{{ im.url }}" alt="profile-image">
+                                        {% endthumbnail %}
+                                    {% else %}
+                                        <img src="{% static 'img/profile.jpg' %}" alt="profile-image">
+                                    {% endif %}
+                                </a>
+                            {% endif %}
+                        </div> <!-- //imgProfile -->
+                    </li>
                     {% if request.user.is_authenticated %}
+                        <li>
+                            <div class="infoProfile disTab">
+                                <div class="btn-group" role="group">
+                                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
+                                            aria-haspopup="true" aria-expanded="false">
+                                        <span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span>
+                                    </button>
+                                    <ul class="dropdown-menu menu-drop-new">
+                                        {% if request.user.is_contractor %}
+                                            <li class="icon_mm1">
+                                                <a href="{% url 'auth_login' %}">
+                                                    Войти заказчиком
+                                                    <span></span>
+                                                </a>
+                                            </li>
+                                        {% else %}
+                                            <li class="icon_mm2">
+                                                <a href="{% url 'auth_login' %}">
+                                                    Войти исполнителем
+                                                    <span></span>
+                                                </a>
+                                            </li>
+                                        {% endif %}
+                                        <li class="icon_mm8">
+                                            <a href="{{ profile_url }}">
+                                                Профиль<span></span>
+                                            </a>
+                                        </li>
+                                        <li class="icon_chat">
+                                            <a href="{% url 'chat:chat-user' %}">Сообщения<span></span></a>
+                                            {% if request.user %}
+                                                <div class="circle js-all-messages">{{ new_messages_count| max_count:99 }}</div>
+                                                {#                                        {% count_new_message request.user %}#}
+                                            {% endif %}
+                                        </li>
+                                        <li class="icon_mm4">
+                                            <a href="{% url 'wallets:score-detail' pk=request.user.pk %}">Счет<span></span></a>
+                                        </li>
+                                        <li class="icon_mm5">
+                                            <a href="{% url 'users:user-profile-edit' pk=request.user.pk %}">Настройки<span></span></a>
+                                        </li>
+                                        <li class="icon_mm6">
+                                            <a href="/pages/faq">FAQ<span></span></a>
+                                        </li>
+                                        {% if request.user.is_contractor %}
+                                            <li class="icon_mm2">
+                                                <a href="{% url 'auth_logout' %}">Выйти<span></span></a>
+                                            </li>
+                                        {% else %}
+                                            <li class="icon_mm7">
+                                                <a href="{% url 'auth_logout' %}">Выйти<span></span></a>
+                                            </li>
+                                        {% endif %}
 
-                        <ul class="mainMenu">
+                                    </ul>
+                                </div>
+                            </div>
+                        </li>
+                        <li>
+
+                        {% if request.user.is_contractor %}
+                            {% contractor_indicator request.user %}
+                        {% endif %}
+
+
+
+                        {% if request.user.is_contractor %}
+
+                        {% endif %}
+
+                    {% else %}
+                        <a href="{% url 'registration_register' %}" class="reg">Регистрация</a>
+                        <a href="{% url 'auth_login' %}">
+                            <div class="lock"></div>
+                        </a>
+                    {% endif %}
+                    </li>
+                </ul>
+            </div> <!--// user-nav -->
+            {% activeurl %}
+                <div class="menu-nav">
+                    <ul class="menu-items">
+                        {% if request.user.is_authenticated %}
                             <li class="icon_tm1">
                                 <a href="{% url 'projects:project-filter' %}">Поиск заказов</a>
-                                <span></span>
                             </li>
 
                             {% if request.user.is_contractor %}
-                                <li class="officeList icon_tml">
+                                <li class="icon_tml">
                                     <a href="{% url 'users:contractor-office' %}">
                                         Мой офис {% count_new_message_orders request.user %}
                                     </a>
-                                    <span></span>
                                 </li>
                                 <li class="icon_tm3">
                                     <a href="{% url 'work_sell:list' %}">Готовые проекты</a>
-                                    <span></span>
                                 </li>
                             {% endif %}
-
                             {% if request.user.is_customer %}
                                 <li class="icon_tm2">
                                     <a href="{% url 'users:contractor-filter' %}">Поиск исполнителей</a>
-                                    <span></span>
                                 </li>
                                 <li class="icon_tm3">
                                     <a href="{% url 'work_sell:list' %}">Готовые проекты</a>
-                                    <span></span>
                                 </li>
                             {% endif %}
-                        </ul>
+                        {% else %}
-                        <div style="clear: both"></div>
-                    {% else %}
-                        <ul class="mainMenu">
                             <li class="icon_tm1">
                                 <a href="{% url 'projects:project-filter' %}">Поиск заказов</a>
-                                <span></span>
                             </li>
                             <li class="icon_tm2">
                                 <a href="{% url 'users:contractor-filter' %}">Поиск исполнителей</a>
-                                <span></span>
                             </li>
                             <li class="icon_tm3">
                                 <a href="{% url 'work_sell:list' %}">Готовые проекты</a>
-                                <span></span>
                             </li>
-                        </ul>
+                        {% endif %}
-
+                    </ul>
-                    {% endif %}
                 </div>
             {% endactiveurl %}
-            <div style="float: right">
-                {% if request.user.is_authenticated %}
-                    {% if request.user.is_contractor %}
-                        {% contractor_indicator request.user %}
-                    {% endif %}
-
-                    <div class="infoProfile disTab">
-                        <div class="btn-group" role="group">
-                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
-                                    aria-haspopup="true" aria-expanded="false">
-                                <span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span>
-                            </button>
-                            <ul class="dropdown-menu menu-drop-new">
-                                {% if request.user.is_contractor %}
-                                    <li class="icon_mm1">
-                                        <a href="{% url 'auth_login' %}">
-                                            Войти заказчиком
-                                            <span></span>
-                                        </a>
-                                    </li>
-                                {% else %}
-                                    <li class="icon_mm2">
-                                        <a href="{% url 'auth_login' %}">
-                                            Войти исполнителем
-                                            <span></span>
-                                        </a>
-                                    </li>
-                                {% endif %}
-                                <li class="icon_mm8">
-                                    <a href="{{ profile_url }}">
-                                        Профиль<span></span>
-                                    </a>
-                                </li>
-                                <li class="icon_chat">
-                                    <a href="{% url 'chat:chat-user' %}">Сообщения<span></span></a>
-                                    {% if request.user %}
-                                        <div class="circle js-all-messages">{{ new_messages_count| max_count:99 }}</div>
-{#                                        {% count_new_message request.user %}#}
-                                    {% endif %}
-                                </li>
-                                <li class="icon_mm4">
-                                    <a href="{% url 'wallets:score-detail' pk=request.user.pk %}">Счет<span></span></a>
-                                </li>
-                                <li class="icon_mm5">
-                                    <a href="{% url 'users:user-profile-edit' pk=request.user.pk %}">Настройки<span></span></a>
-                                </li>
-
-                                <li class="icon_mm6">
-                                    <a href="/pages/faq">FAQ<span></span></a>
-                                </li>
-                                {% if request.user.is_contractor %}
-                                    <li class="icon_mm2">
-                                        <a href="{% url 'auth_logout' %}">Выйти<span></span></a>
-                                    </li>
-                                {% else %}
-                                    <li class="icon_mm7">
-                                        <a href="{% url 'auth_logout' %}">Выйти<span></span></a>
-                                    </li>
-                                {% endif %}
-
-                            </ul>
-                        </div>
-                    </div>
-                    <div class="imgProfile">
-                        {% if request.user.is_contractor %}
-                            <a href="{{ profile_url }}">
-                                {% if request.user.avatar %}
-                                    {% thumbnail request.user.avatar "75x75" crop="center" as im %}
-                                        <img src="{{ im.url }}" alt="profile-image">
-                                    {% endthumbnail %}
-                                {% else %}
-                                    <img src="{% static 'img/profile.jpg' %}" alt="profile-image">
-                                {% endif %}
-                            </a>
-                        {% elif request.user.is_customer %}
-                            <a href="{{ profile_url }}">
-                                {% if request.user.avatar %}
-                                    {% thumbnail request.user.avatar "75x75" crop="center" as im %}
-                                        <img src="{{ im.url }}" alt="profile-image">
-                                    {% endthumbnail %}
-                                {% else %}
-                                    <img src="{% static 'img/profile.jpg' %}" alt="profile-image">
-                                {% endif %}
-                            </a>
-                        {% endif %}
-                    </div>
-                    {% if request.user.is_contractor %}
-                        <div class="user-info">
-                            <a href="{% url 'wallets:score-detail' pk=request.user.pk %}"
-                               class="cash">{{ user_balance|floatformat:2 }}р</a>
-                            <a href="{% url 'chat:chat-user' %}#order{{ fist_order_id }}"
-                               class="icon_hand">{{ num_orders_in_work }}</a>
-                            <a href="{% url 'chat:chat-user' %}" class="icon_chat js-all-messages">
-                                {{ new_messages_count| max_count:99 }}
-                            </a>
-                        </div>
-                    {% endif %}
-
-                {% else %}
-                    <a href="{% url 'registration_register' %}" class="reg">Регистрация</a>
-                    <a href="{% url 'auth_login' %}">
-                        <div class="lock"></div>
-                    </a>
-                {% endif %}
-            </div>
         </div>
     </div>
-</div>
+</header>

templates/partials/sass/footer.sass

@@ -7,6 +7,9 @@ footer
     width: 300px
     height: 3px
     background-color: black
+  ul
+    margin: 0
+    padding: 0
 
 
 .logoF

templates/partials/sass/header.sass

@@ -1,381 +1,340 @@
 @import "base/variavles"
 
-.wrTop
-  width: 100%
-  background-color: black
 
-.topMain
-  width: 1200px
-  margin: 0 auto
-  color: #ffffff
-  .dropdown-menu > li > a
-    display: inline-block
-  .col-lg-7
-    width: 55%
-  .col-lg-2
-    width: 19%
-  .mainMenu li
-    cursor: pointer
-    padding-right: 25px
-    a
-      font-size: 15px
-      //&:hover
-      cursor: pointer
 
-  .user-info
+%icons
-    float: right
+  content: ''
-    height: 100%
-    a
-      display: block
-      color: white
-      cursor: pointer
-      &:hover
-        text-decoration: none
-        color: #FF0029
-    .cash
-      text-align: right
-      padding-top: 4px
-    .icon_hand
-      padding-left: 26px
-      background:
-        image: url("#{$static}/img/icons/icon_hands.png")
-        size: 24px 24px
-        repeat: no-repeat
-      &:hover
-        background-image: url("#{$static}/img/icons/icon_hands_red.png")
-    .icon_chat
-      margin-top: 4px
-      padding-left: 26px
-      background:
-        image: url("#{$static}/img/icons/icon_speach-ball.png")
-        size: 18px 18px
-        repeat: no-repeat
-      &:hover
-        background-image: url("#{$static}/img/icons/icon_speach-ball_red.png")
-
-.circle
-  background-color: red
-  border-radius: 50%
-  width: 30px
-  height: 30px
-  line-height: 30px
   display: inline-block
-  text-align: center
+  vertical-align: middle
-  //align-items: center
+  margin-right: 5px
-
-.welcomeMain
-  width: 100%
-  float: left
-  font-size: 48px
-  text-align: center
-  padding: 54px 0 39px 0
-  font-family: 'pfbeausanspro-thin', sans-serif
-
-.welcomeMain
-  line-height: 48px
-  font-family: 'pfdintextcomppro-regular', sans-serif
-  font-size: 43px
-
-.logo
-  width: 183px
-  height: 36px
-  background: url('#{$static}/img/logo.png') no-repeat center
   background-size: cover
-  float: left
-  margin: 18px 0 21px 10px
-  cursor: pointer
 
-.mainMenu
+header
-  float: left
+  font-size: 11pt
-  margin: 26px 0 0 0
+  ul
-  padding-left: 60px
+    padding-left: 0
-  li
+    margin: 0
+  background-color: #000
+  color: #FFF
+  .logo
     float: left
-    position: relative
+    height: 75px
-    padding-right: 30px
+    display: flex
-    list-style: none
+    align-items: center
-    a
-      text-decoration: none
-      border-bottom: 3px solid transparent
-      -webkit-transition: all 0.4s ease-out
-      -moz-transition: all 0.4s ease-out
-      transition: all 0.4s ease-out
-    &:hover a
-      border-color: #ff0029
-    span
-      content: ''
-      position: absolute
-      height: 23px
-      left: 0
-      top: -1px
-  .icon_tm1 span
-    width: 26px
-    //background: url('../img/listMain.png') no-repeat left
-    background-size: cover
-    background: url('#{$static}/img/listMain.png') no-repeat 0 0
-  .icon_tm2 span
-    width: 22px
-    background-size: cover
-    background: url('#{$static}/img/listMain.png') no-repeat -26px 0
-  .icon_tm3 span
-    width: 24px
-    background-size: cover
-    background: url('#{$static}/img/listMain.png') no-repeat -48px 0
-
-  .icon_tml span
-    content: ''
-    position: absolute
-    width: 27px
-    height: 24px
-    //left: -35px
-    top: 0
-    background: url('#{$static}/img/list4.png') no-repeat center !important
-    background-size: cover !important
-
-.icon_tml:hover span
-  background: url('#{$static}/img/list4tml.png') no-repeat center !important
-  background-size: cover !important
-
-.icon_tm1:hover span
-  width: 26px
-  background: url('#{$static}/img/listMain2.png') no-repeat left !important
-  background-size: cover
-  background-position: 0 0 !important
-
-.icon_tm2:hover span
-  width: 22px
-  background: url('#{$static}/img/listMain2.png') no-repeat left !important
-  background-size: cover
-  background-position: -26px 0 !important
-
-.icon_tm3:hover span
-  width: 26px !important
-  background: url('#{$static}/img/listMain2.png') no-repeat left !important
-  background-size: cover
-  background-position: -49px 0 !important
-
-.rating
-  width: 46px
-  height: 46px
-  float: right
-  border-radius: 100%
-  background-color: #4D4D4D
-  margin: 15px 0 0 10px
-  position: relative
 
-.ratingInset
+  .menu-nav
-  width: 46px
+    display: flex
-  height: 46px
+    justify-content: center
-  border-radius: 100%
+    //align-items: center
-  background-color: #FF0027
+    height: 75px
-  position: absolute
+    a, a:hover
-  /*left:-1.859px;*/
+      color: #FFF
-  /*bottom: 3px;*/
+      text-decoration: none
-  clip: rect(0, 22px, 50px, 0)
+      padding-left: 4px
-  transform: rotate(-90deg)
+    .menu-items
+      display: inline-flex
+      .count
+        display: inline-block
+        color: red
+        font-family: 'pfbeausanspro-reg', sans-serif
+        background: none
+        border-radius: 0
+        position: inherit
+        padding-left: 5px
+        padding-bottom: 0
+        line-height: 1em
+        line-break: auto
+      li
+        list-style: none
+      a
+        display: flex
+        align-items: center
 
-.iconRating
+        height: 75px
-  width: 100%
+        margin-right: 20px
-  height: 100%
+        cursor: pointer
-  position: absolute
+        border-bottom: 3px solid black
-  left: 0
+        pointer-events: stroke
-  top: 0
+      .icon_tm1 a:before
-  background: url('#{$static}/img/button12.png') no-repeat center
+        @extend %icons
+        width: 26px
+        height: 26px
+        background: url('#{$static}/img/listMain.png') no-repeat 0 0
+      .icon_tm2 a:before
+        @extend %icons
+        width: 22px
+        height: 22px
+        background: url('#{$static}/img/listMain.png') no-repeat -26px 0
+      .icon_tm3 a:before
+        @extend %icons
+        width: 24px
+        height: 24px
+        background: url('#{$static}/img/listMain.png') no-repeat -48px 0
+      .icon_tml a:before
+        @extend %icons
+        width: 27px
+        height: 24px
+        background: url('#{$static}/img/list4.png') no-repeat center
 
-.ratingPer
+      .icon_tml a:hover
-  color: #ff2c2c
+        border-bottom: 3px solid red
-  font-size: 18px
+        &:before
-  font-family: 'pfdintextcomppro-regular', sans-serif
+          background: url('#{$static}/img/list4tml.png') no-repeat center
-  float: right
+          background-size: cover
-  margin: 28px 0 0 9px
+      .icon_tm1 a:hover
-  cursor: pointer
+        border-bottom: 3px solid red
+        &:before
+          background-size: cover
+          width: 26px
+          background: url('#{$static}/img/listMain2.png') no-repeat 0 0
+      .icon_tm2 a:hover
+        border-bottom: 3px solid red
+        &:before
+          width: 22px
+          background-size: cover
+          background: url('#{$static}/img/listMain2.png') no-repeat -26px 0
 
-.mainMenu li
+      .icon_tm3 a:hover
-  &:last-child
+        border-bottom: 3px solid red
-    padding-right: 0
+        &:before
-  a
+          background:
-    color: white
+            image: url('#{$static}/img/listMain2.png')
-    font-size: 18px
+            repeat: no-repeat
-    padding: 30px 0 27px 40px
+            position: -50px 0
-    font-family: 'pfbeausanspro-reg', sans-serif
+          background-size: cover
-  &.active > a
+  .user-nav
-    border-color: #ff0029
+    float: right
-  &.icon_tm1.active span
+    height: 75px
-    background: url('#{$static}/img/listMain2.png') no-repeat !important
+    .user-items
-  &.officeList.active span
+      display: flex
-    background: url('#{$static}/img/list4tml.png') no-repeat center !important
+      align-items: center
-  &.icon_tm2.active span
+      li
-    background: url('#{$static}/img/listMain2.png') no-repeat center !important
+        display: inline-block
-  &.icon_tm3.active span
+        .user-info
-    background: url('#{$static}/img/listMain2.png') no-repeat right !important
+          vertical-align: middle
+          padding-right: 5px
+          a
+            display: block
+            color: white
+            cursor: pointer
+            &:hover
+              text-decoration: none
+              color: #FF0029
+          .cash
+            text-align: right
+            padding-top: 4px
+          .icon_hand
+            padding-left: 26px
+            background:
+              image: url("#{$static}/img/icons/icon_hands.png")
+              size: 24px 24px
+              repeat: no-repeat
+            &:hover
+              background-image: url("#{$static}/img/icons/icon_hands_red.png")
+          .icon_chat
+            margin-top: 4px
+            padding-left: 26px
+            background:
+              image: url("#{$static}/img/icons/icon_speach-ball.png")
+              size: 18px 18px
+              repeat: no-repeat
+            &:hover
+              background-image: url("#{$static}/img/icons/icon_speach-ball_red.png")
+      .imgProfile
+        margin: 0 //глушим main.css
+        img
+          width: 75px
+          height: 75px
+      .reg, .reg:link, .reg:visited
+        color: #fb1818
+        font-size: 16px
+        text-transform: uppercase
+        float: left
+        line-height: 75px
+        font-family: 'pfdintextcomppro-regular', sans-serif
+        letter-spacing: 4px
+        text-decoration: none
 
-li.officeList.icon_tml > a > .count
+      .lock
-  display: inline-block
+        width: 75px
-  color: red
+        height: 75px
-  font-family: 'pfbeausanspro-reg', sans-serif
+        background: url('#{$static}/img/lock.png') no-repeat center, white
-  //padding: 5px 7px 3px 7px
+        float: right
-  background: none
+        cursor: pointer
-  border-radius: 0
+        margin-left: 20px
-  position: inherit
+        margin-right: 0
-  //right: -34px
+      .rating
-  //top: -4px
+        display: flex
+        align-items: center
+        position: relative
+        cursor: pointer
+        margin-left: 10px
 
-.reg, .reg:link, .reg:visited
+      .ratingInset
-  color: #fb1818
+        width: 46px
-  font-size: 16px
+        height: 46px
-  text-transform: uppercase
+        border-radius: 100%
-  float: left
+        background-color: #FF0027
-  line-height: 75px
+        display: inline-block
-  font-family: 'pfdintextcomppro-regular', sans-serif
+        /* position: absolute; */
-  letter-spacing: 4px
+        /* left: -1.859px; */
+        /* bottom: 3px; */
+        clip: rect(0, 22px, 50px, 0)
+        transform: rotate(-90deg)
 
-.lock
+      .iconRating
-  width: 75px
+        width: 46px
-  height: 75px
+        height: 46px
-  background: url('#{$static}/img/lock.png') no-repeat center, white
+        position: absolute
-  float: right
+        left: 0
-  cursor: pointer
+        top: 0
-  margin: 0 -25px 0 0
+        background: url('#{$static}/img/button12.png') no-repeat center
 
-.imgProfile
+      .ratingPer
-  width: 75px
+        color: #ff2c2c
-  height: 75px
+        font-size: 18px
-  float: right
+        font-family: 'pfdintextcomppro-regular', sans-serif
-  margin: 0
+        margin: 0
-  padding-left: 5px
+        padding-left: 8px
-  img
-    display: block
-    width: 100%
-    height: 100%
 
-.infoProfile
+    .infoProfile
-  float: right
+    .btn-group
-  .btn-group
+      .btn
-    .btn
+        width: 75px
-      width: 75px
+        height: 75px
-      height: 75px
+        float: left
-      float: left
+        border-radius: 0 !important
-      border-radius: 0 !important
+        background-color: black
+        border: none
+        span
+          color: white
+          font-size: 26px
+      .dropdown-toggle
+        &:hover, &:active, &:focus
+          -webkit-box-shadow: inset 0 3px 5px rgba(255, 0, 39, 0.99)
+          -moz-box-shadow: inset 0 3px 5px rgba(255, 0, 39, 0.99)
+          box-shadow: inset 0 3px 5px rgba(255, 0, 39, 0.99)
+          background-color: rgb(255, 0, 39)
+    .dropdown-menu
+      border-radius: 0
       background-color: black
-      border: none
+      left: -174px
-      span
+      margin: -1px 100% 0 0
-        color: white
+      float: left
-        font-size: 26px
+      width: 250px
-    .dropdown-toggle
+      height: auto
-      &:hover, &:active, &:focus
+      padding: 30px 20px 15px 40px
-        -webkit-box-shadow: inset 0 3px 5px rgba(255, 0, 39, 0.99)
+      border-top: 3px solid #ff2c2c
-        -moz-box-shadow: inset 0 3px 5px rgba(255, 0, 39, 0.99)
+      li
-        box-shadow: inset 0 3px 5px rgba(255, 0, 39, 0.99)
+        display: block
-        background-color: rgb(255, 0, 39)
+        margin-bottom: 10px
-  .dropdown-menu
+        &:last-child
-    border-radius: 0
+          margin-bottom: 0
-    background-color: black
+        a
-    left: -174px
-    margin: -1px 100% 0 0
-    float: left
-    width: 250px
-    height: auto
-    padding: 30px 20px 15px 40px
-    border-top: 3px solid #ff2c2c
-    li
-      margin-bottom: 10px
-      &:last-child
-        margin-bottom: 0
-      a
-        color: white
-        font-size: 17px
-        font-family: 'pfbeausanspro-reg', sans-serif
-        position: relative
-        &:link, &:visited
           color: white
           font-size: 17px
           font-family: 'pfbeausanspro-reg', sans-serif
           position: relative
-        &:hover, &:active
+          &:link, &:visited
-          background-color: black !important
+            color: white
-          color: #ff2c2c
+            font-size: 17px
-        span
+            font-family: 'pfbeausanspro-reg', sans-serif
-          content: ''
+            position: relative
-          position: absolute
+          &:hover, &:active
-          width: 20px
+            background-color: black !important
-          left: -18px
+            color: #ff2c2c
-          top: 4px
+          span
-    .icon_mm1 a span
+            content: ''
-      height: 20px
+            position: absolute
-      background-size: cover
+            width: 20px
-      background: url('#{$static}/img/menu.png') no-repeat 0 0
+            left: -18px
-    .icon_mm2 a span
+            top: 4px
-      height: 22px
+      .icon_mm1 a span
-      background-size: cover
+        height: 20px
-      background: url('#{$static}/img/menu.png') no-repeat 0 -20px
+        background-size: cover
-    .icon_mm3 a span
+        background: url('#{$static}/img/menu.png') no-repeat 0 0
-      height: 13px
+      .icon_mm2 a span
-      background-size: cover
+        height: 22px
-      background: url('#{$static}/img/menu.png') no-repeat 0 -42px
+        background-size: cover
-      top: 6px
+        background: url('#{$static}/img/menu.png') no-repeat 0 -20px
-    .icon_mm4 a span
+      .icon_mm3 a span
-      height: 20px
+        height: 13px
-      background-size: cover
+        background-size: cover
-      background: url('#{$static}/img/menu.png') no-repeat 0 -55px
+        background: url('#{$static}/img/menu.png') no-repeat 0 -42px
-    .icon_mm5 a span
+        top: 6px
-      height: 20px
+      .icon_mm4 a span
-      background-size: cover
+        height: 20px
-      background: url('#{$static}/img/menu.png') no-repeat 0 -75px
+        background-size: cover
-    .icon_mm6 a span
+        background: url('#{$static}/img/menu.png') no-repeat 0 -55px
-      height: 20px
+      .icon_mm5 a span
-      background-size: cover
+        height: 20px
-      background: url('#{$static}/img/menu.png') no-repeat 0 -95px
+        background-size: cover
-    .icon_mm7 a span
+        background: url('#{$static}/img/menu.png') no-repeat 0 -75px
-      height: 20px
+      .icon_mm6 a span
-      background-size: cover
+        height: 20px
-      background: url('#{$static}/img/menu.png') no-repeat 0 0
+        background-size: cover
-    .icon_mm8 a span
+        background: url('#{$static}/img/menu.png') no-repeat 0 -95px
-      height: 20px
+      .icon_mm7 a span
-      background-size: contain
+        height: 20px
-      background: url('#{$static}/img/user-5.png') no-repeat 0 0
+        background-size: cover
-    .icon_chat a span
+        background: url('#{$static}/img/menu.png') no-repeat 0 0
-      height: 20px
+      .icon_mm8 a span
-      background:
+        height: 20px
-        image: url("#{$static}/img/icons/icon_speach-ball.png")
+        background-size: contain
-        size: contain
+        background: url('#{$static}/img/user-5.png') no-repeat 0 0
-        repeat: no-repeat
+      .icon_chat a span
+        height: 20px
+        background:
+          image: url("#{$static}/img/icons/icon_speach-ball.png")
+          size: contain
+          repeat: no-repeat
+      .icon_chat a
+          display: inline-block
+      .circle
+        background-color: red
+        border-radius: 50%
+        width: 30px
+        height: 30px
+        line-height: 30px
+        display: inline-block
+        text-align: center
 
-    .icon_mm1 a:hover span
+      .icon_mm1 a:hover span
-      height: 20px
+        height: 20px
-      background: url('#{$static}/img/menu2.png') no-repeat center !important
+        background: url('#{$static}/img/menu2.png') no-repeat center !important
-      background-size: cover !important
+        background-size: cover !important
-      background-position: 0 0 !important
+        background-position: 0 0 !important
-    .icon_mm2 a:hover span
+      .icon_mm2 a:hover span
-      height: 22px
+        height: 22px
-      background-size: cover
+        background-size: cover
-      background: url('#{$static}/img/menu2.png') no-repeat 0 -20px
+        background: url('#{$static}/img/menu2.png') no-repeat 0 -20px
-    .icon_mm3 a:hover span
+      .icon_mm3 a:hover span
-      height: 13px
+        height: 13px
-      background-size: cover
+        background-size: cover
-      background: url('#{$static}/img/menu2.png') no-repeat 0 -42px
+        background: url('#{$static}/img/menu2.png') no-repeat 0 -42px
-    .icon_mm4 a:hover span
+      .icon_mm4 a:hover span
-      height: 20px
+        height: 20px
-      background-size: cover
+        background-size: cover
-      background: url('#{$static}/img/menu2.png') no-repeat 0 -55px
+        background: url('#{$static}/img/menu2.png') no-repeat 0 -55px
-    .icon_mm5 a:hover span
+      .icon_mm5 a:hover span
-      height: 20px
+        height: 20px
-      background-size: cover
+        background-size: cover
-      background: url('#{$static}/img/menu2.png') no-repeat 0 -75px
+        background: url('#{$static}/img/menu2.png') no-repeat 0 -75px
-    .icon_mm6 a:hover span
+      .icon_mm6 a:hover span
-      height: 20px
+        height: 20px
-      background-size: cover
+        background-size: cover
-      background: url('#{$static}/img/menu2.png') no-repeat 0 -95px
+        background: url('#{$static}/img/menu2.png') no-repeat 0 -95px
-    .icon_mm7 a:hover span
+      .icon_mm7 a:hover span
-      height: 20px
+        height: 20px
-      background-size: cover
+        background-size: cover
-      background: url('#{$static}/img/menu2.png') no-repeat 0 0
+        background: url('#{$static}/img/menu2.png') no-repeat 0 0
-    .icon_mm8 a:hover span
+      .icon_mm8 a:hover span
-      height: 20px
+        height: 20px
-      background-size: contain
+        background-size: contain
-      background: url('#{$static}/img/user-4.png') no-repeat 0 0
+        background: url('#{$static}/img/user-4.png') no-repeat 0 0
-    .icon_chat a:hover span
+      .icon_chat a:hover span
-      height: 20px
+        height: 20px
-      background:
+        background:
-        image: url("#{$static}/img/icons/icon_speach-ball_red.png")
+          image: url("#{$static}/img/icons/icon_speach-ball_red.png")
-        size: contain
+          size: contain
-        repeat: no-repeat
+          repeat: no-repeat

templates/partials/sass/home.sass

@@ -16,6 +16,19 @@
     image: url("#{$static}/img/sprite.png")
     repeat: no-repeat
 
+.welcomeMain
+  width: 100%
+  float: left
+  font-size: 48px
+  text-align: center
+  padding: 54px 0 39px 0
+  font-family: 'pfbeausanspro-thin', sans-serif
+
+.welcomeMain
+  line-height: 48px
+  font-family: 'pfdintextcomppro-regular', sans-serif
+  font-size: 43px
+
 .infoBlock
   //padding: 113px 0 0 0
   height: 100%
@@ -101,7 +114,8 @@
   a.create
     font-family: Myriad, sans-serif
     font-weight: normal
-    font-size: 18pt
+    font-size: 20px
+    letter-spacing: 4px
     display: inline-block
     margin-top: 40px
     text-transform: uppercase

templates/partials/trash/header.html

@@ -0,0 +1,186 @@
+{% load staticfiles %}
+{% load thumbnail %}
+{% load user_tags %}
+{% load activeurl %}
+{% load sass_tags %}
+{% load common_tags %}
+
+{% if request.user.is_contractor %}
+    {% url 'users:contractor-profile' pk=request.user.pk as profile_url %}
+{% elif request.user.is_customer %}
+    {% url 'users:customer-profile-open-projects' pk=request.user.pk as profile_url %}
+{% endif %}
+
+<link rel='stylesheet' href='{% sass_src "partials/sass/header.sass" %}'>
+
+<div class="wrTop {% if request.user.is_authenticated %} disTab {% endif %}">
+    <div class="container-fluid topMain">
+        <div class="row">
+            <div style="float: left">
+                <a href="/">
+                    <div class="logo"></div>
+                </a>
+            </div>
+
+            {% activeurl %}
+                <div style="height: 100%; display: inline-block; text-align: center">
+                    {% if request.user.is_authenticated %}
+
+                        <ul class="mainMenu">
+                            <li class="icon_tm1">
+                                <a href="{% url 'projects:project-filter' %}">Поиск заказов</a>
+                                <span></span>
+                            </li>
+
+                            {% if request.user.is_contractor %}
+                                <li class="officeList icon_tml">
+                                    <a href="{% url 'users:contractor-office' %}">
+                                        Мой офис {% count_new_message_orders request.user %}
+                                    </a>
+                                    <span></span>
+                                </li>
+                                <li class="icon_tm3">
+                                    <a href="{% url 'work_sell:list' %}">Готовые проекты</a>
+                                    <span></span>
+                                </li>
+                            {% endif %}
+
+                            {% if request.user.is_customer %}
+                                <li class="icon_tm2">
+                                    <a href="{% url 'users:contractor-filter' %}">Поиск исполнителей</a>
+                                    <span></span>
+                                </li>
+                                <li class="icon_tm3">
+                                    <a href="{% url 'work_sell:list' %}">Готовые проекты</a>
+                                    <span></span>
+                                </li>
+                            {% endif %}
+                        </ul>
+                        <div style="clear: both"></div>
+                    {% else %}
+                        <ul class="mainMenu">
+                            <li class="icon_tm1">
+                                <a href="{% url 'projects:project-filter' %}">Поиск заказов</a>
+                                <span></span>
+                            </li>
+                            <li class="icon_tm2">
+                                <a href="{% url 'users:contractor-filter' %}">Поиск исполнителей</a>
+                                <span></span>
+                            </li>
+                            <li class="icon_tm3">
+                                <a href="{% url 'work_sell:list' %}">Готовые проекты</a>
+                                <span></span>
+                            </li>
+                        </ul>
+
+                    {% endif %}
+                </div>
+            {% endactiveurl %}
+            <div style="float: right">
+                {% if request.user.is_authenticated %}
+                    {% if request.user.is_contractor %}
+                        {% contractor_indicator request.user %}
+                    {% endif %}
+
+                    <div class="infoProfile disTab">
+                        <div class="btn-group" role="group">
+                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
+                                    aria-haspopup="true" aria-expanded="false">
+                                <span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span>
+                            </button>
+                            <ul class="dropdown-menu menu-drop-new">
+                                {% if request.user.is_contractor %}
+                                    <li class="icon_mm1">
+                                        <a href="{% url 'auth_login' %}">
+                                            Войти заказчиком
+                                            <span></span>
+                                        </a>
+                                    </li>
+                                {% else %}
+                                    <li class="icon_mm2">
+                                        <a href="{% url 'auth_login' %}">
+                                            Войти исполнителем
+                                            <span></span>
+                                        </a>
+                                    </li>
+                                {% endif %}
+                                <li class="icon_mm8">
+                                    <a href="{{ profile_url }}">
+                                        Профиль<span></span>
+                                    </a>
+                                </li>
+                                <li class="icon_chat">
+                                    <a href="{% url 'chat:chat-user' %}">Сообщения<span></span></a>
+                                    {% if request.user %}
+                                        <div class="circle js-all-messages">{{ new_messages_count| max_count:99 }}</div>
+{#                                        {% count_new_message request.user %}#}
+                                    {% endif %}
+                                </li>
+                                <li class="icon_mm4">
+                                    <a href="{% url 'wallets:score-detail' pk=request.user.pk %}">Счет<span></span></a>
+                                </li>
+                                <li class="icon_mm5">
+                                    <a href="{% url 'users:user-profile-edit' pk=request.user.pk %}">Настройки<span></span></a>
+                                </li>
+
+                                <li class="icon_mm6">
+                                    <a href="/pages/faq">FAQ<span></span></a>
+                                </li>
+                                {% if request.user.is_contractor %}
+                                    <li class="icon_mm2">
+                                        <a href="{% url 'auth_logout' %}">Выйти<span></span></a>
+                                    </li>
+                                {% else %}
+                                    <li class="icon_mm7">
+                                        <a href="{% url 'auth_logout' %}">Выйти<span></span></a>
+                                    </li>
+                                {% endif %}
+
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="imgProfile">
+                        {% if request.user.is_contractor %}
+                            <a href="{{ profile_url }}">
+                                {% if request.user.avatar %}
+                                    {% thumbnail request.user.avatar "75x75" crop="center" as im %}
+                                        <img src="{{ im.url }}" alt="profile-image">
+                                    {% endthumbnail %}
+                                {% else %}
+                                    <img src="{% static 'img/profile.jpg' %}" alt="profile-image">
+                                {% endif %}
+                            </a>
+                        {% elif request.user.is_customer %}
+                            <a href="{{ profile_url }}">
+                                {% if request.user.avatar %}
+                                    {% thumbnail request.user.avatar "75x75" crop="center" as im %}
+                                        <img src="{{ im.url }}" alt="profile-image">
+                                    {% endthumbnail %}
+                                {% else %}
+                                    <img src="{% static 'img/profile.jpg' %}" alt="profile-image">
+                                {% endif %}
+                            </a>
+                        {% endif %}
+                    </div>
+                    {% if request.user.is_contractor %}
+                        <div class="user-info">
+                            <a href="{% url 'wallets:score-detail' pk=request.user.pk %}"
+                               class="cash">{{ user_balance|floatformat:2 }}р</a>
+                            <a href="{% url 'chat:chat-user' %}#order{{ fist_order_id }}"
+                               class="icon_hand">{{ num_orders_in_work }}</a>
+                            <a href="{% url 'chat:chat-user' %}" class="icon_chat js-all-messages">
+                                {{ new_messages_count| max_count:99 }}
+                            </a>
+                        </div>
+                    {% endif %}
+
+                {% else %}
+                    <a href="{% url 'registration_register' %}" class="reg">Регистрация</a>
+                    <a href="{% url 'auth_login' %}">
+                        <div class="lock"></div>
+                    </a>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+</div>

templates/partials/trash/header.sass

@@ -0,0 +1,370 @@
+@import "base/variavles"
+
+.wrTop
+  width: 100%
+  background-color: black
+
+.topMain
+  width: 1200px
+  margin: 0 auto
+  color: #ffffff
+  .dropdown-menu > li > a
+    display: inline-block
+  .col-lg-7
+    width: 55%
+  .col-lg-2
+    width: 19%
+  .mainMenu li
+    cursor: pointer
+    padding-right: 25px
+    a
+      font-size: 15px
+      //&:hover
+      cursor: pointer
+
+  .user-info
+    float: right
+    height: 100%
+    a
+      display: block
+      color: white
+      cursor: pointer
+      &:hover
+        text-decoration: none
+        color: #FF0029
+    .cash
+      text-align: right
+      padding-top: 4px
+    .icon_hand
+      padding-left: 26px
+      background:
+        image: url("#{$static}/img/icons/icon_hands.png")
+        size: 24px 24px
+        repeat: no-repeat
+      &:hover
+        background-image: url("#{$static}/img/icons/icon_hands_red.png")
+    .icon_chat
+      margin-top: 4px
+      padding-left: 26px
+      background:
+        image: url("#{$static}/img/icons/icon_speach-ball.png")
+        size: 18px 18px
+        repeat: no-repeat
+      &:hover
+        background-image: url("#{$static}/img/icons/icon_speach-ball_red.png")
+
+.circle
+  background-color: red
+  border-radius: 50%
+  width: 30px
+  height: 30px
+  line-height: 30px
+  display: inline-block
+  text-align: center
+  //align-items: center
+
+.logo
+  width: 183px
+  height: 36px
+  background: url('#{$static}/img/logo.png') no-repeat center
+  background-size: cover
+  float: left
+  margin: 18px 0 21px 10px
+  cursor: pointer
+
+.mainMenu
+  float: left
+  margin: 26px 0 0 0
+  padding-left: 60px
+  li
+    float: left
+    position: relative
+    padding-right: 30px
+    list-style: none
+    a
+      text-decoration: none
+      border-bottom: 3px solid transparent
+      -webkit-transition: all 0.4s ease-out
+      -moz-transition: all 0.4s ease-out
+      transition: all 0.4s ease-out
+    &:hover a
+      border-color: #ff0029
+    span
+      content: ''
+      position: absolute
+      height: 23px
+      left: 0
+      top: -1px
+  .icon_tm1 span
+    width: 26px
+    //background: url('../img/listMain.png') no-repeat left
+    background-size: cover
+    background: url('#{$static}/img/listMain.png') no-repeat 0 0
+  .icon_tm2 span
+    width: 22px
+    background-size: cover
+    background: url('#{$static}/img/listMain.png') no-repeat -26px 0
+  .icon_tm3 span
+    width: 24px
+    background-size: cover
+    background: url('#{$static}/img/listMain.png') no-repeat -48px 0
+
+  .icon_tml span
+    content: ''
+    position: absolute
+    width: 27px
+    height: 24px
+    //left: -35px
+    top: 0
+    background: url('#{$static}/img/list4.png') no-repeat center !important
+    background-size: cover !important
+
+.icon_tml:hover span
+  background: url('#{$static}/img/list4tml.png') no-repeat center !important
+  background-size: cover !important
+
+.icon_tm1:hover span
+  width: 26px
+  background: url('#{$static}/img/listMain2.png') no-repeat left !important
+  background-size: cover
+  background-position: 0 0 !important
+
+.icon_tm2:hover span
+  width: 22px
+  background: url('#{$static}/img/listMain2.png') no-repeat left !important
+  background-size: cover
+  background-position: -26px 0 !important
+
+.icon_tm3:hover span
+  width: 26px !important
+  background: url('#{$static}/img/listMain2.png') no-repeat left !important
+  background-size: cover
+  background-position: -49px 0 !important
+
+.rating
+  width: 46px
+  height: 46px
+  float: right
+  border-radius: 100%
+  background-color: #4D4D4D
+  margin: 15px 0 0 10px
+  position: relative
+
+.ratingInset
+  width: 46px
+  height: 46px
+  border-radius: 100%
+  background-color: #FF0027
+  position: absolute
+  /*left:-1.859px;*/
+  /*bottom: 3px;*/
+  clip: rect(0, 22px, 50px, 0)
+  transform: rotate(-90deg)
+
+.iconRating
+  width: 100%
+  height: 100%
+  position: absolute
+  left: 0
+  top: 0
+  background: url('#{$static}/img/button12.png') no-repeat center
+
+.ratingPer
+  color: #ff2c2c
+  font-size: 18px
+  font-family: 'pfdintextcomppro-regular', sans-serif
+  float: right
+  margin: 28px 0 0 9px
+  cursor: pointer
+
+.mainMenu li
+  &:last-child
+    padding-right: 0
+  a
+    color: white
+    font-size: 18px
+    padding: 30px 0 27px 40px
+    font-family: 'pfbeausanspro-reg', sans-serif
+  &.active > a
+    border-color: #ff0029
+  &.icon_tm1.active span
+    background: url('#{$static}/img/listMain2.png') no-repeat !important
+  &.officeList.active span
+    background: url('#{$static}/img/list4tml.png') no-repeat center !important
+  &.icon_tm2.active span
+    background: url('#{$static}/img/listMain2.png') no-repeat center !important
+  &.icon_tm3.active span
+    background: url('#{$static}/img/listMain2.png') no-repeat right !important
+
+li.officeList.icon_tml > a > .count
+  display: inline-block
+  color: red
+  font-family: 'pfbeausanspro-reg', sans-serif
+  //padding: 5px 7px 3px 7px
+  background: none
+  border-radius: 0
+  position: inherit
+  //right: -34px
+  //top: -4px
+
+.reg, .reg:link, .reg:visited
+  color: #fb1818
+  font-size: 16px
+  text-transform: uppercase
+  float: left
+  line-height: 75px
+  font-family: 'pfdintextcomppro-regular', sans-serif
+  letter-spacing: 4px
+  text-decoration: none
+
+.lock
+  width: 75px
+  height: 75px
+  background: url('#{$static}/img/lock.png') no-repeat center, white
+  float: right
+  cursor: pointer
+  margin-left: 20px
+  margin-right: 0
+
+.imgProfile
+  width: 75px
+  height: 75px
+  float: right
+  margin: 0
+  padding-left: 5px
+  img
+    display: block
+    width: 100%
+    height: 100%
+
+.infoProfile
+  float: right
+  .btn-group
+    .btn
+      width: 75px
+      height: 75px
+      float: left
+      border-radius: 0 !important
+      background-color: black
+      border: none
+      span
+        color: white
+        font-size: 26px
+    .dropdown-toggle
+      &:hover, &:active, &:focus
+        -webkit-box-shadow: inset 0 3px 5px rgba(255, 0, 39, 0.99)
+        -moz-box-shadow: inset 0 3px 5px rgba(255, 0, 39, 0.99)
+        box-shadow: inset 0 3px 5px rgba(255, 0, 39, 0.99)
+        background-color: rgb(255, 0, 39)
+  .dropdown-menu
+    border-radius: 0
+    background-color: black
+    left: -174px
+    margin: -1px 100% 0 0
+    float: left
+    width: 250px
+    height: auto
+    padding: 30px 20px 15px 40px
+    border-top: 3px solid #ff2c2c
+    li
+      margin-bottom: 10px
+      &:last-child
+        margin-bottom: 0
+      a
+        color: white
+        font-size: 17px
+        font-family: 'pfbeausanspro-reg', sans-serif
+        position: relative
+        &:link, &:visited
+          color: white
+          font-size: 17px
+          font-family: 'pfbeausanspro-reg', sans-serif
+          position: relative
+        &:hover, &:active
+          background-color: black !important
+          color: #ff2c2c
+        span
+          content: ''
+          position: absolute
+          width: 20px
+          left: -18px
+          top: 4px
+    .icon_mm1 a span
+      height: 20px
+      background-size: cover
+      background: url('#{$static}/img/menu.png') no-repeat 0 0
+    .icon_mm2 a span
+      height: 22px
+      background-size: cover
+      background: url('#{$static}/img/menu.png') no-repeat 0 -20px
+    .icon_mm3 a span
+      height: 13px
+      background-size: cover
+      background: url('#{$static}/img/menu.png') no-repeat 0 -42px
+      top: 6px
+    .icon_mm4 a span
+      height: 20px
+      background-size: cover
+      background: url('#{$static}/img/menu.png') no-repeat 0 -55px
+    .icon_mm5 a span
+      height: 20px
+      background-size: cover
+      background: url('#{$static}/img/menu.png') no-repeat 0 -75px
+    .icon_mm6 a span
+      height: 20px
+      background-size: cover
+      background: url('#{$static}/img/menu.png') no-repeat 0 -95px
+    .icon_mm7 a span
+      height: 20px
+      background-size: cover
+      background: url('#{$static}/img/menu.png') no-repeat 0 0
+    .icon_mm8 a span
+      height: 20px
+      background-size: contain
+      background: url('#{$static}/img/user-5.png') no-repeat 0 0
+    .icon_chat a span
+      height: 20px
+      background:
+        image: url("#{$static}/img/icons/icon_speach-ball.png")
+        size: contain
+        repeat: no-repeat
+
+    .icon_mm1 a:hover span
+      height: 20px
+      background: url('#{$static}/img/menu2.png') no-repeat center !important
+      background-size: cover !important
+      background-position: 0 0 !important
+    .icon_mm2 a:hover span
+      height: 22px
+      background-size: cover
+      background: url('#{$static}/img/menu2.png') no-repeat 0 -20px
+    .icon_mm3 a:hover span
+      height: 13px
+      background-size: cover
+      background: url('#{$static}/img/menu2.png') no-repeat 0 -42px
+    .icon_mm4 a:hover span
+      height: 20px
+      background-size: cover
+      background: url('#{$static}/img/menu2.png') no-repeat 0 -55px
+    .icon_mm5 a:hover span
+      height: 20px
+      background-size: cover
+      background: url('#{$static}/img/menu2.png') no-repeat 0 -75px
+    .icon_mm6 a:hover span
+      height: 20px
+      background-size: cover
+      background: url('#{$static}/img/menu2.png') no-repeat 0 -95px
+    .icon_mm7 a:hover span
+      height: 20px
+      background-size: cover
+      background: url('#{$static}/img/menu2.png') no-repeat 0 0
+    .icon_mm8 a:hover span
+      height: 20px
+      background-size: contain
+      background: url('#{$static}/img/user-4.png') no-repeat 0 0
+    .icon_chat a:hover span
+      height: 20px
+      background:
+        image: url("#{$static}/img/icons/icon_speach-ball_red.png")
+        size: contain
+        repeat: no-repeat

users/templates/templatetags/contractor_indicator.html

@@ -1,5 +1,5 @@
-<p class="ratingPer">{{ current_indicator }}%</p>
 <div class="rating">
     <div class="ratingInset" style="clip:rect(0px, {{ current_indicator_px }}px, 50px, 0px);"></div>
     <div class="iconRating"></div>
+    <p class="ratingPer">{{ current_indicator }}%</p>
 </div>

work_sell/templates/worksell_create.html

@@ -61,6 +61,7 @@
                             <div class="" id="select-box-1"></div>
                         </div>
                         <div class="col-lg-3">
+                            <div class="header">&nbsp;</div>
                             <div href="#" onclick="return false" data-toggle="modal"
                                  data-target="#projectWorkTypeSuggestionModal"
                                  class="btn btn-simple btn-plus">Нет нужной специальности хочу добавить