From ede0306d927ec65647cc74f83d9f999db593514e Mon Sep 17 00:00:00 2001 From: Seghey Shishman Date: Thu, 22 Sep 2016 17:55:05 +0300 Subject: [PATCH 1/4] css edited --- assets/css/main.css | 70 +++++++++++++++++++++++------ assets/js/chat_customer.js | 2 +- chat/templates/chat_contractor.html | 8 ++++ 3 files changed, 65 insertions(+), 15 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index 5546aa2..749771a 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -43,10 +43,13 @@ a, a:hover, a:focus, a:active { text-decoration: none !important; } -ul li { - list-style: none !important; - list-style-image: url(data:0) !important; - list-style-type: none !important; +.changeBlock ul li{ + list-style: inherit; !important; + display: list-item; +} + +.changeBlock ul{ + padding-left: 40px; } /* MAIN CLASSES */ @@ -205,10 +208,10 @@ ul li { .changeBlock { width: 485px; - height: 424px; + /*height: 424px;*/ overflow: hidden; padding: 113px 0 0 0; - text-align: center; + /*text-align: center;*/ position: relative; } @@ -227,13 +230,16 @@ ul li { .changeBlock > a { border: none; cursor: pointer; - width: 200px; height: 40px; border-radius: 40px; font-size: 20px; text-transform: uppercase; font-family: 'pfdintextcomppro-regular', sans-serif; letter-spacing: 4px; + position: relative; + top: -60px; + display: table; + margin: auto; } .changeBlock1 > a, .changeBlock1 > a:link, .changeBlock1 > a:visited { @@ -249,12 +255,12 @@ ul li { } .changeBlock p { - font-size: 16px; + /*font-size: 16px; width: 63%; margin: 71px auto 0 auto; text-align: left; line-height: 24px; - position: relative; + position: relative;*/ font-family: 'Arial-MT-Regular', sans-serif; } @@ -274,6 +280,7 @@ ul li { left: 50%; margin-left: -30px; background-color: white; + bottom: 60px; } .square { @@ -2272,21 +2279,21 @@ input[type="checkbox"]:checked + span { height: 18px; background: url('../img/listExecutor.png') no-repeat left; background-size: cover; - background-position: 0 0; + background-position: 0 -3px; } .listExecutor li:nth-child(2) a:before { height: 22px; background: url('../img/listExecutor.png') no-repeat left; background-size: cover; - background-position: 0 -19px; + background-position: 0 -23px; } .listExecutor li:last-child a:before { height: 19px; background: url('../img/listExecutor.png') no-repeat left; background-size: cover; - background-position: 0 -48px; + background-position: 0 -53px; } .doneBlock { @@ -3074,11 +3081,29 @@ input[type="checkbox"]:checked + span { .all1 { left: 20px; +} + +.all1 a:before{ + content: ''; + position: absolute; + width: 20px; + height: 18px; + top: 0px; + right: 40px; background: url('../img/prev.png') no-repeat top center; } .all2 { right: 20px; +} + +.all2 a:before{ + content: ''; + position: absolute; + width: 20px; + height: 18px; + top: 0px; + left: 40px; background: url('../img/next.png') no-repeat top center; } @@ -5952,9 +5977,9 @@ a.linkS2[data-target="#withdraw-money"]{ margin-top: 0px; } .changeBlock { - min-height: 650px; + /*min-height: 650px;*/ display: table; - padding: 113px 0 30px 0px; + padding: 143px 20px 120px 20px; } .commChat { position: relative; @@ -6109,4 +6134,21 @@ li.officeList.icon_tml > a > p{ border-radius: 15px; background-color: #00BB7B; } +.message_connect{ + font-family: 'pfdintextcomppro-regular', sans-serif; + letter-spacing: 2px; + text-transform: uppercase; + border: 1px solid #BEBEBE; + border-radius: 40px; + display: table; + color: #373737 !important; + padding: 12px 30px; + font-size: 15px; + margin: auto; + margin-bottom: 20px; +} +#simpleSpecContainer .-simple-spec-widget{ + display: block; +} + /*end_new*/ diff --git a/assets/js/chat_customer.js b/assets/js/chat_customer.js index ebc8f3a..a65172a 100644 --- a/assets/js/chat_customer.js +++ b/assets/js/chat_customer.js @@ -193,7 +193,7 @@ $(function () { if (statusNotAgreed) { if (!data.secure) { htmlInbox += '
' + - '
' + + '
' + 'Перейти в режим безопасной сделки
'; } diff --git a/chat/templates/chat_contractor.html b/chat/templates/chat_contractor.html index 3b51cea..9994ec0 100644 --- a/chat/templates/chat_contractor.html +++ b/chat/templates/chat_contractor.html @@ -177,6 +177,14 @@
+
+
+

ArturBaybulatov

+ 2016-09-07 17:09:52 +
+

Приглашаю в группу http://proekton.com/users/teams/128/

+ присоединиться +
From b641edef73459aae6a58419ec3ae4f8ba1ae24a4 Mon Sep 17 00:00:00 2001 From: PekopT Date: Thu, 22 Sep 2016 17:57:41 +0300 Subject: [PATCH 2/4] css main fix --- assets/css/main.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/css/main.css b/assets/css/main.css index 5546aa2..d58aa58 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -6027,6 +6027,8 @@ input[type="radio"]{ } .welcomeMain{ line-height: 48px; + font-family: 'pfdintextcomppro-regular', sans-serif; + font-size: 43.5px; } .menuUser > div{ padding: 10px 0; From 7808d3388ddd52addd4cd567df0166606ffbd13c Mon Sep 17 00:00:00 2001 From: Seghey Shishman Date: Thu, 22 Sep 2016 18:08:58 +0300 Subject: [PATCH 3/4] extracss edited --- assets/css/extra.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/css/extra.css b/assets/css/extra.css index c46e7fb..3455bcf 100644 --- a/assets/css/extra.css +++ b/assets/css/extra.css @@ -241,5 +241,7 @@ li a:active .count-tab, li a:hover .count-tab{ } .select2-drop { - width: 400px !important; + width: auto !important; + max-width: 400px; + } From a88f3d8c8b30dc871ab4aa34d39031bc1713b611 Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Thu, 22 Sep 2016 19:16:09 +0300 Subject: [PATCH 4/4] Specialization select dynamic labels --- assets/css/extra.css | 4 ++++ assets/index.js | 9 +++++---- assets/js/chat.js | 2 +- projects/admin.py | 2 +- .../templates/contractor_portfolio_edit.html | 13 ++++++++----- .../templates/customer_project_create.html | 18 ++++++++---------- projects/templates/customer_project_edit.html | 18 ++++++++---------- projects/templates/project_filter.html | 14 ++++++++------ specializations/admin.py | 6 +++++- templates/partials/base.html | 2 +- users/templates/contractor_filter.html | 16 ++++++++++------ users/templates/portfolio_create_form.html | 13 ++++++++----- users/templates/worksell_create_form.html | 13 ++++++++----- work_sell/templates/worksell_edit.html | 13 ++++++++----- 14 files changed, 83 insertions(+), 60 deletions(-) diff --git a/assets/css/extra.css b/assets/css/extra.css index c46e7fb..7a994bc 100644 --- a/assets/css/extra.css +++ b/assets/css/extra.css @@ -243,3 +243,7 @@ li a:active .count-tab, li a:hover .count-tab{ .select2-drop { width: 400px !important; } + +.-bold { + font-weight: bold; +} diff --git a/assets/index.js b/assets/index.js index 6cef85c..33f2417 100644 --- a/assets/index.js +++ b/assets/index.js @@ -163,7 +163,8 @@ $('[data-tooltip]').tooltip({ // TODO: Hardcoded: - specSelects[0].select2('container').closest('.col-lg-3').css('display', workTypeId === 2 ? 'none' : 'block') + specSelects[0].select2('container').closest('.-single-spec-select').css('display', workTypeId === 2 ? 'none' : 'block') + specSelects[1].select2('container').closest('.-single-spec-select').find('.-dynamic-label').first().text(workTypeId === 2 ? 'Перечень услуг' : 'Стадия проекта') return rootSpec @@ -196,9 +197,9 @@ $('[data-tooltip]').tooltip({ specSelects[3].select2('enable', Boolean(specLevel3 && !_.isEmpty(specLevel3.children))) specializationTreeHasLevels(specId).then(function(haveLevels) { - specSelects[1].select2('container').css('display', haveLevels.level2 ? 'block' : 'none') - specSelects[2].select2('container').css('display', haveLevels.level3 ? 'block' : 'none') - specSelects[3].select2('container').css('display', haveLevels.level4 ? 'block' : 'none') + specSelects[1].select2('container').closest('.-single-spec-select').css('display', haveLevels.level2 ? 'block' : 'none') + specSelects[2].select2('container').closest('.-single-spec-select').css('display', haveLevels.level3 ? 'block' : 'none') + specSelects[3].select2('container').closest('.-single-spec-select').css('display', haveLevels.level4 ? 'block' : 'none') }) }) } diff --git a/assets/js/chat.js b/assets/js/chat.js index 4f06bea..66235c7 100644 --- a/assets/js/chat.js +++ b/assets/js/chat.js @@ -29,7 +29,7 @@ window.confirm = function (message, callback, caption) { var SocketHandler = function () { domain = domain.replace(':' + port, ''); - var url = 'ws://' + domain + '/chat/' + userId + '/'; + var url = 'ws://' + domain + ':8888/chat/' + userId + '/'; var sock = new WebSocket(url); var intervalId; sock.onopen = function () { diff --git a/projects/admin.py b/projects/admin.py index be22c8a..475af3d 100644 --- a/projects/admin.py +++ b/projects/admin.py @@ -49,7 +49,7 @@ class StageAdmin(admin.ModelAdmin): admin.site.register(Answer) admin.site.register(Arbitration) -admin.site.register(BuildingClassfication,BuildingClassficationAdmin) +admin.site.register(BuildingClassfication, BuildingClassficationAdmin) admin.site.register(Candidate) admin.site.register(ConstructionType) admin.site.register(Order, OrderAdmin) diff --git a/projects/templates/contractor_portfolio_edit.html b/projects/templates/contractor_portfolio_edit.html index 60721ee..ecb308d 100644 --- a/projects/templates/contractor_portfolio_edit.html +++ b/projects/templates/contractor_portfolio_edit.html @@ -53,22 +53,25 @@
-

Специализации

-
+
+
Стадия проекта {{ form.specialization.errors.as_text }}
-
+
+
Стадия проекта
-
+
+
Раздел
-
+
+
Подраздел
diff --git a/projects/templates/customer_project_create.html b/projects/templates/customer_project_create.html index a6c5ec6..58d54c2 100644 --- a/projects/templates/customer_project_create.html +++ b/projects/templates/customer_project_create.html @@ -83,26 +83,24 @@
-
-
Специализация проекта {{ form.specialization.errors.as_text }}
- -
-
+
+
Стадия проекта {{ form.specialization.errors.as_text }}
-
+
+
Стадия проекта
-
+
+
Раздел
-
+
+
Подраздел
diff --git a/projects/templates/customer_project_edit.html b/projects/templates/customer_project_edit.html index 7cbdefe..3012ce0 100644 --- a/projects/templates/customer_project_edit.html +++ b/projects/templates/customer_project_edit.html @@ -93,26 +93,24 @@
-
-
Специализация проекта {{ form.specialization.errors.as_text }}
- -
-
+
+
Стадия проекта {{ form.specialization.errors.as_text }}
-
+
+
Стадия проекта
-
+
+
Раздел
-
+
+
Подраздел
diff --git a/projects/templates/project_filter.html b/projects/templates/project_filter.html index 1527374..4b85d61 100644 --- a/projects/templates/project_filter.html +++ b/projects/templates/project_filter.html @@ -28,21 +28,23 @@
-
Специализации
-
-
+
+
Стадия проекта {{ form.specialization.errors.as_text }}
-
+
+
Стадия проекта
-
+
+
Раздел
-
+
+
Подраздел
diff --git a/specializations/admin.py b/specializations/admin.py index 27e78ed..a1de7fa 100644 --- a/specializations/admin.py +++ b/specializations/admin.py @@ -3,4 +3,8 @@ from mptt.admin import MPTTModelAdmin from .models import Specialization -admin.site.register(Specialization, MPTTModelAdmin) + +class SpecializationAdmin(MPTTModelAdmin): + readonly_fields = ('pk', 'lft', 'rght', 'tree_id', 'level') + +admin.site.register(Specialization, SpecializationAdmin) diff --git a/templates/partials/base.html b/templates/partials/base.html index 9211d34..d57fb43 100644 --- a/templates/partials/base.html +++ b/templates/partials/base.html @@ -86,7 +86,7 @@ if ((queryString.indexOf('/chat') != 0) && (queryString.indexOf('/users/contractor-office/510/work-projects') != 0)) { domain = domain.replace(':' + port, ''); - var url = 'ws://' + domain + '/chat/' + userId + '/'; + var url = 'ws://' + domain + ':8888/chat/' + userId + '/'; var sock = new WebSocket(url); var intervalId; sock.onopen = function () { diff --git a/users/templates/contractor_filter.html b/users/templates/contractor_filter.html index 42ab1b0..96d13c9 100644 --- a/users/templates/contractor_filter.html +++ b/users/templates/contractor_filter.html @@ -38,20 +38,24 @@
-
Специализации
+
-
+
+
Стадия проекта {{ form.specialization.errors.as_text }}
-
+
+
Стадия проекта
-
+
+
Раздел
-
- +
+
Подраздел
+
diff --git a/users/templates/portfolio_create_form.html b/users/templates/portfolio_create_form.html index e3d8a30..d20e4e5 100644 --- a/users/templates/portfolio_create_form.html +++ b/users/templates/portfolio_create_form.html @@ -31,22 +31,25 @@
-

Специализации

-
+
+
Стадия проекта {{ portfolio_form.specialization.errors.as_text }}
-
+
+
Стадия проекта
-
+
+
Раздел
-
+
+
Подраздел
diff --git a/users/templates/worksell_create_form.html b/users/templates/worksell_create_form.html index c294b5c..714526d 100644 --- a/users/templates/worksell_create_form.html +++ b/users/templates/worksell_create_form.html @@ -26,22 +26,25 @@
-

Специализации

-
+
+
Стадия проекта {{ worksell_form.specialization.errors.as_text }}
-
+
+
Стадия проекта
-
+
+
Раздел
-
+
+
Подраздел
diff --git a/work_sell/templates/worksell_edit.html b/work_sell/templates/worksell_edit.html index 5090f35..47b2401 100644 --- a/work_sell/templates/worksell_edit.html +++ b/work_sell/templates/worksell_edit.html @@ -51,23 +51,26 @@
-

Специализации {{ form.specialization.errors.as_text }}

-
+
+
Стадия проекта {{ form.specialization.errors.as_text }}
-
+
+
Стадия проекта
-
+
+
Раздел
-
+
+
Подраздел