some layout

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')

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',)

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;}

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,

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();

project/templates/base.html

@@ -28,71 +28,73 @@
     </div>
 {% endif %}
 <div id="body">
-<div id="bg">
-    <div id="bg-header">&nbsp;</div>
-    {% block bg %}
-    {% endblock %}
-</div>
-<div id="w1200">
-    <div id="header">
-        <div class="left">
-            <a href="/" id="logo">
-                <img class='left' src='{{ STATIC_URL }}img/logo.png' />
-                <div class="left logo-text">
-                    <div class="logo-bigfont">Документор</div>
-                    <div>Сервис, которому нравится создавать документы. И вам понравится!</div>
+    <div id="bg">
+        <div id="bg-header">&nbsp;</div>
+        {% block bg %}
+        {% endblock %}
+    </div>
+
+    <div id="w1200">
+        <div id="header">
+            <div class="left">
+                <a href="/" id="logo">
+                    <img class='left' src='{{ STATIC_URL }}img/logo.png' />
+                    <div class="left logo-text">
+                        <div class="logo-bigfont">Документор</div>
+                        <div>Сервис, которому нравится создавать документы. И вам понравится!</div>
+                    </div>
+                </a>
+            </div>
+            {% if user.is_authenticated %}
+                <div class="auth_block right">
+                    <a href="{% url 'customer_index' %}">{{ request.user.profile.get_company_name|default:'Новый профиль' }}</a>
+                    &nbsp;|&nbsp;
+                    <a href="{% url 'auth_logout' %}">Выход</a>
+                </div>
+            {% else %}
+                <div class="auth_block right">
+                    <a href="{% url 'myauth_register' %}" class="{% if request.path == myauth_register %}register_active {% endif %}register left">Регистрация и цены</a>
+                    <a href="{% url 'myauth_login' %}" class="{% if request.path == myauth_login %}login_active {% endif %}login left">Вход в систему</a>
                 </div>
-            </a>
+            {% endif %}
+            <div class='clear'></div>
         </div>
-        {% if user.is_authenticated %}
-            <div class="auth_block right">
-                <a href="{% url 'customer_index' %}">{{ request.user.profile.get_company_name|default:'Новый профиль' }}</a>
-                &nbsp;|&nbsp;
-                <a href="{% url 'auth_logout' %}">Выход</a>
-            </div>
-        {% else %}
-            <div class="auth_block right">
-                <a href="{% url 'myauth_register' %}" class="{% if request.path == myauth_register %}register_active {% endif %}register left">Регистрация и цены</a>
-                <a href="{% url 'myauth_login' %}" class="{% if request.path == myauth_login %}login_active {% endif %}login left">Вход в систему</a>
-            </div>
-        {% endif %}
-        <div class='clear'></div>
-    </div>
 
-    <div class="clear"></div>
+        <div class="clear"></div>
+
+        {% block top_menu %}
+            <div id="menu">
+                <ul>
+                    {% show_menu 0 100 100 100 %}
+                </ul>
+            </div>
+        {% endblock %}
 
-    {% block top_menu %}
-        <div id="menu">
-            <ul>
-                {% show_menu 0 100 100 100 %}
-            </ul>
+        {% block content %}{% endblock %}
+    </div>
+    {% block bottom_wide %}{% endblock %}
+    {% block footer %}
+        <div id='footer'>
+            <div id="footer-content">
+                <div class="footer-text">Техподдержка Документора</div>
+                <a href='#'>help@documentor.ru</a>
+                <a href="#" onclick="return show_req_avail_form('{% url 'callback-send-message' %}');">Обратная связь</a>
+                <a href="#">Лицензионный договор</a>
+            </div>
         </div>
+
     {% endblock %}
+    </div>
 
-    {% block content %}{% endblock %}
-</div>
-{% block bottom_wide %}{% endblock %}
-{% block footer %}
-    <div id='footer'>
-        <div id="footer-content">
-            <div class="footer-text">Техподдержка Документора</div>
-            <a href='#'>help@documentor.ru</a>
-            <a href="#" onclick="return show_req_avail_form('{% url 'callback-send-message' %}');">Обратная связь</a>
-            <a href="#">Лицензионный договор</a>
-        </div>
+    <div id="dialogs">
+        {% block dialogs %}{% endblock %}
+    {% include "callback/callback_form.html" %}
     </div>
 
-{% endblock %}
-</div>
 
