diff --git a/diff_static.sh b/diff_static.sh new file mode 100755 index 0000000..2bd5de6 --- /dev/null +++ b/diff_static.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# diff production and development static folders + +ALL=$1 + +PROD_STATIC="_public_html/static" +DEV_STATIC="project/static" + +if [ "$ALL" = "--all" ]; then + EXCLUDE="" +else + EXCLUDE="-x cms -x admin -x admin_tools -x debug_toolbar -x tiny_mce -x filer -x autocomplete_light -x ckeditor + -x ckeditor_plugins -x cmsplugin_filer_folder -x djangocms_admin_style -x djangocms_text_ckeditor + -x cms.ckeditor.css -x cms.ckeditor.js" + echo "# exclude =" ${EXCLUDE} +fi + +diff -q -r ${EXCLUDE} ${PROD_STATIC} ${DEV_STATIC} diff --git a/project/settings.py b/project/settings.py index c29f337..a92263f 100644 --- a/project/settings.py +++ b/project/settings.py @@ -77,7 +77,7 @@ STATIC_ROOT = path('../_public_html/static') # URL prefix for static files. # Example: "http://example.com/static/", "http://static.example.com/" -STATIC_URL = '/static/' +STATIC_URL = '/s/' # Additional locations of static files STATICFILES_DIRS = ( @@ -274,10 +274,13 @@ CMS_PERMISSION = True BROKER_HOST = "localhost" BROKER_PORT = 5672 -BROKER_USER = "user" -BROKER_PASSWORD = "pass" -BROKER_VHOST = "dok" +BROKER_USER = "dokumentor" +BROKER_PASSWORD = "dokumentor" +BROKER_VHOST = "dokumentor" + CELERY_TIMEZONE = 'Europe/Moscow' +CELERY_ACCEPT_CONTENT = ['pickle'] # will be disabled in Celery 3.2 + ROBOKASSA_ADDR = 'http://test.robokassa.ru/' ROBOKASSA_LOGIN = 'test_shop123456' ROBOKASSA_PASSWORD1 = 'password123456' diff --git a/project/static/css/style.css b/project/static/css/style.css index cf7d729..54f4997 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -31,7 +31,6 @@ html { } body { font-family: Arial,Helvetica,sans-serif; - font-size: small; padding: 0; border: 0; height: 100%; @@ -47,7 +46,7 @@ body { } #bg-header {background:#fff;position:absolute;top:0;height:150px;width:100%;} #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%;} +#bg-index-promo {background:url(../img/index-promo-bg.jpg)#38424c;position:absolute;top:701px;height:200px;width:100%;} #body { height:auto; min-height:100%; @@ -65,32 +64,35 @@ 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;} +.content-white {width:1200px;background:#fff;box-shadow: 0 0 5px #ddd;padding:15px;box-sizing:border-box;margin-bottom:70px;} #header {height:100px;width:100%;position:relative;} #site_logo {font-family:"MyriadProRegular";display:block;overflow:hidden;margin-top:18px;} #site_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;} +.auth_block {margin-top:30px;font-size: 13px;} .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;} -.login {background: url(../img/login-yellow.png) no-repeat left center;} -.login_active {background: url(../img/login-black.png) no-repeat left center;} -.register {background: url(../img/register-yellow.png) no-repeat left center;} -.register_active {background: url(../img/register-black.png) no-repeat left center;} - -.index-banner-text {height:551px;width:800px;color:#fff;font-size:24px;font-family:"MyriadProRegular";position:relative;overflow:hidden;} +.login {background: url(../img/login.png) no-repeat 9px center;} +.login:hover {background: url(../img/login-black.png) no-repeat 9px center;} +.login_active {background: url(../img/login-black.png) no-repeat 9px center;} +.register {background: url(../img/register.png) no-repeat 9px center;} +.register:hover {background: url(../img/register-black.png) no-repeat 9px center;} +.register_active {background: url(../img/register-black.png) no-repeat 9px center;} + +.index-banner-text {height:551px;width:800px;color:#fff;font-size:24px;font-family:"MyriadProRegular";position:relative;overflow:hidden;text-shadow:#000 0 0 6px;} .index-banner-text h1 {font-size:48px;} -.index-banner-btn {width:800px;display:table;} +.index-banner-btn {width:800px;display:table;text-shadow: none;} .index-register, .index-banner-btn p {display:table-cell;vertical-align:middle;padding:10px;} -.index-banner-btn p {width:440px;font-size:16px;background:#272b31;} -.index-register {font-size:22px;text-decoration:none;text-transform:uppercase;color:#4e5661;background:#fed13e;text-align:center;} +.index-banner-btn p {width:440px;font-size:16px;background:#f0f0f0;color:#4e5661;} +.index-register {font-size:28px;text-decoration:none;text-transform:uppercase;color:#4e5661;background:#fed13e;text-align:center;font-family:'MyriadProCondensed';} +.index-register:hover {font-size:28px;text-decoration:none;text-transform:uppercase;color:#4e5661;background:#ffca3e;text-align:center;font-family:'MyriadProCondensed';} .index-promo {height:200px;width:100%;position:relative;display:table-cell;vertical-align:middle;} .index-promo .round {height:116px;width:116px;position:relative;border-radius:59px;float:left;margin-right:10px;} .index-promo .round1 {background:#fed13e url(../img/index-promo-1.png) no-repeat center center;} .index-promo .round2 {background:#fed13e url(../img/index-promo-2.png) no-repeat center center;} .index-promo .round3 {background:#fed13e url(../img/index-promo-3.png) no-repeat center center;} -.index-promo-text {float:left;overflow:hidden;width:390px;font-family:"MyriadPro-Light"} -.index-promo-text h2 {text-transform:uppercase;color:#fed13e;font-size:33px;margin:5px 0;} +.index-promo-text {float:left;overflow:hidden;width:390px;font-family:"MyriadPro-Light";} +.index-promo-text h2 {text-transform:uppercase;color:#fed13e;font-size:33px;margin:5px 0;font-family: "MyriadPro-Light";} .index-promo-text .text {width:250px;} .index-promo-text .text p {color:#fff;margin:5px 0;font-size:18px;} @@ -106,30 +108,32 @@ body { .extended-block-more .text p {margin:0;} .extended-triangle {background: url(../img/triangle.png) no-repeat center center;width:26px;height:29px;position:relative;left:574px;top:40px;} -#index-yellow-banner {background:#fed13e;height:190px;width:100%;position:absolute;bottom:100px;z-index:5;} +#index-yellow-banner {background:url(../img/index-yellow-bg.jpg)#fed13e;height:190px;width:100%;position:absolute;bottom:100px;z-index:5;} #index-yellow-banner .w1200{height:100%;} -#index-yellow-banner .lamp {background:url(../img/lamp.png) no-repeat center center;height:190px;width:160px;} -#index-yellow-banner .text {width:640px;} -#index-yellow-banner .text a {font-size:30px;margin:0;font-family:"MyriadProRegular";display:inline-block;margin:25px 0 18px 0;} -#index-yellow-banner .text p {margin:0;font-size:15px;font-family:"MyriadProRegular";} -#index-yellow-banner .btn {width:400px;height:75px;margin-top:57px;} -#index-yellow-banner .btn a {width:400px;height:75px;background:#313942;display:table-cell;vertical-align:middle;text-align:center;text-transform:uppercase;text-decoration:none;color:#fff;font-size:22px;} +#index-yellow-banner .lamp {background:url(../img/lamp.png) no-repeat center center;height:180px;width:160px;} +#index-yellow-banner .text {width:640px; margin-top: 10px;} +#index-yellow-banner .text a {font-size:24px;margin:0;font-family:"MyriadProRegular";display:inline-block;margin:25px 0 18px 0;color:#313942;text-decoration: none;} +#index-yellow-banner .text p {margin:0;font-size:15px;font-family:"Arial" sans-serif;color:#313942;} +#index-yellow-banner .btn {font-family:"MyriadProCondensed";width:400px;height:75px;margin-top:57px;font-weight:normal;} +#index-yellow-banner .btn a {width:400px;height:75px;background:#313942;display:table-cell;vertical-align:middle;text-align:center;text-transform:uppercase;text-decoration:none;color:#fff;font-size:28px;} +#index-yellow-banner .btn a:hover {width:400px;height:75px;background:#232e39;border:solid 3px #fff;display:table-cell;vertical-align:middle;text-align:center;text-transform:uppercase;text-decoration:none;color:#fff;font-size:28px;} .center-form-page {margin:64px auto;width:514px;padding:20px;background:#fff;box-shadow: 0 0 5px #ddd;} -.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 {width:300px;height:100px;background:url(../img/black_arrow.png) no-repeat center center;position:absolute;left:50%;top:335px;margin-left:300px;color:#fff;padding: 20px 0 0 0;font-style:italic;text-align:center;font-size:16px;} .register-arrow p {margin:5px;} -.center-form .field input[type="text"], .center-form .field input[type="email"], .center-form .field input[type="password"]{width:300px;vertical-align:bottom;height:50px;margin-top:32px;font-size: 46px;line-height:46px;} +.center-form .field input[type="text"], .center-form .field input[type="email"], .center-form .field input[type="password"]{color: #959595;width:300px;vertical-align:bottom;height:40px;margin-top:32px;font-size:26px;} .center-form .field input[type="checkbox"] {height:20px;width:20px;vertical-align:middle;height:50px;} .center-form .field#captcha input[type="text"] {width:130px;height:50px;} -.center-form .field label {display:inline-block;width:190px;text-align:right;line-height:50px;padding-right:5px;vertical-align:middle;} +.center-form .field label {display:inline-block;width:190px;text-align:right;line-height:50px;padding-right:5px;vertical-align:middle; font-size: 16px;} .center-form .field#profile_type label {width:200px;vertical-align:middle;height:50px;} .center-form #profile_type.field ul {float:right;margin-top:15px;} .center-form #profile_type.field ul li label {width:300px;font-size:13px;line-height:20px;vertical-align:bottom;height:30px;text-align:left;} .center-form .field img {vertical-align:middle;} -.center-form .buttons {text-align:center;margin-top:45px;} -.center-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;} +.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 .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;} @@ -223,7 +227,7 @@ a img { outline: none; border: 0; } h1, h2, h3 { line-height: normal; } h1 {font-family:"Arial Narrow", Arial, sans-serif;font-size:30px;font-weight:normal;font-stretch:condensed;} -h2 {font-weight: normal;font-size:24px;} +h2 {font-weight: normal;font-size:24px;font-family:"Arial Narrow", Arial, sans-serif;} .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { @@ -236,9 +240,10 @@ h2 {font-weight: normal;font-size:24px;} background:none!important; border:0; } -.ui-dialog .ui-dialog-content {font-size:14px;} +.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-state-default .ui-icon {background:url(../img/close.png) no-repeat center center;} +.ui-state-default .ui-icon { background: url(../img/close.png) no-repeat top;opacity: 0.5;} +.ui-state-default .ui-icon:hover { background: url(../img/close.png) no-repeat top;opacity: 1;} .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;} @@ -265,14 +270,16 @@ 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 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;} - +.ui-dialog .cancel_btn span:hover {width:215px;display:table-cell;vertical-align:middle;text-align:center;text-decoration:none;font-size:14px;color:#498dd0;font-weight:normal;} .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: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 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;} @@ -285,9 +292,10 @@ ul.messagelist li.error { background-image: url(../img/icon-error.gif); } .help-text { font-size: 8pt; color: #666666; display:block;padding:10px;} + form { font-size: small; padding: 0; margin: 0; } -form label {font-style:italic;font-size:16px;} -.label {width:120px;text-align:right;font-size:14px;color:#646669;line-height:30px;} +form label {font-style:italic;} +.label {width:120px;text-align:right;font-size:13px;color:#646669;line-height:30px;font-family:'Arial';} .form-field: {width:210px;} input, select, textarea { font-family: Arial,Helvetica,sans-serif;background:#f8f8f8;} @@ -300,8 +308,8 @@ fieldset { } textarea { width: 99%; } -input[type=text], input[type=number], input[type=email], input[type=password], select, textarea { border: 2px inset #d8d8d8; } -input[type=text], input[type=number], input[type=email], input[type=password], textarea, option { padding-left: 2px; margin-left: 2px; } +input[type=text], input[type=number], input[type=email], input[type=password], select, textarea { border: 1px inset #d8d8d8; } +input[type=text], input[type=number], input[type=email], input[type=password], textarea, option { padding-left: 10px; margin-left: 2px; } .long-input input { width: 350px; } @@ -319,26 +327,28 @@ input[type=text], input[type=number], input[type=email], input[type=password], t padding-right: 2px; margin-left: 2px; width: 200px; - font-size: 20px; + font-family:'Arial'; line-height:20px; } -.client-form .bank-header {color:#646669;font-weight:bold;text-align:center;margin:15px 0;} +.client-form .bank-header {color: #646669;margin: 15px 0;font-family: Arial;font-size: 16px;font-style: italic;} /*.client-form .buttons { padding: 10px 0 6px 33px; }*/ -.profile-table {width:100%;overflow:hidden;border-collapse: separate; display:table;border-spacing:15px;background:url(../img/darker-bg.png);margin-bottom:85px;} +.profile-table {width:100%;overflow:hidden;border-collapse: separate; display:table;border-spacing:15px;margin-bottom:85px;} .profile-row {display:table-row;} .profile-col1 {width: 785px;margin-right:15px;} .profile-col2 {width: 370px;} .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;} +#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 .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;} -.reqs_btns .yellow-btn.printer {background:#fed13e url(../img/printer.png) no-repeat 15px center;} +.reqs_btns .yellow-btn {color:#4e5661;cursor: pointer;} +.reqs_btns .black-btn {color:#fff; margin-left:15px;cursor: pointer;} +.reqs_btns .black-btn.envelope {background:#38424c url(../img/envelope.png) no-repeat 15px center;cursor: pointer;} +.reqs_btns .black-btn.envelope:hover {background:#232e39 url(../img/envelope.png) no-repeat 15px center;cursor: pointer;} +.reqs_btns .yellow-btn.printer {background:#fed13e url(../img/printer.png) no-repeat 15px center;cursor: pointer;} +.reqs_btns .yellow-btn.printer:hover {background:#ffca3e url(../img/printer.png) no-repeat 15px center;cursor: pointer;} .info-bar { background-color: #f7f7f7; font-size: 11px; padding:10px 15px; font-size:16px;} #profile, .profile-filters-form {padding:15px;} @@ -346,7 +356,8 @@ input[type=text], input[type=number], input[type=email], input[type=password], t #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;} +.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;} .has-datepicker { background: url(../img/icon-calendar.png) no-repeat scroll right 5px center #f8f8f8; } @@ -357,13 +368,15 @@ 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 left;padding:5px 0 5px 26px;line-height:22px;display:inline-block;} -.add-link {margin-left:10px;} +.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 {margin-top:4px;} .edit-link a, .delete-link a { text-decoration: none; } .doc-panel {background:#fff;min-height:470px;overflow-y:scroll;} .doc-panel a.doc {display:block;margin: 13px 0 13px 20px;height:40px;padding-left:43px;line-height:40px;:} +.doc-panel a.doc:hover {text-decoration:none;} +.doc-panel a.look-link {background:url(../img/sign-look.png)left center no-repeat;} .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;} @@ -464,13 +477,16 @@ a.delete { vertical-align: top; } .doc-form table.doc-list.dover td.qty input[type=text] { width: 96px; } .doc-form table.doc-list.dover td.units input[type=text] { width: 96px; } -.doc-form .buttons input[name=submit] {padding:10px 40px 10px 75px;background:url(../img/save.png) no-repeat left 30px center #fed13e;color:#4e5661;font-weight:normal;font-family:"Arial Narrow", Arial, sans-serif;} - -.doc-email-form input#id_to { width: 99% } -.doc-email-form textarea { width: 99%; margin-left: 2px; } +.doc-form .buttons input[name=submit] {cursor:pointer;padding:10px 40px 10px 75px;background:url(../img/save.png) no-repeat left 30px center #fed13e;color:#4e5661;font-weight:normal;font-family:"Arial Narrow", Arial, sans-serif;} +.doc-form .buttons input[name=submit]:hover {padding:10px 40px 10px 75px;background:url(../img/save.png) no-repeat left 30px center #ffca3e;color:#4e5661;font-weight:normal;font-family:"Arial Narrow", Arial, sans-serif;} +#add-new {text-decoration: none;text-transform: uppercase;font-size: 22px;padding:10px 40px 10px 75px;background:url(../img/add-new.png) no-repeat left 30px center #fed13e;color:#4e5661;font-weight:normal;font-family:"Arial Narrow", Arial, sans-serif;} +#add-new:hover {text-decoration: none;text-transform: uppercase;font-size: 22px;padding:10px 40px 10px 75px;background:url(../img/add-new.png) no-repeat left 30px center #ffca3e;color:#4e5661;font-weight:normal;font-family:"Arial Narrow", Arial, sans-serif;} +.doc-email-form input#id_to { width: 100%;margin-bottom: 10px;font-family: Arial; } +.doc-email-form textarea { width: 100%; margin-left: 2px;font-family: Arial; } .doc-email-form #doc_format ul li { display: inline; } -.delete-row {display:inline-block;width:21px;height:21px;background:url(../img/close.png) no-repeat center center;} +.delete-row {display:inline-block;width:21px;height:21px;background:url(../img/close.png) no-repeat center center;opacity:0.5;} +.delete-row:hover {display:inline-block;width:21px;height:21px;background:url(../img/close.png) no-repeat center center;opacity:1;} .filters #id_client, .filters #id_invoice { width: 99%; } @@ -501,9 +517,9 @@ a.delete { vertical-align: top; } .errors-layout ul { list-style: none; margin-bottom: 10px; padding: 5px 10px; border: 1px solid red; } -.docs-content-wrapper {border:#dedede 1px solid;border-bottom:none;overflow: hidden;position:relative;} +.docs-content-wrapper {border:#dedede 1px solid;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 {border-collapse: collapse;border:#dedede 1px solid;width: 100%;} .docs-content-wrapper table.list tr.doc-row {height:50px;} table.list tr:nth-child(odd) {background: #f7f7f7;} table.list tr:nth-child(even) {background: #fff;} @@ -519,6 +535,8 @@ table.list tr td {font-size:14px;color:#313942;padding:7px;word-break: break-all .filters {min-height:470px;} .filters p { margin: 15px 0 0; font-weight: bold; } .filters ul { padding: 10px 0 10px 20px;} +.filters ul li {margin-bottom:5px;} +.filters ul li a:hover{text-decoration:none;} .filters ul li a.selected { color:#646669;text-decoration:none;} .filters select {font-size:13px;margin-left:20px;} #filters_form {padding:10px 25px;overflow:hidden;} @@ -534,23 +552,26 @@ div.blockMsg { width: 100%; height: 100%; top: 0; left: 0; text-align: center; } .w200 {width:200px;min-height:5px;} .header {font-weight:bold;} -#footer {background:#38424c;height:100px;position: absolute; bottom: 0px; width:100%;} +#footer {background:url('../img/footer-bg.jpg')#38424c;height:100px;position: absolute; bottom: 0px; width:100%;} #footer-content {width:1200px;margin:0 auto;} -#footer-content a {margin-right: 150px;} +#footer-content a {margin-right: 15px;text-decoration: none;color:#607c99;} .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-right:solid 1px #272b31;border-left: solid 1px #434a52} -#menu ul li.yellow {background:#fed13e;} +#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.yellow {background:#fed13e;width: 197px;} +#menu ul li.yellow:hover {background:#ffca3e;} #menu ul li.yellow a, #menu ul li.yellow span {color:#313942;} +#menu ul li.yellow a:hover, #menu ul li.yellow span:hover {color:#313942;} #menu ul li.yellow.selected {background:url('../img/menu-selected2.png') #fed13e no-repeat bottom center;} #menu ul li.yellow.selected a {color:#313942;} #menu ul li a, #menu ul li span {text-decoration:none;padding:0 25px;} #menu ul li a {color:#fff;} +#menu ul li a:hover {color:#fed13e;} #menu ul li span{color:#fed13e;} -#menu ul li.selected{background:url('../img/menu-selected.png') #313942 no-repeat bottom center; } +#menu .other_docs_menu ul li.selected{background:url('../img/menu-selected.png') #313942 no-repeat bottom center; } #menu ul li.selected a{color:#fed13e;} -#menu .other_docs_menu {position:absolute;top:50px;z-index:50;border:1px #51575f solid;} +#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%;} @@ -572,30 +593,33 @@ tr.doc-row:hover {cursor:pointer;} #req-avail-form {display:none;} .close-message {display:inline-block;float:right;} .profile_title {font-size:16px;height:33px;width:790px;border-bottom:solid 1px #fed13e;margin: 10px 0 25px 0;} -.profile_label {float:left;width:285px;font-size:14px;height:36px;line-height:36px;} +.profile_label {float:left;width:285px;font-size:13px;height:36px;line-height:36px;color: #797979;} .profile_field {float:left;width:500px;} .profile_field input[type=text], .profile_field input[type=email], .profile_field input[type=number], .profile_field input[type=password], .profile_field textarea, .profile_field option {padding-left:2px;margin-left:0;height:36px;font-size:14px;} .profile_field.long-input input { width: 100%; } .profile_field input { width: 300px; } .profile-form .field {margin: 0 0 15px 0;} -.profile-form .help-text {margin: 0; padding:0 0 0 5px;color:#c5c5c5;} +.profile-form .help-text {margin: 0; padding:1px 0 0 1px;color:#c5c5c5;} -#id_boss_surname, #id_boss_name, #id_boss_midname, #id_glavbuh_surname, #id_glavbuh_name, #id_glavbuh_midname{width:157px;} -#boss_sign, #glavbuh_sign {width:159px;height:65px;float:left;overflow:hidden;} +#id_boss_surname, #id_boss_name, #id_boss_midname, #id_glavbuh_surname, #id_glavbuh_name, #id_glavbuh_midname{ width: 159px;padding-right: 1px;} +#boss_sign, #glavbuh_sign {width:170px;height:65px;float:left;overflow:hidden;cursor: pointer;} #glavbuh_sign {margin-left:30px;} -#stamp .profile_field {width:180px;height:180px;} -#logo .profile_field {width:351px;height:121px;} +#stamp .profile_field {width:170px;height:170px;cursor: pointer;} +#logo .profile_field { width: 170px;height: 170px;margin-left: 30px;cursor: pointer;} .del_image {display:block;width:27px;height:20px;background:url(../img/icon-delete.png)7px center no-repeat;position:absolute;top:0;right:0;} .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;font-weight:bold;padding:25px;border:none;} -.profile_btns .yellow-btn.save {background:#fed13e url(../img/save.png) no-repeat 25px center;padding:25px 15px 25px 60px;} +.profile_btns input {display:inline;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;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;} #blackbox {width:350px;position:absolute;top:60px;right:20px;} #blackbox .bb-text {width:320px;background:#272b31;padding:20px;color:#fff;font-style:italic;line-height:1.7;} #blackbox .bb-triangle {background: url(../img/triangle2.png) no-repeat center center;width:11px;height:25px;position:absolute;left:-8px;top:16px;} #blackbox p {margin:0;padding:0;} #blackbox a {color:#fff;font-weight:bold;margin: 10px 0 0 0; display:block;} +#blackbox a:hover {color:#fff;font-weight:bold;margin: 10px 0 0 0; display:block;text-decoration:none;} .license_label {float:left;width:130px;font-size:14px;height:36px;line-height:36px;} .license_field {float:left;width:380px;} diff --git a/project/static/favicon.ico b/project/static/favicon.ico new file mode 100644 index 0000000..4b71be9 Binary files /dev/null and b/project/static/favicon.ico differ diff --git a/project/static/img/add-new.png b/project/static/img/add-new.png new file mode 100644 index 0000000..d70e616 Binary files /dev/null and b/project/static/img/add-new.png differ diff --git a/project/static/img/footer-bg.jpg b/project/static/img/footer-bg.jpg new file mode 100644 index 0000000..13d46d0 Binary files /dev/null and b/project/static/img/footer-bg.jpg differ diff --git a/project/static/img/icon-add.png b/project/static/img/icon-add.png index 0766184..ab80a27 100644 Binary files a/project/static/img/icon-add.png and b/project/static/img/icon-add.png differ diff --git a/project/static/img/index-banner.png b/project/static/img/index-banner.png index 9d8ca5c..819fa87 100644 Binary files a/project/static/img/index-banner.png and b/project/static/img/index-banner.png differ diff --git a/project/static/img/index-promo-1.png b/project/static/img/index-promo-1.png index 4a4658d..8d1d037 100644 Binary files a/project/static/img/index-promo-1.png and b/project/static/img/index-promo-1.png differ diff --git a/project/static/img/index-promo-2.png b/project/static/img/index-promo-2.png index 87b18e2..246b39e 100644 Binary files a/project/static/img/index-promo-2.png and b/project/static/img/index-promo-2.png differ diff --git a/project/static/img/index-promo-3.png b/project/static/img/index-promo-3.png index 5fd1239..89d354e 100644 Binary files a/project/static/img/index-promo-3.png and b/project/static/img/index-promo-3.png differ diff --git a/project/static/img/index-promo-bg.jpg b/project/static/img/index-promo-bg.jpg new file mode 100644 index 0000000..55a6b12 Binary files /dev/null and b/project/static/img/index-promo-bg.jpg differ diff --git a/project/static/img/index-yellow-bg.jpg b/project/static/img/index-yellow-bg.jpg new file mode 100644 index 0000000..9472d0f Binary files /dev/null and b/project/static/img/index-yellow-bg.jpg differ diff --git a/project/static/img/lamp.png b/project/static/img/lamp.png index 0e2ba4b..10e6741 100644 Binary files a/project/static/img/lamp.png and b/project/static/img/lamp.png differ diff --git a/project/static/img/login.png b/project/static/img/login.png new file mode 100644 index 0000000..3569579 Binary files /dev/null and b/project/static/img/login.png differ diff --git a/project/static/img/register-black.png b/project/static/img/register-black.png index dfd1a0f..583d368 100644 Binary files a/project/static/img/register-black.png and b/project/static/img/register-black.png differ diff --git a/project/static/img/register.png b/project/static/img/register.png new file mode 100644 index 0000000..e4304e2 Binary files /dev/null and b/project/static/img/register.png differ diff --git a/project/static/img/sign-edit.png b/project/static/img/sign-edit.png index 65a2c50..4661b0e 100644 Binary files a/project/static/img/sign-edit.png and b/project/static/img/sign-edit.png differ diff --git a/project/static/img/sign-look.png b/project/static/img/sign-look.png new file mode 100644 index 0000000..0119d2a Binary files /dev/null and b/project/static/img/sign-look.png differ diff --git a/project/static/img/upload-boss_sign.png b/project/static/img/upload-boss_sign.png index 9289651..533c08a 100644 Binary files a/project/static/img/upload-boss_sign.png and b/project/static/img/upload-boss_sign.png differ diff --git a/project/static/img/upload-glavbuh_sign.png b/project/static/img/upload-glavbuh_sign.png index 9289651..533c08a 100644 Binary files a/project/static/img/upload-glavbuh_sign.png and b/project/static/img/upload-glavbuh_sign.png differ diff --git a/project/static/img/upload-logo.png b/project/static/img/upload-logo.png index 70797a4..2d85bc0 100644 Binary files a/project/static/img/upload-logo.png and b/project/static/img/upload-logo.png differ diff --git a/project/static/img/upload-stamp.png b/project/static/img/upload-stamp.png index 52c9ad5..2d85bc0 100644 Binary files a/project/static/img/upload-stamp.png and b/project/static/img/upload-stamp.png differ diff --git a/project/templates/base.html b/project/templates/base.html index 9042517..2ad3320 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -74,9 +74,9 @@ diff --git a/project/templates/customer/bank_accounts/list.html b/project/templates/customer/bank_accounts/list.html index afac50a..2cf970b 100644 --- a/project/templates/customer/bank_accounts/list.html +++ b/project/templates/customer/bank_accounts/list.html @@ -44,11 +44,13 @@ {% endfor %} + {% include 'paginator.html' with url_list='customer_bank_accounts_list' %} {% endif %} {% endblock %} +
{% block js %} diff --git a/project/templates/customer/clients/add.html b/project/templates/customer/clients/add.html index f709404..d844fd2 100644 --- a/project/templates/customer/clients/add.html +++ b/project/templates/customer/clients/add.html @@ -10,4 +10,5 @@

