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..9ec7681 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%; @@ -72,25 +71,28 @@ body { .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;} -.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,20 +108,21 @@ 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;} @@ -128,8 +131,9 @@ body { .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;} +.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; font-stretch:narrower; } .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { @@ -273,6 +277,7 @@ ul.messagelist li.error { background-image: url(../img/icon-error.gif); } .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;} @@ -300,8 +305,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; } @@ -534,23 +539,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:'MyriadProCondensed', sans-serif;font-size:19px;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 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%;} 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/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/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/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/menu/menu.html b/project/templates/menu/menu.html index 1ef51a6..9de1ab4 100644 --- a/project/templates/menu/menu.html +++ b/project/templates/menu/menu.html @@ -12,7 +12,7 @@ {% url 'customer_clients_list' as customer_clients_list %} {% if user.is_anonymous %} -{% for child in children|slice:":3" %} +{% for child in children|slice:":4" %}
  • {{ child.get_menu_title }} {% if child.children %} @@ -29,6 +29,9 @@
  • АКТЫ ВЫПОЛНЕННЫХ РАБОТ
    • +
  • + НАКЛАДНЫЕ +
  • СЧЕТА-ФАКТУРЫ
    • @@ -37,7 +40,7 @@ Другие документы {% if user.is_anonymous %}