mitri4
/
dokumentor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged Air51/dokumentor.ru into master

Browse Source
remotes/origin/mitri4
Air51 9 years ago
parent 0e07c28cdb 56fbe842a4
commit 7ce20b1d12
8 changed files with 41 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 61
      project/static/css/style.css
  2. BIN
      project/static/img/icon-add.png
  3. BIN
      project/static/img/icon-directory.png
  4. 8
      project/templates/docs/aktrabot/form.html
  5. 3
      project/templates/docs/faktura/form.html
  6. 5
      project/templates/docs/invoice/form.html
  7. 6
      project/templates/docs/nakladn/form.html
  8. 2
      project/templates/docs/stub_js.html

61
project/static/css/style.css
Unescape View File

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

BIN
project/static/img/icon-add.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
project/static/img/icon-directory.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

8
project/templates/docs/aktrabot/form.html
Unescape View File

@ -1,4 +1,4 @@
{% extends "docs/_base/base_form.html" %}
{% extends "docs/_base/base_form.html" %}
{% load my_tags %}
@ -9,7 +9,7 @@
</div>
<div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 5px 0;">
{% 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="Создать акт по счёту" %}
</div>
@ -22,9 +22,7 @@
{% endif %}
</div>
<div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 10px 0;">
{% include 'docs/parts/form_field.html' with field=form.doc_text id="doc_text" classes="field" label="Дополнительные условия" %}
</div>
{% endblock %}
{% block js %}

3
project/templates/docs/faktura/form.html
Unescape View File

@ -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" %}
</div>
{% 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="Валюта" %}

5
project/templates/docs/invoice/form.html
Unescape View File

@ -3,10 +3,7 @@
{% block form_content %}
<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">
{% 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" %}
</div>

6
project/templates/docs/nakladn/form.html
Unescape View File

@ -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 %}
</div>
<div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 10px 0;">
{% include 'docs/parts/form_field.html' with field=form.doc_text id="doc_text" classes="field" label="Дополнительные условия" %}
</div>
{% endblock %}
{% block js %}

2
project/templates/docs/stub_js.html
Unescape View File

@ -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('');
})
});

Write Preview
Loading…
Cancel
Save