-<div id="dialogs">
-    {% block dialogs %}{% endblock %}
-{% include "callback/callback_form.html" %}
+    <div id="dialog-message"></div>
 </div>
 
-
-<div id="dialog-message"></div>
-
 {% block common_js %}
     <script src="{{ STATIC_URL }}js/lib/jquery-1.10.2.min.js"></script>
     <script src="{{ STATIC_URL }}js/lib/jquery-ui-1.10.3.custom.min.js"></script>

project/templates/customer/clients/list.html

@@ -3,34 +3,39 @@
 {% block title %}Контрагенты{% endblock %}
 
 {% block content %}
-<h2>Контрагенты</h2>
-
-<div>
-    <a class="client add-link" href="{% url 'customer_clients_add' %}" title="Добавить контрагента">
-        <img src="{{ STATIC_URL }}img/icon-add.gif" alt="Добавить" title="Добавить контрагента" />Добавить контрагента
-    </a>
+<h2>Добавление и список контрагентов</h2>
+<div class='content-white'>
+    <div class='btn yellow-btn docs-btn'>
+        <a class="client add-link" href="{% url 'customer_clients_add' %}" title="Добавить контрагента">
+            Добавить контрагента
+        </a>
+    </div>
+    <div class="clear"></div>
+
+    {% if page %}
+
+        <table id="clients" class="list">
+            <tr id='clients_header_row'>
+                <th style="width: 46%">Контрагент</th>
+                <th style="width: 18%">Контактное лицо</th>
+                <th style="width: 14%">Телефон</th>
+                <th style="width: 10%;">Редактировать</th>
+                <th style="width: 8%;">Удалить?</th>
+            </tr>
+
+            {% for obj in page.object_list %}
+                {% include "customer/clients/list_item.html" %}
+            {% endfor %}
+            <tr class='white_bg'>
+                <td colspan='5'>
+                {% include 'paginator.html' with url_list='customer_clients_list' %}
+                </td>
+            </tr>
+        </table>
+
+    {% endif %}
 </div>
-
-{% if page %}
-    <br /><br />
-
-    <table id="clients" class="list">
-        <tr id='clients_header_row'>
-            <th style="width: 50%">Контрагент</th>
-            <th style="width: 18%">Контактное лицо</th>
-            <th style="width: 14%">Телефон</th>
-            <th style="width: 10%; text-align: center">Редактировать</th>
-            <th style="width: 8%; text-align: center">Удалить</th>
-        </tr>
-
-        {% for obj in page.object_list %}
-            {% include "customer/clients/list_item.html" %}
-        {% endfor %}
-    </table>
-
-    {% include 'paginator.html' with url_list='customer_clients_list' %}
-{% endif %}
-{% endblock %}
+    {% endblock %}
 
 {% block dialogs %}
     {% include "customer/clients/form.html" with form=client_form is_ajax="True" %}

project/templates/customer/clients/list_item.html

@@ -8,12 +8,12 @@
     <td>{{ obj.contact_phone }}</td>
     <td class="center">
         <a class="client edit-link" href="{% url 'customer_clients_edit' obj.pk %}" title="Редактировать контрагента">
-            <img src="{{ STATIC_URL }}img/icon-edit.gif" alt="Редактировать" title="Редактировать контрагента" />
+            <img src="{{ STATIC_URL }}img/icon-edit.png" alt="Редактировать" title="Редактировать контрагента" />
         </a>
     </td>
     <td class="center">
         <a class="client delete-link" href="{% url 'customer_clients_delete' obj.pk %}" title="Удалить контрагента">
-            <img src="{{ STATIC_URL }}img/icon-delete.gif" alt="[X]" title="Удалить контрагента" />
+            <img src="{{ STATIC_URL }}img/icon-delete.png" alt="[X]" title="Удалить контрагента" />
         </a>
     </td>
 </tr>

project/templates/docs/_base/base_add.html

@@ -5,15 +5,13 @@
 {% block content %}
     {% url url_prefix|add:'list' as url_list %}
 
-    <span class="nav" style="display:block; margin-bottom:3ex;">
+    <span class="nav">
         <a class="back" href="{{ url_list }}">Вернуться к списку</a>
     </span>
 
-    <h2 style="display:inline">Добавить {{ padeji.vinit }}</h2>
+    <h2>Добавить {{ padeji.vinit }}</h2>
 
