diff --git a/project/myauth/views.py b/project/myauth/views.py index e72581e..f208c7b 100644 --- a/project/myauth/views.py +++ b/project/myauth/views.py @@ -251,3 +251,10 @@ def logout(request): response = redirect('/') response.delete_cookie('close_message_license') return response + + +def rm_profile(request): + request.user.delete() + response = redirect('/') + response.delete_cookie('close_message_license') + return response diff --git a/project/static/css/style.css b/project/static/css/style.css index 6e9146e..be3435e 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -115,22 +115,22 @@ body { #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;} -.login-page {margin:64px auto;width:514px;padding:20px;background:#fff;box-shadow: 0 0 5px #ddd;} +.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 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;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: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 #profile_type.field ul {float:right;margin-top:15px;} -.auth-form #profile_type.field ul li label {width:300px;font-size:13px;line-height:20px;vertical-align:bottom;height:30px;text-align:left;} -.auth-form .field img {vertical-align:middle;} +.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="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#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;} -.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;text-transform:uppercase;} -.auth-form .captcha_refresh {display:inline-block;margin: 0 10px;width:24px;} +.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 .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;} @@ -362,7 +362,7 @@ ul { clear: both; list-style: none; margin: 0; padding: 0; } .add-row {margin-top:4px;} .edit-link a, .delete-link a { text-decoration: none; } -.doc-panel {background:#fff;} +.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.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;} @@ -506,6 +506,7 @@ a.delete { vertical-align: top; } table.list {border-collapse: collapse;border:#dedede 1px solid;border-bottom:none;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;} 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;} @@ -514,11 +515,13 @@ 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 {min-height:470px;} .filters p { margin: 15px 0 0; font-weight: bold; } .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;} +#filters_form {padding:10px 25px;overflow:hidden;} .pagination {margin-top: 5px; padding-top: 1ex; width: 99%; color:#646669;font-size:13px;} .pagination select {font-size:13px;} @@ -610,7 +613,7 @@ tr.doc-row:hover {cursor:pointer;} .license-ways .col {width:200px;} .license-ways .mr-5 {margin-right:5px;} .license-ways .col-last {width:185px;} -#cabinet-popup {display:none;position:absolute;top:0;right:0;z-index:99999;margin-top:60px;box-sizing:border-box;padding:20px 25px 25px 25px;width:300px;height:380px;background:url(../img/popup-cabinet.png) center center no-repeat;} +#cabinet-popup {display:none;position:absolute;top:0;left:50%;z-index:99999;margin-top:30px;margin-left:250px;box-sizing:border-box;padding:40px 25px 25px 25px;width:300px;height:410px;background:url(../img/popup-cabinet.png) center center no-repeat;} #cabinet-popup h2 {font-size:16px;border-bottom:1px solid #fed13e;padding:0;margin:10px 0;} .yellow_round {width:80px;height:80px;border-radius:40px;background:#fed13e;text-align:center;font-size:48px;font-weight:bold;line-height:80px;display:inline-block;} .grey {color:#7d8084;} diff --git a/project/static/js/commons.js b/project/static/js/commons.js index 2ceeada..304d944 100644 --- a/project/static/js/commons.js +++ b/project/static/js/commons.js @@ -45,12 +45,20 @@ $(document).ready(function() { var close_action = $(this).data('close'); $.cookie(close_action, true, {path: '/'}); }); + function show_overlay() { + if ($('.ui-widget-overlay.ui-front').length == 0 ) { + $('#cabinet-show').css({'z-index':'101'}); + $('body').append('
'); + } + } + function hide_overlay() { + $('.ui-widget-overlay.ui-front').remove(); + } function hide_popup() { setTimeout(function(){ - console.debug('popup', $('#cabinet-popup').data('hover')); - console.debug('link', $('#cabinet-show').data('hover')); if ($('#cabinet-popup').data('hover') + $('#cabinet-show').data('hover') == 0) { $('#cabinet-popup').hide(); + hide_overlay(); } else { $('#cabinet-popup').show(); } @@ -59,10 +67,12 @@ $(document).ready(function() { $('#cabinet-show').click(function(e){ e.preventDefault(); $('#cabinet-popup').show(); + show_overlay(); }); $('#cabinet-show').mouseover(function(e){ $(this).data('hover',1); $('#cabinet-popup').show(); + show_overlay(); }); $('#cabinet-popup').mouseover(function(e){ $(this).data('hover',1); diff --git a/project/static/js/docs/list.panels.js b/project/static/js/docs/list.panels.js index 7bfeff8..71c0303 100644 --- a/project/static/js/docs/list.panels.js +++ b/project/static/js/docs/list.panels.js @@ -37,6 +37,8 @@ $(document).ready(function() { row_pointer.show(); var panel = get_panel(row); + var table_height = $('.docs-content-wrapper').height(); + panel.css({height:table_height, 'overflow-y':'auto'}); $('.filters').hide(); panels.not(panel).hide(); panel.show(); diff --git a/project/static/js/license.js b/project/static/js/license.js index fa1084e..f6c8bf8 100644 --- a/project/static/js/license.js +++ b/project/static/js/license.js @@ -11,10 +11,10 @@ $(document).ready(function() { } } - show_month(); - $('[name="payform"]').change(function(){ - show_month() - }); + // show_month(); + // $('[name="payform"]').change(function(){ + // show_month() + // }); $('.delete_license').click(function(e){ e.preventDefault(); diff --git a/project/templates/base.html b/project/templates/base.html index 724ec46..1958194 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -71,21 +71,6 @@ {% endblock %} {% block content %}{% endblock %} -
| Номер | +Дата счёта | +Срок лицензии | +Сумма | +Вид платежа | +Статус | +Действия | +Отменить заявку | +
|---|---|---|---|---|---|---|---|
| {% if license.pay_sum > 0 %}{{ license.id }}{% else %}--{% endif %} | +{{ license.order_date }} | +{{ license.get_term }} | +{% if license.pay_sum > 0 %}{{ license.pay_sum|get_plural:"рубль,рубля,рублей" }}{% else %}Бесплатно{% endif %} | +{{ license.get_payform_display }} | +{{ license.get_status_display }} | +{{ license.get_action_link|safe }} | +{% if license.status == 0 %}Удалить{% endif %} | +
| Дата оплаты | +По счёту | +Сумма | +Срок лицензии | +Период действия лицензии | +Статус лицензии | +Закрывающие документы | +
|---|---|---|---|---|---|---|
| {{ license.paid_date|default:'-' }} | +{% if license.pay_sum %}{{ license.id }}{% else %}-{% endif %} | +{% if license.pay_sum %}{{ license.pay_sum }}{% else %}-{% endif %} | +{{ license.get_term }} | +{% if license.date_from %}{{ license.date_from }} - {{ license.date_to }}{% else %}-{% endif %} | +{{ license.get_status_display }} {{ license.get_paid_status|default:'' }} |
+ Разные документы | +
{{ form.non_field_errors }}
{% endif %} @@ -14,7 +14,6 @@{{ form.non_field_errors }}
{% endif %} -