diff --git a/project/docs/filters.py b/project/docs/filters.py index 5e92c68..478e174 100644 --- a/project/docs/filters.py +++ b/project/docs/filters.py @@ -100,8 +100,8 @@ doc_date_choices = { closed_status_choices = ( ('', u'Все счета'), - (1, u'Закрытые'), - (0, u'Не закрытые'), + (1, u'Закрытые актом выполненных работ'), + (0, u'Не закрытые актом выполненных работ'), ) paid_status_choices = ( @@ -171,7 +171,7 @@ def build_filterset_class(model, user, need_fields=None): fields.append('invoice') elif f == 'closed_status': - closed_status = django_filters.ChoiceFilter(label=u'По закр. документам', choices=closed_status_choices, + closed_status = django_filters.ChoiceFilter(label=u'По закрывающим документам', choices=closed_status_choices, widget=django_filters.widgets.LinkWidget) attrs['closed_status'] = closed_status fields.append('closed_status') diff --git a/project/docs/views/invoice.py b/project/docs/views/invoice.py index 18543fd..ca6d5f1 100644 --- a/project/docs/views/invoice.py +++ b/project/docs/views/invoice.py @@ -20,6 +20,8 @@ class InvoiceViews(BaseItemsViews): ITEM_FORM_CLASS = InvoiceItemForm # форма табличной части документа ITEM_FORM_PREFIX = 'invoice_items' # префикс формы табличной части + ORDER_FIELDS = ('doc_date', 'doc_num', 'client__name', 'doc_sum', 'paid_status', 'closed_status') + # поля, по которым можно фильтровать список документов # должны поддерживаться в docs.filters.build_filterset_class ! FILTER_FIELDS = ('paid_status', 'closed_status', 'client', 'doc_date',) diff --git a/project/static/css/style.css b/project/static/css/style.css index 977c7a3..5a49a8d 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -49,7 +49,6 @@ body { #bg-index {background:url(../img/index-banner.png) no-repeat top center;position:absolute;top:150px;height:551px;width:100%;} #bg-index-promo {background:#38424c;position:absolute;top:701px;height:200px;width:100%;} #body { - height:auto; min-height:100%; position:relative; @@ -66,9 +65,10 @@ body { } .w1200 {width:1200px;margin:0 auto;} +.content-white {width:1200px;background:#fff;box-shadow: 0 0 5px #ddd;padding:15px 15px 0 15px;box-sizing:border-box;margin-bottom:70px;} #header {height:100px;width:100%;position:relative;} #logo {font-family:"MyriadProRegular";display:block;overflow:hidden;margin-top:18px;} -#logo .logo-bigfont {font-size:30px;line-height:30px;margin-top:12px;} +#logo .logo-bigfont {font-size:30px;line-height:30px;margin-top:12px;text-transform:uppercase;} .logo-text {margin-left:10px; font-size:18px;color:#3e454c;line-height:18px;} .auth_block {margin-top:30px;} .login, .register {display:block;padding-left:34px;margin: 0 3px;height:36px;text-decoration:none;font-family:Arial,Helvetica,sans-serif;color:#36393f; line-height:36px;} @@ -119,17 +119,17 @@ body { .register-arrow {width:300px;height:100px;background:url(../img/black_arrow.png) no-repeat center center;position:absolute;left:50%;top:340px;margin-left:300px;color:#fff;padding: 20px 0 0 0;font-style:italic;text-align:center;font-size:16px;} .register-arrow p {margin:5px;} -.auth-form .field input[type="text"], .auth-form .field input[type="email"], .auth-form .field input[type="password"]{width:300px;vertical-align:bottom;height:50px;margin-top:32px;} +.auth-form .field input[type="text"], .auth-form .field input[type="email"], .auth-form .field input[type="password"]{width:300px;vertical-align:bottom;height:50px;margin-top:32px;font-size: 46px;line-height:46px;} .auth-form .field input[type="checkbox"] {height:20px;width:20px;vertical-align:middle;height:50px;} .auth-form .field#captcha input[type="text"] {width:130px;height:50px;} -.auth-form .field label {display:inline-block;width:200px;text-align:right;line-height:50px;padding-right:5px;vertical-align:middle;} +.auth-form .field label {display:inline-block;width:190px;text-align:right;line-height:50px;padding-right:5px;vertical-align:middle;} .auth-form .field#profile_type label {width:200px;vertical-align:middle;height:50px;} .auth-form .field #id_register-profile_type {float:right;margin-top:15px;} .auth-form .field #id_register-profile_type label {width:300px;font-size:13px;line-height:20px;vertical-align:bottom;height:30px;text-align:left;} .auth-form .field img {vertical-align:middle;} .auth-form .buttons {text-align:center;margin-top:45px;} -.auth-form .buttons input[type="submit"]{background:#fed13e;border:none;font-size:22px;padding:15px 40px;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;font-weight:bold;} +.auth-form .buttons input[type="submit"]{background:#fed13e;border:none;font-size:22px;padding:15px 40px;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;font-weight:bold;text-transform:uppercase;} .auth-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;} @@ -232,10 +232,18 @@ h2 {font-weight: normal;font-size:24px;} .ui-widget-content { background:#fff; } -.ui-dialog .ui-dialog-content { - background:#fff; -} .ui-dialog .ui-dialog-buttonpane { + background:none!important; + border:0; +} +.ui-dialog .ui-dialog-content {font-size:14px;} +.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-state-default .ui-icon {background:url(../img/close.png) no-repeat center center;} +.ui-icon {width:22px;height:22px;} +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {background:none;border:none;} + +.client-edit-form_dlg .ui-dialog-buttonpane { + background:none!important; border:0; position:absolute; bottom:0; @@ -257,11 +265,18 @@ 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 span {width:215px;display:table-cell;vertical-align:middle;text-align:right;text-transform:uppercase;text-decoration:none;font-size:22px;color:#4e5661;background:url(../img/save.png) no-repeat 20px top;} +.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 span {width:215px;display:table-cell;vertical-align:middle;text-align:center;text-decoration:underline;font-size:14px;color:#498dd0;font-weight:normal;} -.reqs_btns .yellow-btn {color:#4e5661;} + +.client-edit-form_dlg .save_btn span {background:url(../img/save.png) no-repeat 20px top;} +.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 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;} +.yellow-btn a {color:#4e5661;} .hidden {display:none; } @@ -275,7 +290,7 @@ form label {font-style:italic;font-size:16px;} .label {width:120px;text-align:right;font-size:14px;color:#646669;line-height:30px;} .form-field: {width:210px;} -input, select, textarea { font-family: Arial,Helvetica,sans-serif; font-size: 46px;line-height:46px; background:#f8f8f8;background:#f8f8f8;} +input, select, textarea { font-family: Arial,Helvetica,sans-serif;background:#f8f8f8;} fieldset { padding: 0 0 10px; @@ -316,8 +331,9 @@ input[type=text], input[type=email], input[type=password], textarea, option { pa .profile-col1, .profile-col2 {float: none;background:#fff; box-shadow: 0 0 5px #ddd;padding:0px;display:table-cell;} #profile {position:relative;margin-bottom:85px;} #profile div {line-height: 20px;} -.reqs_btns {position:absolute; bottom:115px;text-align:center;width:785px;} +.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 .btn {color:#4e5661;} .reqs_btns .yellow-btn {color:#4e5661;} .reqs_btns .black-btn {color:#fff; margin-left:15px;} .reqs_btns .black-btn.envelope {background:#38424c url(../img/envelope.png) no-repeat 15px center;} @@ -329,6 +345,7 @@ input[type=text], input[type=email], input[type=password], textarea, option { pa #edit_profile {display: inline-block; float:right;padding-left: 15px;background:url(../img/pencil.png) no-repeat;font-size:13px;} ul { clear: both; list-style: none; margin: 0; padding: 0; } +.nav {display:block;margin:20px;} .has-datepicker { background: url(../img/icon-calendar.gif) no-repeat scroll right center transparent; } @@ -343,9 +360,17 @@ ul { clear: both; list-style: none; margin: 0; padding: 0; } .add-link img { vertical-align: middle; margin-right: 6px; } .edit-link a, .delete-link a { text-decoration: none; } -.doc-panel .edit-link img, .doc-panel .delete-link img, .doc-panel .email-link img, - .doc-panel .pdf-link img, .doc-panel .excel-link img - { vertical-align: middle; margin-right: 6px; } +.doc-panel {background:#fff;} +.doc-panel a.doc {display:block;margin: 13px 0 13px 20px;height:40px;padding-left:43px;line-height:40px;:} +.doc-panel a.pdf-link {background:url(../img/sign-pdf.png)left center no-repeat;} +.doc-panel a.excel-link {background:url(../img/sign-xls.png)left center no-repeat;} +.doc-panel a.copy-link {background:url(../img/sign-copy.png)left center no-repeat;} +.doc-panel a.invoice-add-doc {background:url(../img/sign-add.png)left center no-repeat;} +.doc-panel a.email-link {background:url(../img/sign-email.png)left center no-repeat;} +.doc-panel a.edit-link {background:url(../img/sign-edit.png)left center no-repeat;} +.doc-panel a.delete-link {background:url(../img/icon-delete.png)7px center no-repeat;} +.doc-panel .doc-panel-header {background:#f7f7f7;padding:10px 18px;font-size:16px;} +.preview-col2 .doc-panel {box-sizing:border-box;} a.delete { vertical-align: top; } @@ -356,8 +381,8 @@ a.delete { vertical-align: top; } .profile-filters-form .accounts ul li { margin: 4px 0; } .profile-filters-form .accounts ul li span.name { margin-left: 25px; } -.doc-form { padding-left: 2px; } -.doc-form input[type=text], input[type=password], textarea, option { padding-left: 2px; margin-left: 0; } +.div-doc-form {background:#fff;padding:15px;box-shadow: 0 0 5px #ddd;} +.doc-form input[type=text], input[type=email], input[type=password], textarea, option { padding-left: 2px; margin-left: 0; } .doc-form #doc_date, .doc-form #doc_mesto, .doc-form #end_date, @@ -449,16 +474,27 @@ a.delete { vertical-align: top; } .errors-layout ul { list-style: none; margin-bottom: 10px; padding: 5px 10px; border: 1px solid red; } -table.list { width: 100%; border: none; font-size: small; } -table.list th { background: #f5f5f5; text-align: left; font-size: 11px; } -table.list tr.even { background: #fff; } -table.list tr.odd { background: #eee; } -table.list td { word-break: break-all; padding: 5px 0; } - +.docs-content-wrapper {border:#dedede 1px solid;border-bottom:none;overflow: hidden;position:relative;} +.docs-content-wrapper table.list {border:none;} +table.list {border-collapse: collapse;border:#dedede 1px solid;border-bottom:none;width: 100%;} +table.list tr:nth-child(odd) {background: #f7f7f7;} +table.list tr th {text-align: left;font-size:12px;color:#646669;padding:7px 10px 7px 10px;border-right:#dedede 1px solid;border-bottom:#dedede 1px solid;border-top:none;background: #f7f7f7;} +table.list tr th:last-child {border-right:none;} +table.list tr th a {font-size:12px;color:#646669;text-decoration:none;} +table.list tr td a {color:#313942;text-decoration:none;} +table.list tr td {font-size:14px;color:#313942;padding:7px;word-break: break-all;} + +.filters-header {background: #f7f7f7;overflow:hidden;margin:0;} +.filters-header span {color: #646669;padding: 7px 0 7px 20px;font-size:12px;font-weight:bold;display:block;width:100%;box-sizing:border-box;border-bottom:#dedede 1px solid;} .filters p { margin: 15px 0 0; font-weight: bold; } -.filters ul li a.selected { border-left: 5px solid #ccc; margin-left: -10px; padding-left: 5px; } +.filters ul { padding: 10px 0 10px 20px;} +.filters ul li a.selected { color:#646669;text-decoration:none;} +.filters select {font-size:13px;margin-left:20px;} +#filters_form {padding:10px 25px;} -.pagination { font-size: small; color: black; margin-top: 5px; padding-top: 1ex; width: 99%; border-top: 1px solid; } +.pagination {margin-top: 5px; padding-top: 1ex; width: 99%; color:#646669;font-size:13px;} +.pagination select {font-size:13px;} +.doc-pagination {position:absolute;bottom:0;width:775px;padding:10px;} /* blockUI */ div.blockOverlay { background: url('../img/ajax-loader.gif') no-repeat center center; z-index: 99999; } @@ -484,14 +520,19 @@ 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;} -.preview {width:780px;height:500px;overflow:scroll;float:left;} -.list-col2 {float: left; width: 180px; margin-left: 16px; padding: 0 10px 10px 10px; border-left: solid 1px #797979;} -.doc_status1, .doc_statusFalse, .doc_statusfalse {color:red;} -.doc_status3, .doc_statusTrue, .doc_statustrue {color:green;} -.doc_status2 {color:blue;} +.preview-wrapper {width:1200px;background:url(../img/darker-bg.png);margin-bottom:70px;} +.preview {width:785px;height:500px;overflow:scroll;float:left;margin:15px 0 15px 15px;} +.list-col1 {float: left; width: 785px;padding-bottom:50px;} +.list-col2 {float:left;width:382px;padding: 0; border-left:#dedede 1px solid;} +.th_w300 {width:300px;} +.preview-col2 {float:left;width:370px;height:500px;padding:0; border-left:none;margin:15px;overflow:auto;background:#fff;} +table.list tr td a.doc_status1, table.list tr td a.doc_statusFalse, table.list tr td a.doc_statusfalse {color:#c43f04;} +table.list tr td a.doc_status3, table.list tr td a.doc_statusTrue, table.list tr td a.doc_statustrue {color:#19a12f;} +table.list tr td a.doc_status2 {color:blue;} tr.doc-row:hover {cursor:pointer;} -#clients tr:nth-child(odd) {background: #f5f5f5;} + +.white_bg {background:#fff!important;} #req-avail-form {display:none;} .close-message {display:inline-block;float:right;} diff --git a/project/static/img/asc.png b/project/static/img/asc.png new file mode 100644 index 0000000..d2f1448 Binary files /dev/null and b/project/static/img/asc.png differ diff --git a/project/static/img/close.png b/project/static/img/close.png new file mode 100644 index 0000000..5706d3f Binary files /dev/null and b/project/static/img/close.png differ diff --git a/project/static/img/desc.png b/project/static/img/desc.png new file mode 100644 index 0000000..eda9837 Binary files /dev/null and b/project/static/img/desc.png differ diff --git a/project/static/img/icon-delete.png b/project/static/img/icon-delete.png new file mode 100644 index 0000000..54d847a Binary files /dev/null and b/project/static/img/icon-delete.png differ diff --git a/project/static/img/icon-edit.png b/project/static/img/icon-edit.png new file mode 100644 index 0000000..65a2c50 Binary files /dev/null and b/project/static/img/icon-edit.png differ diff --git a/project/static/img/nosort.png b/project/static/img/nosort.png new file mode 100644 index 0000000..2520ae4 Binary files /dev/null and b/project/static/img/nosort.png differ diff --git a/project/static/img/sign-add.png b/project/static/img/sign-add.png new file mode 100644 index 0000000..4e37abc Binary files /dev/null and b/project/static/img/sign-add.png differ diff --git a/project/static/img/sign-copy.png b/project/static/img/sign-copy.png new file mode 100644 index 0000000..5fe5949 Binary files /dev/null and b/project/static/img/sign-copy.png differ diff --git a/project/static/img/sign-edit.png b/project/static/img/sign-edit.png new file mode 100644 index 0000000..65a2c50 Binary files /dev/null and b/project/static/img/sign-edit.png differ diff --git a/project/static/img/sign-email.png b/project/static/img/sign-email.png new file mode 100644 index 0000000..0842e03 Binary files /dev/null and b/project/static/img/sign-email.png differ diff --git a/project/static/img/sign-pdf.png b/project/static/img/sign-pdf.png new file mode 100644 index 0000000..6cc5bdd Binary files /dev/null and b/project/static/img/sign-pdf.png differ diff --git a/project/static/img/sign-xls.png b/project/static/img/sign-xls.png new file mode 100644 index 0000000..5ad51b6 Binary files /dev/null and b/project/static/img/sign-xls.png differ diff --git a/project/static/js/client.commons.js b/project/static/js/client.commons.js index 0610e0b..0449417 100644 --- a/project/static/js/client.commons.js +++ b/project/static/js/client.commons.js @@ -1,9 +1,12 @@ function setup_client_edit_form(form) { var btn1_caption = form.data('dialog-btn-caption') || "Сохранить"; + var form_id = form.attr('id'); + var dlg_id = form_id + '_dlg'; form.dialog({ modal: true, autoOpen: false, minWidth: 830, + dialogClass: dlg_id, buttons: [ { text: btn1_caption, diff --git a/project/static/js/commons.js b/project/static/js/commons.js index f337c45..bd67dbd 100644 --- a/project/static/js/commons.js +++ b/project/static/js/commons.js @@ -1,7 +1,11 @@ $(document).ready(function() { $('.has-datepicker').datepicker({dateFormat: 'dd.mm.yy'}); - $('.extended-block').click(function(e){ - e.preventDefault(); + $('#reasons').mouseout(function(e){ + $('.extended-block').removeClass('active'); + $('.extended-block-more').hide(); + $('.extended-triangle').hide(); + }); + $('.extended-block').mouseover(function(e){ $('.extended-block').removeClass('active'); $('.extended-block-more').hide(); $('.extended-triangle').hide(); @@ -9,7 +13,12 @@ $(document).ready(function() { $(this).find('.extended-triangle').show(); $(this).addClass('active'); }); - $('.desc-block').click(function(e){ + $('#why_register').mouseout(function(e){ + $('.desc-block').removeClass('active'); + $('.desc-block-more').hide(); + $('.desc-triangle').hide(); + }); + $('.desc-block').mouseover(function(e){ e.preventDefault(); $('.desc-block').removeClass('active'); $('.desc-block-more').hide(); diff --git a/project/templates/base.html b/project/templates/base.html index f143f05..f540aa1 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -28,71 +28,73 @@ {% endif %}
-
-
 
- {% block bg %} - {% endblock %} -
-
-