-    <div class="clear"></div>
-
-    {% include form_template %}
+    <div class="div-doc-form">{% include form_template %}</div>
 {% endblock %}
 
 {% block dialogs %}

project/templates/docs/_base/base_form.html

@@ -1,11 +1,9 @@
 {% load my_tags %}
-
-<div class="doc-form" style="width: 720px;">
+<div class="doc-form">
     {% if not is_ajax %}
         {% if form.non_field_errors %}<p class="error">{{ form.non_field_errors }}</p>{% endif %}
         {% if formset.non_field_errors %}<p class="error">{{ formset.non_field_errors }}</p>{% endif %}
     {% endif %}
-
     <form id="doc-form" class="doc-form" action="" method="post"{% if is_ajax %} title="Добавить / редактировать {{ padeji.vinit }}"{% endif %}>
         {% csrf_token %}
 
@@ -20,5 +18,3 @@
         {% include 'docs/parts/form_buttons.html' %}
     </form>
 </div>
-
-<br />

project/templates/docs/_base/base_list.html

@@ -7,118 +7,124 @@
 <p>Документор не может создать ничего, пока вы не добавите в него свои реквизиты. Заполните хотя бы те поля, которые отмечены * на странице <a href="{% url "customer_profile_edit" %}">Мои реквизиты</a>.</p>
 {% else %}
 {% url url_prefix|add:'add' as url_add %}
+{% with img_desc='<img src="/static/img/desc.png">' img_asc='<img src="/static/img/asc.png">' img_none='<img src="/static/img/nosort.png">' %}
 
 {% if page or obj_list_count_before_filtering > 0 %}
     <h2>{{ padeji_mnoj.imenit|capfirst }}</h2>
 
