From 95f50303c379477f79e5625bd860a7c8932f4a5a Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Mon, 19 Sep 2016 11:07:13 +0300 Subject: [PATCH 1/6] Fixes --- assets/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/index.js b/assets/index.js index ef913cc..864dd3a 100644 --- a/assets/index.js +++ b/assets/index.js @@ -51,7 +51,8 @@ $('[data-tooltip]').tooltip({ results: _.map(function(item) { return { id: item.id, - text: item.name, + //text: item.name, + text: _.repeat(item.level-1, '---') + item.name, origItem: item, } }, data.results), From 58814a5454bfc182c2c3de98a794024732167777 Mon Sep 17 00:00:00 2001 From: PekopT Date: Mon, 19 Sep 2016 13:01:10 +0300 Subject: [PATCH 2/6] texts --- wallets/signals.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wallets/signals.py b/wallets/signals.py index 42b6cfd..e974cab 100644 --- a/wallets/signals.py +++ b/wallets/signals.py @@ -65,7 +65,7 @@ def reserve_stages(sender, instance, created, **kwargs): stage.save() inv_history = InvoiceHistory() - inv_history.comment = 'Резервирование средств за этапы ' + ' , '.join(stages_names) + ' заказа' + str(order) + inv_history.comment = 'Резервирование средств за этап(ы) ' + ' , '.join(stages_names) + ' заказа ' + str(order) inv_history.sum = instance.sum inv_history.user = instance.customer inv_history.type = "history" @@ -89,7 +89,7 @@ def reserve_stages_from_score(sender, instance, created, **kwargs): stage.save() inv_history = InvoiceHistory() - inv_history.comment = 'Резервирование средств за этапы ' + ' , '.join(stages_names) + ' заказа' + str(order) + inv_history.comment = 'Резервирование средств за этап(ы) ' + ' , '.join(stages_names) + ' заказа ' + str(order) inv_history.sum = -instance.sum inv_history.user = instance.customer inv_history.type = "score" From 3f33f8d0b1e92c71a8cbb94a0dafafa92f354644 Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Mon, 19 Sep 2016 13:10:56 +0300 Subject: [PATCH 3/6] Fixes --- work_sell/templates/worksells_list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/work_sell/templates/worksells_list.html b/work_sell/templates/worksells_list.html index 3200985..8020f48 100644 --- a/work_sell/templates/worksells_list.html +++ b/work_sell/templates/worksells_list.html @@ -22,7 +22,7 @@
Специализации
-
+
@@ -36,7 +36,7 @@
- +
From a49c8b5efaaf353a5b7d2fe08f4fb58b70299136 Mon Sep 17 00:00:00 2001 From: PekopT Date: Mon, 19 Sep 2016 14:24:25 +0300 Subject: [PATCH 4/6] css main --- assets/css/main.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/css/main.css b/assets/css/main.css index bb28f8a..74e4f76 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -6020,6 +6020,8 @@ input[type="radio"]{ } .welcomeMain{ line-height: 48px; + font-family: 'pfdintextcomppro-regular', sans-serif; + font-size: 43.5px; } .menuUser > div{ padding: 10px 0; From 2c0c1246be79ef37785c84c87e4fece132955697 Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Mon, 19 Sep 2016 14:41:52 +0300 Subject: [PATCH 5/6] Fixes --- users/templates/contractor_profile.html | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html index a6d41c0..491e118 100644 --- a/users/templates/contractor_profile.html +++ b/users/templates/contractor_profile.html @@ -474,7 +474,7 @@ {% thumbnail diplom.img "210x334" crop="center" as im %}
- +
@@ -514,7 +514,7 @@ {% thumbnail cro.img "210x334" crop="center" as im %}
- +
@@ -968,6 +968,15 @@ $("#resume-success").html(""); var formData = new FormData(); formData.append('resume_file', e.target.files[0]); + + var file = e.target.files[0] + var allowedExts = ['.pdf','.doc','.docx','.xml','.odt','.uot','.dot','.rtf','.txt','.uop','.pptx','.odp','.html'] + + if (!_.includes(path.extname(file.name), allowedExts)) { + alert('Файл не подходит. Выберите документ') + return + } + $.ajax({ url:'/api/contractorresume/{{ contractor.contractor_resume.pk }}/', method:'PUT', From 4cc4907b6704bca519d047d219f72013a4fc2def Mon Sep 17 00:00:00 2001 From: Seghey Shishman Date: Mon, 19 Sep 2016 15:52:18 +0300 Subject: [PATCH 6/6] css edited --- assets/css/main.css | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index 74e4f76..70fd523 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -827,9 +827,8 @@ footer:after { box-shadow: 0 0 10px rgba(0,0,0,0.7); } -.projectPro:hover .titlePro { - color: #fb2c2d; - text-decoration: underline; +.titlePro a:hover { + text-decoration: underline !important; } .projectPro:hover .leftPro:before { @@ -5998,7 +5997,7 @@ a.linkS2[data-target="#withdraw-money"]{ } input[type="radio"]{ - opacity: 1; + opacity: 0; } .wr-inset-pluss{ @@ -6020,8 +6019,6 @@ input[type="radio"]{ } .welcomeMain{ line-height: 48px; - font-family: 'pfdintextcomppro-regular', sans-serif; - font-size: 43.5px; } .menuUser > div{ padding: 10px 0; @@ -6048,4 +6045,8 @@ input[type="radio"]{ -moz-transform: scale(1.04); transform: scale(1.04); } +.new-rass2 .btn-submit-link{ + display: table; + margin: 15px 0px 15px -15px !important; +} /*end_new*/