diff --git a/README.md b/README.md index 6575a86..3970bcb 100644 --- a/README.md +++ b/README.md @@ -105,4 +105,9 @@ python manage.py generate_reviews ## Local smtp debug server ``` sudo python3 -m smtpd -n -c DebuggingServer localhost:25 +``` + +## Local char server +``` +python3 -m tornado.autoreload chat/chat.py ``` \ No newline at end of file diff --git a/assets/css/main.css b/assets/css/main.css index c21edf0..80ce79a 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -85,15 +85,15 @@ a, a:hover, a:focus, a:active { background-color: black; } -.logo { - width: 183px; - height: 36px; - background: url('../img/logo.png') no-repeat center; - background-size: cover; - float: left; - margin: 18px 0 21px 10px; - cursor: pointer; -} +/*.logo {*/ + /*width: 183px;*/ + /*height: 36px;*/ + /*background: url('../img/logo.png') no-repeat center;*/ + /*background-size: cover;*/ + /*float: left;*/ + /*margin: 18px 0 21px 10px;*/ + /*cursor: pointer;*/ +/*}*/ .mainMenu { float: left; diff --git a/assets/lib/proekton-components/sass/parts/_select-box.sass b/assets/lib/proekton-components/sass/parts/_select-box.sass index 0708290..768b189 100644 --- a/assets/lib/proekton-components/sass/parts/_select-box.sass +++ b/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)} diff --git a/assets/sass/components/custom-components.sass b/assets/sass/components/custom-components.sass index ac10e7e..7286af7 100644 --- a/assets/sass/components/custom-components.sass +++ b/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 diff --git a/assets/sass/main.sass b/assets/sass/main.sass index 213b2c6..5a00065 100644 --- a/assets/sass/main.sass +++ b/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)} diff --git a/common/templatetags/common_tags.py b/common/templatetags/common_tags.py index add294a..27712f3 100644 --- a/common/templatetags/common_tags.py +++ b/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) diff --git a/projects/templates/customer_project_create.html b/projects/templates/customer_project_create.html index aabeda2..bc6e0a1 100644 --- a/projects/templates/customer_project_create.html +++ b/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' %}
@@ -53,6 +53,7 @@
+
 