-    <div>
-        <a class="{{ model_name|default:"document" }} add-link" href="{{ url_add }}" title="Создать {{ padeji.vinit }}">
-            <img src="{{ STATIC_URL }}img/icon-add.gif" alt="Создать" title="Создать {{ padeji.vinit }}" />Создать {{ padeji.vinit }}
-        </a>
-    </div>
-
-    <br />
-
-    <div class="list-col1" style="float: left; width: 765px;">
-        {% if page.object_list or obj_list_count_before_filtering > 0 %}
-            <table id="list-docs" class="list">
-                <thead>
-                    <tr>
-                        {% block table_header %}
-                            <th><a href="?{{ ordering.order_var }}=doc_date&{{ ordering.order_type_var }}={% if ordering.order_field == 'doc_date' %}{% if ordering.order_type == 'asc' %}desc{% else %}asc{% endif %}{% else %}asc{% endif %}">Дата</a>&nbsp;
-                                {% if ordering.order_field == 'doc_date' %}{% if ordering.order_type == 'asc' %}<span title="01-31">&uarr;</span>{% else %}<span title="31-01">&darr;</span>{% endif %}{% endif %}</th>
-
-                            <th><a href="?{{ ordering.order_var }}=doc_num&{{ ordering.order_type_var }}={% if ordering.order_field == 'doc_num' %}{% if ordering.order_type == 'asc' %}desc{% else %}asc{% endif %}{% else %}asc{% endif %}">Номер</a>&nbsp;
-                                {% if ordering.order_field == 'doc_num' %}{% if ordering.order_type == 'asc' %}<span title="1-9">&uarr;</span>{% else %}<span title="9-1">&darr;</span>{% endif %}{% endif %}</th>
+    <div class='content-white'>
+        <div class="btn yellow-btn docs-btn">
+            <a class="{{ model_name|default:"document" }} add-link" href="{{ url_add }}" title="Создать {{ padeji.vinit }}">
+                Создать {{ padeji.vinit }}
+            </a>
+        </div>
+        <div class='docs-content-wrapper'>
+
+            <div class="list-col1" style="">
+                {% if page.object_list or obj_list_count_before_filtering > 0 %}
+                    <table id="list-docs" class="list">
+                        <thead>
+                            <tr>
+                                {% block table_header %}
+                                    <th><a href="?{{ ordering.order_var }}=doc_date&{{ ordering.order_type_var }}={% if ordering.order_field == 'doc_date' %}{% if ordering.order_type == 'asc' %}desc{% else %}asc{% endif %}{% else %}asc{% endif %}">Дата&nbsp;{% if ordering.order_field == 'doc_date' %}{% if ordering.order_type == 'asc' %}{{ img_desc }}{% else %}{{ img_asc }}{% endif %}{% else %}{{ img_none }}{% endif %}</a>
+                                        </th>
+
+                                    <th><a href="?{{ ordering.order_var }}=doc_num&{{ ordering.order_type_var }}={% if ordering.order_field == 'doc_num' %}{% if ordering.order_type == 'asc' %}desc{% else %}asc{% endif %}{% else %}asc{% endif %}">Номер&nbsp;{% if ordering.order_field == 'doc_num' %}{% if ordering.order_type == 'asc' %}{{ img_desc }}{% else %}{{ img_asc }}{% endif %}{% else %}{{ img_none }}{% endif %}</a>
+                                        </th>
+
+                                    <th class="th_w300"><a href="?{{ ordering.order_var }}=client__name&{{ ordering.order_type_var }}={% if ordering.order_field == 'client__name' %}{% if ordering.order_type == 'asc' %}desc{% else %}asc{% endif %}{% else %}asc{% endif %}">Контрагент&nbsp;{% if ordering.order_field == 'client__name' %}{% if ordering.order_type == 'asc' %}{{ img_desc }}{% else %}{{ img_asc }}{% endif %}{% else %}{{ img_none }}{% endif %}</a>
+                                        </th>
+
+                                    <th><a href="?{{ ordering.order_var }}=doc_sum&{{ ordering.order_type_var }}={% if ordering.order_field == 'doc_sum' %}{% if ordering.order_type == 'asc' %}desc{% else %}asc{% endif %}{% else %}asc{% endif %}">Сумма&nbsp;{% if ordering.order_field == 'doc_sum' %}{% if ordering.order_type == 'asc' %}{{ img_desc }}{% else %}{{ img_asc }}{% endif %}{% else %}{{ img_none }}{% endif %}</a>
+                                        </th>
+                                {% endblock %}
+                                {% block table_header_extra %}{% endblock %}
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            {% for obj in page.object_list %}
+                                {% url url_prefix|add:'edit' id=obj.pk as url_edit %}
+                                {% url url_prefix|add:'copy' id=obj.pk as url_copy %}
+                                {% url url_prefix|add:'delete' id=obj.pk as url_delete %}
+                                {% url url_prefix|add:'email' id=obj.pk as url_email %}
+                                {% url url_prefix|add:'img' id=obj.pk as url_img %}
+                                {% url url_prefix|add:'pdf' id=obj.pk as url_pdf %}
+                                {% url url_prefix|add:'xls' id=obj.pk as url_xls %}
+
+                                {% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %}
+                                {% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %}
+                                {% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %}
+
+                                <tr id="doc_row_{{ obj.pk }}" class="doc-row {% cycle 'even' 'odd' %}" data-id="{{ obj.pk }}">
+                                    {% block table_obj_cells %}
+                                        <td class='clck'><a href="{{ url_img }}">{{ obj.doc_date|date:"d.m.Y" }}</a></td>
+                                        <td class='clck'>{{ obj.doc_num }}</td>
+                                        <td class='clck'>{{ obj.client.name }}</td>
+                                        <td class='clck'>{{ obj.doc_sum|default:"---" }}</td>
+                                    {% endblock %}
+
+                                    {% block table_obj_cells_extra %}{% endblock %}
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+
+                        {# важно! tfoot (также как и thead), нужен в js для показа/скрытия боковой панели #}
+                        {# правильный colspan нужен для IE, иначе он игнорит footer #}
+                        {% block table_footer %}
+                        {% endblock %}
+                    </table>
+                    <div class="doc-pagination">
+                    {% include 'paginator.html' with url_list=url_prefix|add:'list' %}
+                    </div>
+                {% endif %}
+            </div>
 
-                            <th style="width: 420px"><a href="?{{ ordering.order_var }}=client__name&{{ ordering.order_type_var }}={% if ordering.order_field == 'client__name' %}{% if ordering.order_type == 'asc' %}desc{% else %}asc{% endif %}{% else %}asc{% endif %}">Контрагент</a>&nbsp;
-                                {% if ordering.order_field == 'client__name' %}{% if ordering.order_type == 'asc' %}<span title="А-Я">&uarr;</span>{% else %}<span title="Я-А">&darr;</span>{% endif %}{% endif %}</th>
+            <div id="row_pointer" style="display: none; float: left;">
+                <img src="{{ STATIC_URL }}img/left-arrow.gif" />
+            </div>
 
-                            <th><a href="?{{ ordering.order_var }}=doc_sum&{{ ordering.order_type_var }}={% if ordering.order_field == 'doc_sum' %}{% if ordering.order_type == 'asc' %}desc{% else %}asc{% endif %}{% else %}asc{% endif %}">Сумма</a>&nbsp;
-                                {% if ordering.order_field == 'doc_sum' %}{% if ordering.order_type == 'asc' %}<span title="1-9">&uarr;</span>{% else %}<span title="9-1">&darr;</span>{% endif %}{% endif %}</th>
+            <div class="list-col2">
+                {% for obj in page.object_list %}
+                    {% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %}
+                    {% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %}
+                    {% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %}
+                    <div id="doc_panel_{{ obj.pk }}" class="doc-panel hidden" style="" data-docname='{{ padeji.imenit }} №{{ obj.docnum }} от {{ obj.doc_date }}'>
+                    {% include "docs/parts/doc_actions.html" %}
+                        {% block panel_copy %}
+                            {% if template_create_docs%}
+                                {% include template_create_docs %}
+                            {% endif %}
                         {% endblock %}
-                        {% block table_header_extra %}{% endblock %}
-                    </tr>
-                </thead>
-
-                <tbody>
-                    {% for obj in page.object_list %}
-                        {% url url_prefix|add:'edit' id=obj.pk as url_edit %}
-                        {% url url_prefix|add:'copy' id=obj.pk as url_copy %}
-                        {% url url_prefix|add:'delete' id=obj.pk as url_delete %}
-                        {% url url_prefix|add:'email' id=obj.pk as url_email %}
-                        {% url url_prefix|add:'img' id=obj.pk as url_img %}
-                        {% url url_prefix|add:'pdf' id=obj.pk as url_pdf %}
-                        {% url url_prefix|add:'xls' id=obj.pk as url_xls %}
-
-                        {% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %}
-                        {% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %}
-                        {% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %}
-
-                        <tr id="doc_row_{{ obj.pk }}" class="doc-row {% cycle 'even' 'odd' %}" data-id="{{ obj.pk }}">
-                            {% block table_obj_cells %}
-                                <td class='clck'><a href="{{ url_img }}">{{ obj.doc_date|date:"d.m.Y" }}</a></td>
-                                <td class='clck'>{{ obj.doc_num }}</td>
-                                <td class='clck'>{{ obj.client.name }}</td>
-                                <td class='clck'>{{ obj.doc_sum|default:"---" }}</td>
-                            {% endblock %}
-
-                            {% block table_obj_cells_extra %}{% endblock %}
-                        </tr>
-                    {% endfor %}
-                </tbody>
-
-                {# важно! tfoot (также как и thead), нужен в js для показа/скрытия боковой панели #}
-                {# правильный colspan нужен для IE, иначе он игнорит footer #}
-                {% block table_footer %}
-                    <tfoot><tr><td colspan="6"></td></tr></tfoot>
-                {% endblock %}
-            </table>
-        {% endif %}
-    </div>
-
-    <div id="row_pointer" style="display: none; float: left;">
-        <img src="{{ STATIC_URL }}img/left-arrow.gif" />
-    </div>
-
-    <div class="list-col2">
-        {% for obj in page.object_list %}
-            {% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %}
-            {% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %}
-            {% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %}
-            <div id="doc_panel_{{ obj.pk }}" class="doc-panel hidden" style="" data-docname='{{ padeji.imenit }} №{{ obj.docnum }} от {{ obj.doc_date }}'>
-            {% include "docs/parts/doc_actions.html" %}
-                {% block panel_copy %}
-                    {% if template_create_docs%}
-                        {% include template_create_docs %}
-                    {% endif %}
-                {% endblock %}
-            {% include "docs/parts/doc_actions2nd.html" %}
+                    {% include "docs/parts/doc_actions2nd.html" %}
+                    </div>
+                {% endfor %}
+                <div class="filters">
+                    <div class="filters-header">
+                        <span>Фильтр списка</span>
+                    </div>
+
+                    <form id="filters_form" action="" method="post">
+                        {% csrf_token %}
+                        {{ filters.form.as_p }}
+                    </form>
+                </div>
             </div>
-        {% endfor %}
-        <div class="filters">
-            Фильтр списка
-            <hr />
-
-            <form id="filters_form" action="" method="post">
-                {% csrf_token %}
-                {{ filters.form.as_p }}
-            </form>
         </div>
-    </div>
 
-    <div class="clear"></div>
-
-    {% include 'paginator.html' with url_list=url_prefix|add:'list' %}
-{% else %}
-    <div class="clear"></div>
-    <p style="text-align: center; font-size: large;">
-        {% block no-docs-create-new %}
-            Вы ещё не создали ни одного {{ padeji.rodit }}. <a id="add-new" href="{{ url_add }}">Создать</a>.
-        {% endblock %}
-    </p>
-{% endif %}
-{% endif %}
+        <div class="clear"></div>
+
+    {% else %}
+        <div class="clear"></div>
+        <p style="text-align: center; font-size: large;">
+            {% block no-docs-create-new %}
+                Вы ещё не создали ни одного {{ padeji.rodit }}. <a id="add-new" href="{{ url_add }}">Создать</a>.
+            {% endblock %}
+        </p>
+    {% endif %}
+    {% endwith %}
+    {% endif %}
+</div>
 {% endblock %}
 
 {% block dialogs %}

project/templates/docs/_base/preview.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 <div class="clear"></div>
-{% block title %}Просмотр {{ padeji.rodit }}{% endblock %}
+{% block title %}Просмотр {{ padeji.rodit }} №{{ obj.doc_num }} от {{ obj.doc_date }}{% endblock %}
 
 <div class="clear"></div>
 {% block content %}
@@ -12,15 +12,16 @@
         <a class="back" href="{{ url_list }}">Вернуться к списку</a>
     </span>
 
-    <h2>Просмотр {{ padeji.rodit }}</h2>
+    <h2>{{ padeji.imenit | title}} № {{ obj.doc_num }} от {{ obj.doc_date }}</h2>
 
+<div class="preview-wrapper">
     <div class="preview">
     {% for img in images %}
         <img src='{{ img }}' alt='Страница {{ forloop.counter }}' title='Страница {{ forloop.counter }}' />
     {% endfor %}
     </div>
-    <div class="list-col2">
-        <div id="doc_panel_{{ obj.pk }}" class="doc-panel" style="" data-redirect='{{ url_list }}' data-docname='{{ padeji.imenit }} №{{ obj.docnum }} от {{ obj.doc_date }}'>
+    <div class="preview-col2">
+        <div id="doc_panel_{{ obj.pk }}" class="doc-panel" style="" data-redirect='{{ url_list }}' data-docname='{{ padeji.imenit }} №{{ obj.doc_num }} от {{ obj.doc_date }}'>
          {% include "docs/parts/doc_actions.html" %}
             {% block panel_copy %}
                 {% if template_create_docs %}
@@ -32,6 +33,7 @@
     </div>
     <div class="clear"></div>
 
+</div>
 {% endblock %}
 
 {% block dialogs %}

project/templates/docs/aktsverki/list.html

@@ -25,6 +25,8 @@
 {# важно! tfoot (также как и thead), нужен в js для показа/скрытия боковой панели #}
 {# правильный colspan нужен для IE, иначе он игнорит footer #}
 {% block table_footer %}
-    <tfoot><tr><td colspan="5"></td></tr></tfoot>
+    <tfoot><tr><td colspan="5">
+        {% include 'paginator.html' with url_list=url_prefix|add:'list' %}
+    </td></tr></tfoot>
 {% endblock %}
 

project/templates/docs/dover/list.html

@@ -28,7 +28,9 @@
 {# важно! tfoot (также как и thead), нужен в js для показа/скрытия боковой панели #}
 {# правильный colspan нужен для IE, иначе он игнорит footer #}
 {% block table_footer %}
-    <tfoot><tr><td colspan="5"></td></tr></tfoot>
+    <tfoot><tr><td colspan="5">
+        {% include 'paginator.html' with url_list=url_prefix|add:'list' %}
+    </td></tr></tfoot>
 {% endblock %}
 
 {% block no-docs-create-new %}

project/templates/docs/invoice/form.html

@@ -1,19 +1,17 @@
-{% extends "docs/_base/base_form.html" %}
-
+{% extends "docs/_base/base_form.html" %}
 {% load my_tags %}
-
 {% block form_content %}
-    <div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 15px 0; margin-top: 0;">
+    <div class="block">
         {% 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" %}
     </div>
 
-    <div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 5px 0;">
+    <div class="block">
         {% 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" %}
     </div>
 
-    <div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 15px 0;">
+    <div class="block">
         {% include 'docs/parts/form_field.html' with field=form.nds_value id="nds_value" classes="left" label="НДС" no_clear_after="True" %}
 
         {% if formset %}
@@ -22,7 +20,7 @@
         {% endif %}
     </div>
 
-    <div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 10px 0;">
+    <div class="block">
         {% include 'docs/parts/form_field.html' with field=form.doc_text id="doc_text" classes="field" label="Дополнительные условия" %}
     </div>
 {% endblock %}

project/templates/docs/invoice/list.html

@@ -1,12 +1,12 @@
 {% extends "docs/_base/base_list.html" %}
 
 {% block table_header_extra %}
-    <th>Оплачен?</th>
-    <th>Закрыт?</th>
+    <th><a href="?{{ ordering.order_var }}=paid_status&{{ ordering.order_type_var }}={% if ordering.order_field == 'paid_status' %}{% if ordering.order_type == 'asc' %}desc{% else %}asc{% endif %}{% else %}asc{% endif %}">Оплачен?{% if ordering.order_field == 'paid_status' %}{% if ordering.order_type == 'asc' %}{{ img_desc }}{% else %}{{ img_asc }}{% endif %}{% else %}{{ img_none }}{% endif %}</a></th>
+    <th><a href="?{{ ordering.order_var }}=closed_status&{{ ordering.order_type_var }}={% if ordering.order_field == 'closed_status' %}{% if ordering.order_type == 'asc' %}desc{% else %}asc{% endif %}{% else %}asc{% endif %}">Закрыт?{% if ordering.order_field == 'closed_status' %}{% if ordering.order_type == 'asc' %}{{ img_desc }}{% else %}{{ img_asc }}{% endif %}{% else %}{{ img_none }}{% endif %}</a></th>
 {% endblock %}
 
 {% block table_obj_cells_extra %}
-    <td><a href="#" class="toggle_doc_status doc_status{{ obj.paid_status }}" data-doctype="invoice" data-attr="paid_status">{{ obj.get_paid_status_display }}</a></td>
-    <td><a href="#" class="toggle_doc_status doc_status{{ obj.closed_status }}" data-doctype="invoice" data-attr="closed_status">{{ obj.get_closed_status_display }}</a></td>
+    <td class="center"><a href="#" class="toggle_doc_status doc_status{{ obj.paid_status }}" data-doctype="invoice" data-attr="paid_status">{{ obj.get_paid_status_display }}</a></td>
+    <td class="center"><a href="#" class="toggle_doc_status doc_status{{ obj.closed_status }}" data-doctype="invoice" data-attr="closed_status">{{ obj.get_closed_status_display }}</a></td>
 {% endblock %}
 

project/templates/docs/parts/doc_actions.html

@@ -8,26 +8,20 @@
             {% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %}
             {% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %}
 
-                <div style="font-size: 15px;">Скачать</div>
-
-                <hr />
+                <div class="doc-panel-header">Скачать документ</div>
 
                 {% if not images %}
                 <a class="doc pdf-link" href="{{ url_img }}">
-                    <img src="{{ STATIC_URL }}img/icon-pdf.gif" title="IMG" alt="Предпросмотр документа" />Предпросмотр {{ padeji.rodit }}</a><br />
-                <br />
+                    Предпросмотр {{ padeji.rodit }}</a>
                 {% endif %}
-                <a class="doc pdf-link" href="{{ url_pdf }}">
-                    <img src="{{ STATIC_URL }}img/icon-pdf.gif" title="PDF" alt="Документ в PDF" />Документ в PDF</a><br />
-                <br />
-                <a class="doc excel-link" href="{{ url_xls }}">
-                    <img src="{{ STATIC_URL }}img/icon-excel.gif" title="Excel" alt="Документ в Excel" />Документ в Excel</a><br />
-
-                <br />
-                <div style="font-size: 15px;">Создать</div>
+                <div class="clear"></div>
+                <a class="doc pdf-link left" href="{{ url_pdf }}">
+                    Документ в PDF</a>
+                <a class="doc excel-link left" href="{{ url_xls }}">
+                    Документ в Excel</a>
+                <div class="clear"></div>
 
-                <hr />
+                <div class="doc-panel-header">Создать</div>
 
-                    <a class="doc" href="{{ url_copy }}" title="Копию {{ padeji.rodit }}">Копию {{ padeji.rodit }}</a><br />
-                    <br />
+                    <a class="doc copy-link" href="{{ url_copy }}" title="Копию {{ padeji.rodit }}">Копию {{ padeji.rodit }}</a>
 

project/templates/docs/parts/doc_actions2nd.html

@@ -3,16 +3,13 @@
             {% url url_prefix|add:'delete' id=obj.pk as url_delete %}
             {% url url_prefix|add:'email' id=obj.pk as url_email %}
 
-                <hr />
-
                 <a class="doc email-link" href="{{ url_email }}">
-                    <img src="{{ STATIC_URL }}img/icon-email.gif" title="Отправить" alt="Отправить" />Отправить</a><br />
+                    Отправить по e-mail</a>
 
-                <br />
                 <a class="doc edit-link" href="{{ url_edit }}">
-                    <img src="{{ STATIC_URL }}img/icon-edit.gif" title="Редактировать" alt="Редактировать" />Редактировать</a><br />
+                    Редактировать документ</a>
 
-                <br />
                 <a class="doc delete-link" href="{{ url_delete }}">
-                    <img src="{{ STATIC_URL }}img/icon-delete.gif" title="Удалить" alt="Удалить" />Удалить</a><br />
+                    Удалить документ</a>
 
+                <div class="clear"></div>

project/templates/docs/parts/invoice_create_docs.html

@@ -1,28 +1,21 @@
 {% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %}
 {% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %}
 {% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %}
-<a href="{{ url_aktrabot_by_invoice }}" title="Акт по счёту"><b>Акт по счёту</b></a><br />
+<a href="{{ url_aktrabot_by_invoice }}" title="Акт по счёту" class="invoice-add-doc doc">Акт выполненных работ</a>
 {% if obj.docs_for_invoice.AktRabot %}
 {% for akt in obj.docs_for_invoice.AktRabot %}
-<a href="{% url 'docs_aktrabot_img' akt.id %}">{{ akt }}</a>
-<br />
+<a href="{% url 'docs_aktrabot_img' akt.id %}" class="doc">{{ akt }}</a>
 {% endfor %}
 {% endif %}
-<br />
-<br />
-<a href="{{ url_nakladn_by_invoice }}" title="Накладную"><b>Накладную</b></a><br />
+<a href="{{ url_nakladn_by_invoice }}" title="Накладную" class="doc invoice-add-doc ">Накладную</a>
 {% if obj.docs_for_invoice.Nakladn %}
 {% for nakladn in obj.docs_for_invoice.Nakladn %}
-<a href="{% url 'docs_nakladn_img' nakladn.id %}">{{ nakladn }}</a>
-<br />
+<a href="{% url 'docs_nakladn_img' nakladn.id %}" class="doc">{{ nakladn }}</a>
 {% endfor %}
 {% endif %}
-<br />
-<br />
-<a href="{{ url_faktura_by_invoice }}" title="Счёт-фактуру"><b>Счёт-фактуру</b></a> <br />
+<a href="{{ url_faktura_by_invoice }}" title="Счёт-фактуру" class="invoice-add-doc doc">Счёт-фактуру</a>
 {% if obj.docs_for_invoice.Faktura %}
 {% for faktura in obj.docs_for_invoice.Faktura %}
-<a href="{% url 'docs_faktura_img' faktura.id %}">{{ faktura }}</a>
-<br />
+<a href="{% url 'docs_faktura_img' faktura.id %}" class="doc">{{ faktura }}</a>
 {% endfor %}
 {% endif %}

project/templates/docs/platejka/list.html

@@ -27,7 +27,9 @@
 {# важно! tfoot (также как и thead), нужен в js для показа/скрытия боковой панели #}
 {# правильный colspan нужен для IE, иначе он игнорит footer #}
 {% block table_footer %}
-    <tfoot><tr><td colspan="5"></td></tr></tfoot>
+    <tfoot><tr><td colspan="5">
+        {% include 'paginator.html' with url_list=url_prefix|add:'list' %}
+    </td></tr></tfoot>
 {% endblock %}
 
 {% block panel_copy %}

project/templates/pages/index.html

@@ -66,7 +66,7 @@
             <p>Попробуйте!</p>
         </div>
         <div class='btn left'>
-            <a href='#'>
+            <a href='{% url 'myauth_register' %}'>
                 Начать пробный период!
             </a>
         </div>

project/templates/paginator.html

@@ -16,4 +16,5 @@
             Показывать {{ pagination_form.per_page }} {{ pagination_form.per_page.label }}
         </form>
     </div>
+    <div class="clear"></div>
 </div>