From 56fbe842a4e8ab4884e388ddce423cfed5b4858a Mon Sep 17 00:00:00 2001 From: apache Date: Mon, 20 Mar 2017 13:31:14 +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 | 61 ++++++++++++---------- project/static/img/icon-add.png | Bin 3213 -> 3080 bytes project/static/img/icon-directory.png | Bin 0 -> 3057 bytes project/templates/docs/aktrabot/form.html | 8 ++- project/templates/docs/faktura/form.html | 3 +- project/templates/docs/invoice/form.html | 9 ++-- project/templates/docs/nakladn/form.html | 6 +-- project/templates/docs/stub_js.html | 2 +- 8 files changed, 41 insertions(+), 48 deletions(-) create mode 100644 project/static/img/icon-directory.png diff --git a/project/static/css/style.css b/project/static/css/style.css index 5619b57..a8a8e2a 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -133,8 +133,8 @@ body { .center-form .field img {vertical-align:middle;} .center-form .buttons {text-align:center; margin-top: 20px;} -.center-form .buttons input[type="submit"]{background:#fed13e;border:none;cursor:pointer;font-size:22px;padding:15px 40px;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;font-weight:bold;text-transform:uppercase;} -.center-form .buttons input[type="submit"]:hover{background:#ffca3e;border:none;cursor:pointer;font-size:22px;padding:15px 40px;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;font-weight:bold;text-transform:uppercase;} +.center-form .buttons input[type="submit"]{background:#fed13e;border:none;cursor:pointer;font-size:22px;padding:15px 40px;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;font-stretch:ultra-condensed;font-weight:bold;text-transform:uppercase;} +.center-form .buttons input[type="submit"]:hover{background:#ffca3e;border:none;cursor:pointer;font-size:22px;padding:15px 40px;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;font-stretch:ultra-condensed;font-weight:bold;text-transform:uppercase;} .center-form .captcha_refresh {display:inline-block;margin: 0 10px;width:24px;} .register-form {margin:0 46px 64px 0;width:514px;padding:20px;background:#fff;box-shadow: 0 0 5px #ddd;float:left;} @@ -142,8 +142,8 @@ body { .reset-form {margin: 0 46px 64px 0;width: 514px;padding: 20px;background: #fff;box-shadow: 0 0 5px #ddd;} .reset-form .field label {display:inline-block;width:190px;text-align:right;line-height:50px;padding-right:5px;vertical-align:middle; font-size: 16px;} .reset-form .field input[type="text"]{color: #959595;width: 300px;vertical-align: bottom;height: 40px;margin-top: 32px;font-size: 26px;} -.reset-form .buttons input[type="submit"]{background:#fed13e;border:none;cursor:pointer;font-size:22px;padding:15px 40px;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;font-weight:bold;text-transform:uppercase;} -.reset-form .buttons input[type="submit"]:hover{background:#ffca3e;border:none;cursor:pointer;font-size:22px;padding:15px 40px;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;font-weight:bold;text-transform:uppercase;} +.reset-form .buttons input[type="submit"]{background:#fed13e;border:none;cursor:pointer;font-size:22px;padding:15px 40px;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;font-stretch:ultra-condensed;font-weight:bold;text-transform:uppercase;} +.reset-form .buttons input[type="submit"]:hover{background:#ffca3e;border:none;cursor:pointer;font-size:22px;padding:15px 40px;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;font-stretch:ultra-condensed;font-weight:bold;text-transform:uppercase;} .reset-form .buttons {text-align:center; margin-top: 20px;} .register_desc h2 {margin:0;} @@ -235,7 +235,7 @@ a img { outline: none; border: 0; } h1, h2, h3 { line-height: normal; } h1 {font-family:"MyriadPro-Light", Arial ТNarrow, sans-serif;font-size:30px;font-weight:normal;font-stretch:condensed;} -h2 {font-weight: normal;font-size:24px;font-family:"Arial Narrow", Arial, sans-serif;} +h2 {font-weight: normal;font-size:24px;font-family:"Arial Narrow", Arial, sans-serif;font-stretch:ultra-condensed;} .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { @@ -249,7 +249,7 @@ h2 {font-weight: normal;font-size:24px;font-family:"Arial Narrow", Arial, sans-s border:0; } .ui-dialog .ui-dialog-content {font-size: 13px;font-family: Arial;} -.ui-widget-header {background:#fff;border:none;color:#646669;text-transform:uppercase;font-size:18px;font-weight:normal;font-family:"Arial Narrow", Arial, sans-serif;} +.ui-widget-header {background:#fff;border:none;color:#646669;text-transform:uppercase;font-size:18px;font-weight:normal;font-stretch:ultra-condensed;font-family:"Arial Narrow", Arial, sans-serif;} .ui-state-default .ui-icon { background: url(../img/close.png) no-repeat top;opacity: 0.5;width:22px;height:22px;} .ui-state-default .ui-icon:hover { background: url(../img/close.png) no-repeat top;opacity: 1;} .ui-icon {width:18px;height:20px;} @@ -277,12 +277,13 @@ ul.messagelist li { ul.messagelist li.warning { background-image: url(../img/icon-alert.gif); } ul.messagelist li.error { background-image: url(../img/icon-error.gif); } -.ui-dialog .save_btn {display:inline;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;border:none;width:215px;height:72px;background:#fed13e;border-radius:0;} -.ui-dialog .save_btn:hover {display:inline;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;border:none;width:215px;height:72px;background:#ffca3e;border-radius:0;} +.ui-dialog .save_btn {display:inline;font-stretch:ultra-condensed;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;border:none;width:215px;height:72px;background:#fed13e;border-radius:0;} +.ui-dialog .save_btn:hover {display:inline;font-stretch:ultra-condensed;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;border:none;width:215px;height:72px;background:#ffca3e;border-radius:0;} .ui-dialog .save_btn span {width:215px;display:table-cell;vertical-align:middle;text-align:right;text-transform:uppercase;text-decoration:none;font-size:22px;color:#4e5661;} -.ui-dialog .cancel_btn {display:inline;font-family:"Arial Narrow", Arial, sans-serif;font-weight:bold;border:none;width:120px;height:72px;background:none;border-radius:0;} +.ui-dialog .cancel_btn {display:inline;font-stretch:ultra-condensed;font-family:"Arial Narrow", Arial, sans-serif;font-weight:bold;border:none;width:120px;height:72px;background:none;border-radius:0;} .ui-dialog .cancel_btn span {width:215px;display:table-cell;vertical-align:middle;text-align:center;text-decoration:none;color:#646669;font-weight:normal;display: inline; font-family: "Arial Narrow", Arial, sans-serif; + font-stretch:ultra-condensed; font-size: 22px; text-transform: uppercase; padding: 25px; @@ -292,8 +293,8 @@ ul.messagelist li.error { background-image: url(../img/icon-error.gif); } .ui-dialog .cancel_btn span:hover {background:#dddddd;} .client-edit-form_dlg .save_btn span {background:url(../img/save.png) no-repeat 30px;} .yellow-btn {color:#4e5661;background:#fed13e;} -.btn {display:inline-block;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;border:none;height:72px;background:#fed13e;border-radius:0;} -.btn:hover {display:inline-block;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;border:none;height:72px;background:#ffca3e;border-radius:0;} +.btn {display:inline-block;font-stretch:ultra-condensed;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;border:none;height:72px;background:#fed13e;border-radius:0;} +.btn:hover {display:inline-block;font-stretch:ultra-condensed;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;border:none;height:72px;background:#ffca3e;border-radius:0;} .btn a {height:75px;display:table-cell;vertical-align:middle;text-align:center;text-transform:uppercase;text-decoration:none;color:#fff;font-size:22px;} .docs-btn {margin-bottom:15px;} .docs-btn a {padding: 0 40px;font-weight:normal;} @@ -313,7 +314,7 @@ form label {font-style:italic;} .form-field: {width:210px;} input, select, textarea { font-family: Arial,Helvetica,sans-serif;background:#f8f8f8;} -.buttons input {display:inline;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;padding:25px;border:none;cursor: pointer;} +.buttons input {display:inline;font-stretch:ultra-condensed;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;padding:25px;border:none;cursor: pointer;} .buttons input:hover {background:#dddddd;} fieldset { padding: 0 0 10px; @@ -356,7 +357,7 @@ input[type=text], input[type=number], input[type=email], input[type=password], t #profile {position:relative;margin-bottom:85px;} #profile div {line-height: 20px;font-size: 14px;} .reqs_btns {position:absolute; bottom:215px;text-align:center;width:785px;} -.reqs_btns input {display:inline;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;padding:25px 15px 25px 70px;border:none;} +.reqs_btns input {display:inline;font-stretch:ultra-condensed;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;padding:25px 15px 25px 70px;border:none;} .reqs_btns .btn {color:#4e5661;} .reqs_btns .yellow-btn {color:#4e5661;cursor: pointer;} .reqs_btns .black-btn {color:#fff; margin-left:15px;cursor: pointer;} @@ -374,7 +375,7 @@ ul { clear: both; list-style: none; margin: 0; padding: 0; } .nav {display: block;margin: 20px 0 0 0;font-size: 13px;} .nav:hover {display: block;margin: 20px 0 0 0;font-size: 13px;text-decoration:none;} -.ui-datepicker-trigger {display:inline-block;position:relative;left:-32px;top:7px;cursor:pointer;} +.ui-datepicker-trigger {display: inline-block;position: relative;left: -30px;top: 3px;cursor: pointer;} #id_phone_code, #id_fax_code { width: 60px; } #accounts .account-delete a { text-decoration: none; } @@ -382,10 +383,10 @@ ul { clear: both; list-style: none; margin: 0; padding: 0; } #accounts .account-add img { vertical-align: middle; margin-right: 6px; } #accounts .main { color: green; font-size: 11px; text-align: center; padding-left: 10px; vertical-align: top; } -.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; text-decoration:none;} +.add-link, .add-row {background: url(../img/icon-add.png) no-repeat;padding: 0 50px 0;line-height:40px;display: inline-block;} +.add-link, .add-row:hover {background: url(../img/icon-add.png) no-repeat ;padding: 0 50px 0;line-height: 40px;display: inline-block;} +.add-client-link {background: url(../img/icon-add.png) no-repeat;padding: 4px 50px 0 ;line-height: 40px;display: inline-block;} +.add-client-link:hover {background: url(../img/icon-add.png) no-repeat; text-decoration:none;} .add-row {margin-top:4px;} .edit-link a, .delete-link a { text-decoration: none; } @@ -414,11 +415,13 @@ a.delete { vertical-align: top; } .profile-filters-form .accounts ul li span.name { margin-left: 25px; } .div-doc-form {background:#fff;padding:15px;box-shadow: 0 0 5px #ddd;} -.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;} +.doc-form input[type=text], .doc-form input[type=email], .doc-form input[type=number], .doc-form input[type=password], .doc-form option {padding-left:2px;margin-left:0;height:36px;font-size:25px;} +.doc-form textarea {padding:10px 0 0 10px;font-size:13px;} +#id_client_text, #doc_text {width:570px;} #id_client-wrapper {display:inline;} #nds_value {margin-top:15px;} - +#id_nds_value{padding-left: 2px;margin-left: 0;height: 36px;font-size: 25px;} +#id_doc_num, #id_doc_date {padding-left: 2px;margin-left: 0;height: 36px;font-size: 25px;width: 155px;} .doc-form #doc_date, .doc-form #doc_mesto, .doc-form #end_date, .doc-form #doc_expire_date, .doc-form #dover_doc_date, .doc-form #dover_passport_num, .doc-form #plat_doc_date @@ -443,7 +446,7 @@ a.delete { vertical-align: top; } .doc-form #dover_passport_org .errorlist, .doc-form #dover_passport_date .errorlist { margin-left: 168px;margin-top: -10px; } -.doc-form select#id_bank_account { width: 410px; } +.doc-form select#id_bank_account {width: 410px;height: 40px;font-size: 25px;margin-left: 0;padding-left: 2px;} .doc-form select#id_client { width: 370px; } .doc-form input#id_doc_mesto { width: 340px; } @@ -466,15 +469,15 @@ a.delete { vertical-align: top; } .doc-form table.doc-list {border-collapse:collapse;position:relative;} .doc-form table.doc-list td {border:4px solid #fff;} .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 .itogo-td1 {} +.doc-form table.doc-list .itogo-td2 {} .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;} -.doc-form table.doc-list td.name { width: 590px; } -.doc-form table.doc-list td.name input[type=text] { width: 584px; } +.doc-form table.doc-list td.name { width: 570px; } +.doc-form table.doc-list td.name input[type=text] { width: 570px; } .doc-form table.doc-list td.qty { width: 140px; } .doc-form table.doc-list td.qty input { width: 135px; } .doc-form table.doc-list td.units { width: 90px; } @@ -586,7 +589,7 @@ div.blockMsg { width: 100%; height: 100%; top: 0; left: 0; text-align: center; } .footer-text {position:relative;padding:25px 0 10px 0;color:#fff;} #menu {width: 100%;height:50px;position:relative;overflow:visible;} -#menu ul li {display:table-cell;height:50px;background:#313942;font-family:'Arial Narrow', Arial, sans-serif;font-size:16px;vertical-align:middle;border-left: solid 1px #434a52} +#menu ul li {display:table-cell;height:50px;background:#313942;font-stretch:ultra-condensed;font-family:'Arial Narrow', Arial, sans-serif;font-size:16px;vertical-align:middle;border-left: solid 1px #434a52} #menu ul li.yellow {background:#fed13e;width: 197px;} #menu ul li.yellow:hover {background:#ffca3e;} #menu ul li.yellow a, #menu ul li.yellow span {color:#313942;} @@ -603,7 +606,7 @@ div.blockMsg { width: 100%; height: 100%; top: 0; left: 0; text-align: center; } #menu .other_docs_menu {position:absolute;top:50px;z-index:50;} #menu .other_docs_menu li {display:block;padding:0;background:#454c54;border-top:1px solid #363b43;} #menu .other_docs_menu li:first-child {border-top:none;} -#menu .other_docs_menu li a {line-height:50px;padding-left:10px;display:inline-block;width:100%;} +#menu .other_docs_menu li a {line-height:50px;padding-left:2px;display:inline-block;width:100%;} .preview-wrapper {width:1200px;background:#ebebeb;margin-bottom:70px;} .preview {width:785px;height:500px;overflow:scroll;float:left;margin:15px 0 15px 15px;} @@ -644,7 +647,7 @@ tr.doc-row:hover {cursor:pointer;} .rel {position:relative;} .img_field {border:1px solid #f2f2f2;} .profile_btns {margin: 10px; padding:10px;} -.profile_btns input {display:inline;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;padding:25px;border:none;cursor: pointer;} +.profile_btns input {display:inline;font-stretch:ultra-condensed;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;padding:25px;border:none;cursor: pointer;} .profile_btns input:hover {background:#dddddd;} .profile_btns .yellow-btn.save {background:#fed13e url(../img/save.png) no-repeat 25px center;padding:25px 15px 25px 60px;cursor: pointer;} .profile_btns .yellow-btn.save:hover {background:#ffca3e url(../img/save.png) no-repeat 25px center;padding:25px 15px 25px 60px;} diff --git a/project/static/img/icon-add.png b/project/static/img/icon-add.png index 7a522321f66b6e5a1dcb5c852d3a14d38a201995..609fe27c9ff43751cb7571976311b735c0136ca3 100644 GIT binary patch delta 373 zcmV-*0gC>O8HgAmiBL{Q4GJ0x0000DNk~Le0000i0000d2nGNE0CYpD!m%Nr3V$<6 zL_t(|+U(h}YQr!Th2cLYV2llhtl4eo;LTf0Odv0$zCu>{N%{r_K~U)8J&-YhK(Z7J zHXhxj30+FuAykHYHo+M_goG|=()T@OS$!DVwHYv)QoU?|)~&+5=VqMNv411&E@E<#Kslt~?+H2*c3Xvk(Nq z&F?X?2zZp>s;Vf@Sik}nusgHF(Byeep69Z|0v7Nu;7S^x>pEwV zKWvQ$7yx4oZQDABZQB-O%ys!b(ON$NmXZ8%cuJ`qkO6PN*+J;}+mH delta 507 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 literal 0 HcmV?d00001 diff --git a/project/templates/docs/aktrabot/form.html b/project/templates/docs/aktrabot/form.html index 8ae537f..3611e8d 100644 --- a/project/templates/docs/aktrabot/form.html +++ b/project/templates/docs/aktrabot/form.html @@ -1,4 +1,4 @@ -{% extends "docs/_base/base_form.html" %} +{% extends "docs/_base/base_form.html" %} {% load my_tags %} @@ -9,7 +9,7 @@
- {% include 'docs/parts/form_field.html' with field=form.bank_account id="bank_account" classes="field" label="Расчётный счёт" %} + {% include 'docs/parts/form_field_client.html' with field=form.client required="True" is_ajax="True" %} {% include 'docs/parts/form_field.html' with field=form.invoice id="invoice" classes="field" label="Создать акт по счёту" %}
@@ -22,9 +22,7 @@ {% endif %} -
- {% include 'docs/parts/form_field.html' with field=form.doc_text id="doc_text" classes="field" label="Дополнительные условия" %} -
+ {% endblock %} {% block js %} diff --git a/project/templates/docs/faktura/form.html b/project/templates/docs/faktura/form.html index 62a8b85..d761377 100644 --- a/project/templates/docs/faktura/form.html +++ b/project/templates/docs/faktura/form.html @@ -1,4 +1,4 @@ -{% extends "docs/_base/base_form.html" %} +{% extends "docs/_base/base_form.html" %} {% load my_tags %} @@ -19,7 +19,6 @@ {% include 'docs/parts/form_field.html' with field=form.fix_doc_date id="fix_doc_date" classes="left" label="Дата исправления" required="True" %} {% include 'docs/parts/form_field.html' with field=form.avance id="avance" label="Аванс" no_clear_after="True" label_inline="True" %} - {% include 'docs/parts/form_field.html' with field=form.bank_account id="bank_account" classes="field" label="Расчётный счёт" %} {% include 'docs/parts/form_field_client.html' with field=form.client required="True" is_ajax="True" %} {% include 'docs/parts/form_field.html' with field=form.invoice id="invoice" classes="field" label="Создать счёт-фактуру по счёту" %} {% include 'docs/parts/form_field.html' with field=form.currency id="currency" classes="field" label="Валюта" %} diff --git a/project/templates/docs/invoice/form.html b/project/templates/docs/invoice/form.html index f1ab8ce..b8ecced 100644 --- a/project/templates/docs/invoice/form.html +++ b/project/templates/docs/invoice/form.html @@ -2,12 +2,9 @@ {% load my_tags %} {% block form_content %}
- {% include 'docs/parts/form_field.html' with field=form.doc_num id="doc_num" classes="left" label="Номер" required="True" no_clear_after="True" %} - {% include 'docs/parts/form_field.html' with field=form.doc_date id="doc_date" classes="left" label="Дата создания" required="True" %} -
- -
- {% include 'docs/parts/form_field.html' with field=form.bank_account id="bank_account" classes="field" label="Расчётный счёт" %} + {% include 'docs/parts/form_field.html' with field=form.doc_num id="doc_num" classes="left" label="Номер" required="True" no_clear_after="True" %} + {% include 'docs/parts/form_field.html' with field=form.doc_date id="doc_date" classes="left" label="Дата создания" required="True" no_clear_after="True"%} + {% include 'docs/parts/form_field.html' with field=form.bank_account id="bank_account" classes="field" label="Расчётный счёт" %} {% include 'docs/parts/form_field_client.html' with field=form.client required="True" is_ajax="True" %}
diff --git a/project/templates/docs/nakladn/form.html b/project/templates/docs/nakladn/form.html index 0637005..3efe1bd 100644 --- a/project/templates/docs/nakladn/form.html +++ b/project/templates/docs/nakladn/form.html @@ -1,4 +1,4 @@ -{% extends "docs/_base/base_form.html" %} +{% extends "docs/_base/base_form.html" %} {% load my_tags %} @@ -25,10 +25,6 @@ {% include 'docs/nakladn/form_tbl_items.html' %} {% endif %} - -
- {% include 'docs/parts/form_field.html' with field=form.doc_text id="doc_text" classes="field" label="Дополнительные условия" %} -
{% endblock %} {% block js %} diff --git a/project/templates/docs/stub_js.html b/project/templates/docs/stub_js.html index 5a87de8..0393266 100644 --- a/project/templates/docs/stub_js.html +++ b/project/templates/docs/stub_js.html @@ -126,7 +126,7 @@ } $('#id_fixes').change(function(){ $('#fix_block').toggle(); - $('#id_fix_doc_num').val(''); + $('#id_fix_doc_num').val('11'); $('#id_fix_doc_date').val(''); }) });