Нет нужной специальности хочу добавить @@ -266,16 +267,15 @@
- {#
#} - {#
#} - {#
#} - {#
#} - {#
#} - {#
#} - {#
#} - -
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
@@ -374,9 +380,9 @@ {% else %} style="display: none" {% endif %} - {% if unregister_user %} - style="display: none" - {% endif %}> + {% if unregister_user %} + style="display: none" + {% endif %}>
diff --git a/templates/home.html b/templates/home.html index da35f42..cc83296 100644 --- a/templates/home.html +++ b/templates/home.html @@ -121,7 +121,7 @@

-
Добавить проект + Разместить проект
@@ -133,7 +133,11 @@ - {% include 'partials/footer.html' %} +
+
+ {% include 'partials/footer.html' %} +
+
{% endblock %} {% block old_js %} diff --git a/templates/partials/base.html b/templates/partials/base.html index 2e2060d..5a506e4 100644 --- a/templates/partials/base.html +++ b/templates/partials/base.html @@ -1,4 +1,5 @@ -{% load staticfiles %} + +{% load staticfiles %} {#{% load compress %}#} @@ -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 { diff --git a/templates/partials/header.html b/templates/partials/header.html index cea82c3..e5193ac 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -12,175 +12,174 @@ {% endif %} - -
-
+
+
-
+ - - {% activeurl %} -
+
+ +
+ {% activeurl %} + {% endactiveurl %} -
- {% if request.user.is_authenticated %} - {% if request.user.is_contractor %} - {% contractor_indicator request.user %} - {% endif %} - -
-
- - -
-
- - {% if request.user.is_contractor %} - - {% endif %} - - {% else %} - Регистрация - -
-
- {% endif %} -
-
+
\ No newline at end of file diff --git a/templates/partials/sass/footer.sass b/templates/partials/sass/footer.sass index 193bb69..0476f6f 100644 --- a/templates/partials/sass/footer.sass +++ b/templates/partials/sass/footer.sass @@ -7,6 +7,9 @@ footer width: 300px height: 3px background-color: black + ul + margin: 0 + padding: 0 .logoF diff --git a/templates/partials/sass/header.sass b/templates/partials/sass/header.sass index bba0857..7fc4ff5 100644 --- a/templates/partials/sass/header.sass +++ b/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 - 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 +%icons + content: '' display: inline-block - text-align: center - //align-items: center - -.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 + vertical-align: middle + margin-right: 5px background-size: cover - float: left - margin: 18px 0 21px 10px - cursor: pointer -.mainMenu - float: left - margin: 26px 0 0 0 - padding-left: 60px - li +header + font-size: 11pt + ul + padding-left: 0 + margin: 0 + background-color: #000 + color: #FFF + .logo 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 + height: 75px + display: flex + align-items: center -.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) + .menu-nav + display: flex + justify-content: center + //align-items: center + height: 75px + a, a:hover + color: #FFF + text-decoration: none + padding-left: 4px + .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 - width: 100% - height: 100% - position: absolute - left: 0 - top: 0 - background: url('#{$static}/img/button12.png') no-repeat center + height: 75px + margin-right: 20px + cursor: pointer + border-bottom: 3px solid black + pointer-events: stroke + .icon_tm1 a:before + @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 - color: #ff2c2c - font-size: 18px - font-family: 'pfdintextcomppro-regular', sans-serif - float: right - margin: 28px 0 0 9px - cursor: pointer + .icon_tml a:hover + border-bottom: 3px solid red + &:before + background: url('#{$static}/img/list4tml.png') no-repeat center + background-size: cover + .icon_tm1 a:hover + 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 - &: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 + .icon_tm3 a:hover + border-bottom: 3px solid red + &:before + background: + image: url('#{$static}/img/listMain2.png') + repeat: no-repeat + position: -50px 0 + background-size: cover + .user-nav + float: right + height: 75px + .user-items + display: flex + align-items: center + li + display: inline-block + .user-info + 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 - 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 + .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 + .rating + display: flex + align-items: center + position: relative + cursor: pointer + margin-left: 10px -.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 + .ratingInset + width: 46px + height: 46px + border-radius: 100% + background-color: #FF0027 + display: inline-block + /* position: absolute; */ + /* left: -1.859px; */ + /* bottom: 3px; */ + clip: rect(0, 22px, 50px, 0) + transform: rotate(-90deg) -.lock - width: 75px - height: 75px - background: url('#{$static}/img/lock.png') no-repeat center, white - float: right - cursor: pointer - margin: 0 -25px 0 0 + .iconRating + width: 46px + height: 46px + position: absolute + left: 0 + top: 0 + background: url('#{$static}/img/button12.png') no-repeat center -.imgProfile - width: 75px - height: 75px - float: right - margin: 0 - padding-left: 5px - img - display: block - width: 100% - height: 100% + .ratingPer + color: #ff2c2c + font-size: 18px + font-family: 'pfdintextcomppro-regular', sans-serif + margin: 0 + padding-left: 8px -.infoProfile - float: right - .btn-group - .btn - width: 75px - height: 75px - float: left - border-radius: 0 !important + .infoProfile + .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 - 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 + left: -174px + margin: -1px 100% 0 0 + float: left + width: 250px + height: auto + padding: 30px 20px 15px 40px + border-top: 3px solid #ff2c2c + li + display: block + margin-bottom: 10px + &:last-child + margin-bottom: 0 + a 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 + &: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_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 - 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 \ No newline at end of file + .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 \ No newline at end of file diff --git a/templates/partials/sass/home.sass b/templates/partials/sass/home.sass index bc7d8fc..29713da 100644 --- a/templates/partials/sass/home.sass +++ b/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 diff --git a/templates/partials/trash/header.html b/templates/partials/trash/header.html new file mode 100644 index 0000000..cea82c3 --- /dev/null +++ b/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 %} + + + +
+
+
+
+ + + +
+ + {% activeurl %} +
+ {% if request.user.is_authenticated %} + + +
+ {% else %} + + + {% endif %} +
+ {% endactiveurl %} +
+ {% if request.user.is_authenticated %} + {% if request.user.is_contractor %} + {% contractor_indicator request.user %} + {% endif %} + +
+
+ + +
+
+ + {% if request.user.is_contractor %} + + {% endif %} + + {% else %} + Регистрация + +
+
+ {% endif %} +
+
+
+
diff --git a/templates/partials/trash/header.sass b/templates/partials/trash/header.sass new file mode 100644 index 0000000..fb63949 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/users/templates/templatetags/contractor_indicator.html b/users/templates/templatetags/contractor_indicator.html index ee9bd03..838e613 100644 --- a/users/templates/templatetags/contractor_indicator.html +++ b/users/templates/templatetags/contractor_indicator.html @@ -1,5 +1,5 @@ -

{{ current_indicator }}%

+

{{ current_indicator }}%

diff --git a/work_sell/templates/worksell_create.html b/work_sell/templates/worksell_create.html index a893da0..9e79e45 100644 --- a/work_sell/templates/worksell_create.html +++ b/work_sell/templates/worksell_create.html @@ -61,6 +61,7 @@
+
 
Нет нужной специальности хочу добавить