From 53899b53e1eb35af2f54fb2e2a64e7b785b8a0c8 Mon Sep 17 00:00:00 2001 From: apache Date: Thu, 23 Feb 2017 23:45:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D1=81?= =?UTF-8?q?=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/static/css/style.css | 31 ++++++++++++------- project/templates/base.html | 6 ++-- .../customer/profile/license_list.html | 2 +- project/templates/docs/dover/form.html | 4 +-- .../templates/docs/dover/form_tbl_items.html | 2 +- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/project/static/css/style.css b/project/static/css/style.css index 469230a..5e037cf 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -304,7 +304,7 @@ ul.messagelist li.error { background-image: url(../img/icon-error.gif); } .errorlist { font-size: 8pt; overflow: hidden; } .errorlist li { color: red; } -.help-text { font-size: 8pt; color: #666666; display:block;padding:10px;} +.help-text { font-size: 8pt; color: #666666; display:block;} form { font-size: small; padding: 0; margin: 0; } @@ -328,8 +328,8 @@ input[type=text], input[type=number], input[type=email], input[type=password], t .long-input input { width: 350px; } -.block {margin: 10px 0;overflow:hidden;} -.bt {border-top:#313942 1px solid; padding-top:15px;} +.block {margin: 10px 0;overflow:visible;} +.bt {border-top:#313942 1px solid; padding-top:15px;overflow:visible;} .client-form .col1 { float: left; width: 350px; } .client-form .col2 { float: left; width: 370px; } @@ -385,7 +385,7 @@ ul { clear: both; list-style: none; margin: 0; padding: 0; } .add-link, .add-row {background: url(../img/icon-add.png) no-repeat right;padding: 0 25px 0 0;line-height: 22px;display: inline-block;} .add-link, .add-row:hover {background: url(../img/icon-add.png) no-repeat right;padding: 0 25px 0 0;line-height: 22px;display: inline-block;} .add-client-link {background: url(../img/icon-add.png) no-repeat right;padding: 0 25px 0 0;line-height: 22px;display: inline-block;} -.add-client-link:hover {background: url(../img/icon-add.png) no-repeat right;} +.add-client-link:hover {background: url(../img/icon-add.png) no-repeat right; text-decoration:none;} .add-row {margin-top:4px;} .edit-link a, .delete-link a { text-decoration: none; } @@ -417,6 +417,7 @@ a.delete { vertical-align: top; } .doc-form input[type=text], .doc-form input[type=email], .doc-form input[type=number], .doc-form input[type=password], .doc-form textarea, .doc-form option {padding-left:2px;margin-left:0;height:36px;font-size:25px;} #id_client_text {width:406px;} #id_client-wrapper {display:inline;} +#nds_value {margin-top:15px;} .doc-form #doc_date, .doc-form #doc_mesto, .doc-form #end_date, @@ -428,17 +429,21 @@ a.delete { vertical-align: top; } .doc-form #saldo_credit input { margin-left: 5px; } .doc-form #saldo_debit .errorlist, .doc-form #saldo_credit .errorlist { margin-left: 83px; } +.doc-form #id_dover_doc {width:196px;} +.doc-form #id_dover_doc_date {width:196px;} .doc-form #dover_name input { margin-left: 49px; } -.doc-form #dover_passport_ser input#id_dover_passport_ser { margin-left: 5px; } -.doc-form #dover_passport_org input { margin-left: 85px; } -.doc-form #dover_passport_date input { margin-left: 74px; } +.doc-form #dover_passport_ser input#id_dover_passport_ser { margin-left: 5px;width:100px; } +.doc-form #id_dover_passport_num {width:200px;} +.doc-form #dover_passport_org input { margin: 10px 0 0 86px; } +.doc-form #dover_passport_date input { margin-left: 75px;margin-top:10px; } +.doc-form #id_dover_passport_date {} .doc-form #dover_name .help-text, .doc-form #dover_name .errorlist, .doc-form #dover_passport_ser .errorlist, .doc-form #dover_passport_org .errorlist, .doc-form #dover_passport_date .errorlist - { margin-left: 169px; } + { margin-left: 168px;margin-top: -10px; } -.doc-form select#id_bank_account { width: 370px; } +.doc-form select#id_bank_account { width: 410px; } .doc-form select#id_client { width: 370px; } .doc-form input#id_doc_mesto { width: 340px; } @@ -463,7 +468,8 @@ a.delete { vertical-align: top; } .doc-form table.doc-list .itogo-td {background:#313942;height:30px;font-size:20px;color:#fff;padding:5px 10px;border-bottom:2px solid #313942;border-top:2px solid #313942;} .doc-form table.doc-list .itogo-td1 {border-right:2px solid #313942;} .doc-form table.doc-list .itogo-td2 {border-left:2px solid #313942;} -.doc-form table.doc-list .add-row {position:absolute;bottom:5px;} +.doc-form table.doc-list .add-row {position:absolute;} +.doc-form table.doc-list .add-row:hover {text-decoration:none;} .doc-form table.doc-list th {font-weight:normal;text-align:left;font-size:14px;} @@ -570,7 +576,7 @@ div.blockMsg { width: 100%; height: 100%; top: 0; left: 0; text-align: center; } .w200 {width:200px;min-height:5px;} .header {font-weight:bold;} -#footer {background:url('../img/footer-bg.jpg')#38424c;height:100px;bottom: 0px; width:100%;z-index:10;} +#footer {background:url('../img/footer-bg.jpg')#38424c;height:100px;bottom: 0px; width:100%;z-index:10;min-width:1200px;} #footer-content {width:1200px;margin:0 auto;} #footer-content a {margin-right: 15px;text-decoration: none;color:#607c99;} #footer-content a:hover {margin-right: 15px;text-decoration: none;color:#4d94bd;} @@ -584,7 +590,8 @@ div.blockMsg { width: 100%; height: 100%; top: 0; left: 0; text-align: center; } #menu ul li.yellow a:hover, #menu ul li.yellow span:hover {color:#313942;} #menu ul li.yellow.selected {background:url('../img/menu-selected2.png') #fed13e no-repeat bottom center;} #menu ul li.yellow.selected a {color:#313942;} -#menu ul li a, #menu ul li span {text-decoration:none;padding:0 25px;} +#menu ul li a, #menu ul li span {text-decoration:none;padding:0 25px;text-align: center; + word-wrap: break-word;} #menu ul li a {color:#fff;} #menu ul li a:hover {color:#fed13e;} #menu ul li span{color:#fed13e;} diff --git a/project/templates/base.html b/project/templates/base.html index 25887b1..5e18a89 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -116,13 +116,13 @@

Платежные данные

-
Тариф:{% if cur_license.term > 0 %}{{ cur_license.term|get_plural:"месяц,месяца, месяцев" }}{% else %}пробный{% endif %}
-
Осталось
+
Тариф: {% if cur_license.term > 0 %}{{ cur_license.term|get_plural:"месяц,месяца, месяцев" }}{% else %}пробный{% endif %}

+
Осталось дней:
{{ license_days }}
Купить лицензию - Мои счета + Мои заказы История расчетов

Настройки

Сменить пароль diff --git a/project/templates/customer/profile/license_list.html b/project/templates/customer/profile/license_list.html index 19ce35b..cbe2d8f 100644 --- a/project/templates/customer/profile/license_list.html +++ b/project/templates/customer/profile/license_list.html @@ -3,7 +3,7 @@ {% block title %}Мои счета{% endblock %} {% block content %} -

Выписанные счета

+

Мои заказы

Купить лицензию
Оплаченные лицензии
diff --git a/project/templates/docs/dover/form.html b/project/templates/docs/dover/form.html index 2561766..11e725a 100644 --- a/project/templates/docs/dover/form.html +++ b/project/templates/docs/dover/form.html @@ -1,4 +1,4 @@ -{% extends "docs/_base/base_form.html" %} +{% extends "docs/_base/base_form.html" %} {% load my_tags %} @@ -27,7 +27,7 @@ {% include 'docs/parts/form_field.html' with field=form.dover_passport_org id="dover_passport_org" classes="field" label="Кем выдан" label_inline="True" required="True" %} {% include 'docs/parts/form_field.html' with field=form.dover_passport_date id="dover_passport_date" classes="field" label="Дата выдачи" label_inline="True" required="True" %} -
Список ТМЦ для получения
+
Список ТМЦ для получения
diff --git a/project/templates/docs/dover/form_tbl_items.html b/project/templates/docs/dover/form_tbl_items.html index 2a979d1..9a946be 100644 --- a/project/templates/docs/dover/form_tbl_items.html +++ b/project/templates/docs/dover/form_tbl_items.html @@ -1,6 +1,6 @@ {# табличная часть доверенности на получение тмц #} -
+
Наименование Количество