Добавить контрагента

{% include "customer/clients/form.html" %} + {% endblock %} diff --git a/project/templates/customer/clients/form.html b/project/templates/customer/clients/form.html index 9edecfa..9f72918 100644 --- a/project/templates/customer/clients/form.html +++ b/project/templates/customer/clients/form.html @@ -1,4 +1,4 @@ -{% load my_tags %} +{% load my_tags %}
{% if not is_ajax %} @@ -206,4 +206,5 @@ {% endif %}
+ diff --git a/project/templates/customer/profile/edit.html b/project/templates/customer/profile/edit.html index 493609f..10e822f 100644 --- a/project/templates/customer/profile/edit.html +++ b/project/templates/customer/profile/edit.html @@ -167,7 +167,7 @@
{{ form.boss_surname }} {{ form.boss_name }} {{ form.boss_midname }} - Используется для строки "подпись" в документах. + Используется для строки "Подпись" в документах. {{ form.boss_surname.errors }} {{ form.boss_name.errors }} {{ form.boss_midname.errors }}
@@ -223,7 +223,7 @@ в {{ account.name }} - + [X] @@ -245,7 +245,7 @@ в нет - + [X] @@ -366,26 +366,27 @@ {% if form.boss_sign.value %} {# если уже есть картинка, показать ее #} {% else %} - + {% endif %} {{ form.boss_sign.errors }} +

Подпись руководителя

{% if form.glavbuh_sign.value %} {# если уже есть картинка, показать ее #} {% else %} - + {% endif %} - Подпись бухгалтера. + {{ form.glavbuh_sign.errors }}
+

Подпись бухгалтера