diff --git a/apps/accounts/urls.py b/apps/accounts/urls.py index 5a163ee7..8f2a78f8 100644 --- a/apps/accounts/urls.py +++ b/apps/accounts/urls.py @@ -21,7 +21,7 @@ from views import ( urlpatterns = patterns('', url(r'^profile/company/$', login_required(ProfileCompanyView.as_view())), - url(r'^profile/mailing/$', login_required(MailingSettings.as_view()), name='accounts-mailing_settings'), + url(r'^profile/mailing/$', MailingSettings.as_view(), name='accounts-mailing_settings'), url(r'^profile/settings/$', login_required(SettingsView.as_view()), name='accounts_settings'), url(r'^profile/calendar/remove/$', 'accounts.views.remove_from_calendar'), url(r'^profile/calendar/export/$', 'core.views.download_workbook'), diff --git a/static/mailing_settings/css/form.css b/static/mailing_settings/css/form.css deleted file mode 100644 index 2112e99a..00000000 --- a/static/mailing_settings/css/form.css +++ /dev/null @@ -1,652 +0,0 @@ -.themes_block h2, -.subjects_block h2, -.period_block h2 { - font-size: 30px; - font-weight: 400; - text-align: center; - margin-bottom: 50px; -} - -.themes_block, -.period_block{ - background-color: #fbfbfb; - border-top: 1px solid #ebebeb; - border-bottom: 1px solid #ebebeb; - padding-top: 50px; -} - -.themes_block{ - padding-bottom: 55px; -} - -.themes_block h3 { - margin-bottom: 30px; -} - -.subjects_block{ - padding: 50px 0; -} - -.page_footer{ - border-top: 1px solid #ebebeb; - border-bottom: 1px solid #ebebeb; - text-align: center; - line-height: 40px; - font-size: 16px; - color: #999; -} - -.columns{ - font-size: 0; - width: 1045px; - margin: 0 auto; -} - -.columns .column{ - display: inline-block; -} - -.themes_block .column{ - display: inline-block; - width: 50%; - vertical-align: top; -} - -.geo_filters{ - list-style: none; - background-color: #fff; - border: 1px solid #ebebeb; - border-radius: 3px; - padding: 30px; - font-size: 16px; -} - -.geo_filters > li + li{ - margin-top: 34px; -} - -.geo_filters .modal_trigger{ - font-size: 16px; - color: #333; - text-decoration: none; - display: inline-block; - border-bottom: 1px dashed #333; - margin-left: 40px; -} - -.geo_filters .modal_trigger:hover{ - border-bottom-color: transparent; -} - -.geo_filters input{ - display: none; -} - -.geo_filters .moscow{ - /*color: #49d026;*/ - color: #ccc; -} - -.geo_filters .moscow:hover, -.geo_filters input:checked + .moscow{ - border-color: #49d026; - box-shadow: 0 0 0 2px #49d026; - cursor: pointer; - color: #49d026; -} - -.geo_filters .rf{ - /*color: #ff6600;*/ - color: #ccc; -} - -.geo_filters .rf:hover, -.geo_filters input:checked + .rf{ - border-color: #ff6600; - box-shadow: 0 0 0 2px #ff6600; - cursor: pointer; - color: #ff6600; -} - -.geo_filters .foreign{ - /*color: #0099ff;*/ - color: #ccc; -} - -.geo_filters .foreign:hover, -.geo_filters input:checked + .foreign{ - border-color: #0099ff; - box-shadow: 0 0 0 2px #0099ff; - cursor: pointer; - color: #0099ff; -} - -.geo_filters input + .label{ - display: inline-block; - width: 283px; - padding: 6px 15px; - border: 1px solid #ebebeb; - font-size: 20px; - border-radius: 3px; -} - -.geo_filters input + .label + .geo_checkbox{ - display: inline-block; - height: 24px; - vertical-align: middle; - margin-left: 20px; - position: relative; -} - -.geo_filters input + .label + .geo_checkbox:before{ - content: ""; - display: inline-block; - width: 22px; - height: 22px; - border-radius: 50%; - border: 1px solid #e0e0e0; - position: absolute; - top: 0; - left:0; - transition: border-color .3s; -} - -.geo_filters input + .label + .geo_checkbox:after{ - content: ''; - display: block; - width: 23px; - height: 22px; - background: url(../images/checkbox.png); - position: absolute; - top: 1px; - left: 0; - opacity: 0; - transition: opacity .3s; -} - -.geo_filters input:checked + .label + .geo_checkbox:before{ - border-color: #FF6600; - transition: border-color .3s; -} - -.geo_filters input:checked + .label + .geo_checkbox:after{ - opacity: 1; - transition: opacity .3s; -} - -.geo_filters .selected{ - padding-top: 20px; - width: 285px; -} - -.subjects_block .column{ - vertical-align: top; - width: calc(100%/3); - font-size: 16px; -} - -.subjects_block p{ - color: #999999; - font-weight: 100; - padding: 0 40px; - font-size: 16px; -} - -.subjects_block input, -.periodic input, -.mailing_day input{ - display: none; -} - -.subjects_block input + label, -.periodic input + .radio{ - position: relative; - padding-left: 40px; - cursor: pointer; - font-size: 18px; -} - -.subjects_block input + label:before, -.periodic input + .radio:before, -.mailing_day input + .radio:before{ - content: ""; - display: inline-block; - width: 22px; - height: 22px; - border-radius: 50%; - border: 1px solid #e0e0e0; - position: absolute; - top: 0; - left:0; - transition: border-color .3s; -} - -.subjects_block input + label:after, -.periodic input + .radio:after, -.mailing_day input + .radio:after{ - content: ''; - display: block; - width: 23px; - height: 22px; - background: url(../images/checkbox.png); - position: absolute; - top: 1px; - left: 0; - opacity: 0; - transition: opacity .3s; -} - -.subjects_block input:checked + label:before, -.periodic input:checked + .radio:before, -.mailing_day input:checked + .radio:before{ - border-color: #FF6600; - transition: border-color .3s; -} - -.subjects_block input:checked + label:after, -.periodic input:checked + .radio:after, -.mailing_day input:checked + .radio:after{ - opacity: 1; - transition: opacity .3s; -} - -.periodic{ - width: 270px; - border-right: 1px solid #ebebeb; - padding-bottom: 45px; -} - -.periodic li{ - margin-bottom: 17px; - list-style: none; -} - -.mailing_day{ - padding-left: 110px; - padding-top: 20px; - vertical-align: top; -} - - -.mailing_day label{ - display: inline-block; - font-size: 25px; - font-weight: 300; - text-transform: uppercase; - width: 80px; - height: 80px; - background-color: #fff; - border-radius: 50%; - box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); - -moz-box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); - -webkit-box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); - -o-box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); - position: relative; - cursor: pointer; -} - -.mailing_day label:hover .radio:before, -.periodic label:hover .radio:before, -.subjects_block label:hover:before { - border-color: #FF6600; -} - -.mailing_day label + label{ - margin-left: 40px; -} - -.mailing_day input + .radio{ - display: block; - text-align: center; - cursor: pointer; - line-height: 80px; -} - -.mailing_day input + .radio:before{ - background-color: #fff; -} - -.mailing_day input + .radio:before, -.mailing_day input + .radio:after{ - left: auto; - right: 0; -} - -.button_block{ - padding: 62px 0; - text-align: center; -} - -.button_block button{ - display: block; - width: 265px; - height: 46px; - margin: 0 auto 26px; - border: 0; - background-color: #ff6600; - border-radius: 3px; - transition: background-color .3s; - color: #fff; - font-size: 19px; - font-weight: 300; - text-transform: uppercase; - cursor: pointer; -} - -.button_block button:hover{ - background-color: #ff9900; - transition: background-color .3s; -} - -.button_block a{ - color: #999; - font-size: 16px; -} - -.button_block a:hover{ - text-decoration: none; -} - -a.themes_trigger{ - display: block; - width: 190px; - height: 35px; - line-height: 35px; - background-color: #FF6600; - border-radius: 3px; - font-size: 19px; - color: #fff; - text-decoration: none; - text-align: center; - font-weight: 300; -} - -.selected{ - list-style: none; - font-size: 16px; - color: #333333; - font-weight: 100; -} - -.selected li{ - display: inline-block; - vertical-align: top; - border: 1px solid #FF6600; - border-radius: 3px; - padding: 6px 8px 6px 15px; - line-height: 16px; - margin-bottom: 10px; - margin-right: 10px; -} - -.selected li a{ - text-decoration: none; - margin-left: 15px; - color: #FF6600; - font-size: 22px; -} - -.popup-window{ - padding: 35px 50px 30px; - width: 640px; - font-size: 15px; -} - -.popup-window header{ - padding-bottom: 20px; - font-size: 35px; - line-height: 35px; - color: #f60; - font-weight: 100; -} - -.scroll-container{ - max-height: 230px; - overflow-y: scroll; -} - -.mCSB_scrollTools .mCSB_draggerRail { - width: 10px; - background: #dbdbdb; - border: 1px solid #ccc; -} - -.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar { - width: 8px; - border: solid #dbdbdb; - border-width: 2px 1px; -} - -.themes_wrapper{ - position: relative; - border: 1px solid #bdbdbd; - outline: 0; - width: 100%; - padding: 3px; - font-family: dindisplay_pro,sans-serif; - font-size: 15px; - line-height: 19px; - border-radius: 3px; - box-shadow: inset 0 2px 2px -2px #aaa; - background-color: #fff; -} - -.wait-ajax{ - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: rgba(191,191,191,.3) url('/static/client/img/ajax-loader.gif') no-repeat center; - display: none; -} - -.modal_checkboxes{ - list-style: none; - padding: 5px 10px; -} - -.modal_checkboxes li + li{ - margin-top: 4px; -} - -.modal_checkboxes .hidden_checkbox{ - display: none; -} - -.modal_checkboxes .hidden_checkbox + .custom_checkbox{ - display: inline-block; - vertical-align: middle; - width: 13px; - height: 13px; - line-height: 11px; - border-radius: 3px; - border: 1px solid #444; -} - -.modal_checkboxes .hidden_checkbox:checked + .custom_checkbox{ - border-color: #FF6600; -} - -.modal_checkboxes .hidden_checkbox:checked + .custom_checkbox:before{ - content: '∨'; - font-size: 10px; - height: 11px; - display: block; - text-align: center; - color: #FF6600; -} - -.modal_checkboxes .hidden{ - display: none; -} - -.modal_checkboxes .trigger{ - padding: 0 0 0 14px; - color: #464646; - position: relative; - font-weight: normal; - -webkit-font-smoothing: antialiased; -} - -.modal_checkboxes .trigger:hover{ - color: #FF6600; -} - -.modal_checkboxes .trigger[data-sub="true"]:before{ - content: "›"; - color: #FF6600; - position: absolute; - left: 3px; -} - -.modal_checkboxes .sub{ - list-style: none; - margin-left: 1em; - margin-top: .5em; -} - -.modal_checkboxes .label{ - padding-left: 14px; - font-weight: normal; - -webkit-font-smoothing: antialiased; -} - -.buttons_block{ - padding-top: 25px; -} - -.buttons_block button{ - display: inline-block; - vertical-align: top; - height: 40px; - border: 1px solid #fff; - outline: 0; - color: #fff; - font-family: dindisplay_pro,Arial,sans-serif; - font-weight: 700; - font-size: 15px; - line-height: 41px; - text-transform: uppercase; - padding: 0 25px; - border-radius: 4px; - -moz-box-sizing: border-box; - box-sizing: border-box; - box-shadow: 0 1px 0 rgba(0,0,0,.2),inset 0 1px 0 rgba(0,0,0,.2); - -webkit-filter: none; - filter: none; -} - -.buttons_block .modal-approve{ - background: #f60; - background: -webkit-gradient(linear,left top,left bottom,color-stop(0,#ff8000),color-stop(100%,#f60)); - background: -webkit-linear-gradient(top,#ff8000 0,#f60 100%); - background: -o-linear-gradient(top,#ff8000 0,#f60 100%); - background: -webkit-linear-gradient(top,#ff8000 0,#f60 100%); - background: -o-linear-gradient(top,#ff8000 0,#f60 100%); - background: linear-gradient(to bottom,#ff8000 0,#f60 100%); -} - -.buttons_block button:hover{ - margin-top: -1px; -} - -.modals{ - display: none; -} - -.resend_email_form fieldset{ - border: 0; -} - -.resend_email_form fieldset + fieldset{ - margin-top: 30px; -} - -.resend_email_form fieldset p + p{ - margin-top: 10px; -} - -.resend_email_form label{ - font-size: 18px; - display: inline-block; - vertical-align: middle; - width: 180px; -} - -.resend_email_form input{ - display: inline-block; - vertical-align: middle; - width: 350px; - height: 34px; - border: 1px solid #ebebeb; - border-radius: 3px; - background-color: #fff; - padding: 15px; -} - -.autocomplete_block{ - position: relative; - margin-bottom: 5px; -} - -.autocomplete_input{ - display: block; - min-width: 100%; - border: 0; - border-bottom: 1px dotted #cdcdcd; - height: 35px; - padding: 0 15px; - font-size: 15px; - color: rgb(34, 34, 34); - font-weight: 300; -} - -.autocomplete_themes_results{ - list-style: none; - max-height: 230px; - overflow-y: auto; - background-color: #fff; - border: 1px solid #cdcdcd; - position: absolute; - top: calc(100% - 1px); - left: 0; - right: 0; - z-index: 1; - display: none; -} - -.autocomplete_themes_results li{ - padding: 2px 10px; - cursor: pointer; - color: #464646; -} - -.autocomplete_themes_results li:hover{ - color: #ff6600; -} - -.autocomplete_themes_results span{ - color: #ababab; -} - -.popup-window .selected_themes{ - display: none; - border-bottom: 1px dotted #cdcdcd; - margin-bottom: 5px; - padding-bottom: 5px; -} - -.selected_themes.visible{ - display: block; -} - -.popup-window .selected_themes li { - margin-bottom: 3px; - margin-right: 3px; - padding: 3px 5px; -} - -.popup-window .selected_themes li a{ - margin-left: 5px; -} diff --git a/static/mailing_settings/css/main.css b/static/mailing_settings/css/main.css index 9778cfe3..3992b5ec 100644 --- a/static/mailing_settings/css/main.css +++ b/static/mailing_settings/css/main.css @@ -11,6 +11,10 @@ outline: 0 none; } +fieldset{ + border: 0; +} + .container{ max-width: 1140px; margin: 0 auto; @@ -70,3 +74,820 @@ h3{ .page_header p span{ color: #FF6600; } + +.themes_block, +.period_block{ + background-color: #fbfbfb; + border-top: 1px solid #ebebeb; + border-bottom: 1px solid #ebebeb; + padding-top: 50px; +} + +.themes_block{ + padding-bottom: 55px; +} + +.themes_block h3 { + margin-bottom: 30px; +} + +.subjects_block{ + padding: 50px 0; +} + +.page_footer{ + border-top: 1px solid #ebebeb; + border-bottom: 1px solid #ebebeb; + text-align: center; + line-height: 40px; + font-size: 16px; + color: #999; +} + +.columns{ + font-size: 0; + width: 1045px; + margin: 0 auto; +} + +.columns .column{ + display: inline-block; +} + +.themes_block .column{ + display: inline-block; + width: 50%; + vertical-align: top; +} + +.geo_filters{ + list-style: none; + background-color: #fff; + border: 1px solid #ebebeb; + border-radius: 3px; + padding: 30px; + font-size: 16px; +} + +.geo_filters > li + li{ + margin-top: 34px; +} + +.geo_filters .modal_trigger{ + font-size: 16px; + color: #333; + text-decoration: none; + display: inline-block; + border-bottom: 1px dashed #333; + margin-left: 40px; +} + +.geo_filters .modal_trigger:hover{ + border-bottom-color: transparent; +} + +.geo_filters input{ + display: none; +} + +.geo_filters .moscow{ + /*color: #49d026;*/ + color: #ccc; +} + +.geo_filters .moscow:hover, +.geo_filters input:checked + .moscow{ + border-color: #49d026; + box-shadow: 0 0 0 2px #49d026; + cursor: pointer; + color: #49d026; +} + +.geo_filters .rf{ + /*color: #ff6600;*/ + color: #ccc; +} + +.geo_filters .rf:hover, +.geo_filters input:checked + .rf{ + border-color: #ff6600; + box-shadow: 0 0 0 2px #ff6600; + cursor: pointer; + color: #ff6600; +} + +.geo_filters .foreign{ + /*color: #0099ff;*/ + color: #ccc; +} + +.geo_filters .foreign:hover, +.geo_filters input:checked + .foreign{ + border-color: #0099ff; + box-shadow: 0 0 0 2px #0099ff; + cursor: pointer; + color: #0099ff; +} + +.geo_filters input + .label{ + display: inline-block; + width: 283px; + padding: 6px 15px; + border: 1px solid #ebebeb; + font-size: 20px; + border-radius: 3px; +} + +.geo_filters input + .label + .geo_checkbox{ + display: inline-block; + height: 24px; + vertical-align: middle; + margin-left: 20px; + position: relative; +} + +.geo_filters input + .label + .geo_checkbox:before{ + content: ""; + display: inline-block; + width: 22px; + height: 22px; + border-radius: 50%; + border: 1px solid #e0e0e0; + position: absolute; + top: 0; + left:0; + transition: border-color .3s; +} + +.geo_filters input + .label + .geo_checkbox:after{ + content: ''; + display: block; + width: 23px; + height: 22px; + background: url(../images/checkbox.png); + position: absolute; + top: 1px; + left: 0; + opacity: 0; + transition: opacity .3s; +} + +.geo_filters input:checked + .label + .geo_checkbox:before{ + border-color: #FF6600; + transition: border-color .3s; +} + +.geo_filters input:checked + .label + .geo_checkbox:after{ + opacity: 1; + transition: opacity .3s; +} + +.geo_filters .selected{ + padding-top: 20px; + width: 285px; +} + +.subjects_block .column{ + vertical-align: top; + width: calc(100%/3); + font-size: 16px; +} + +.subjects_block p{ + color: #999999; + font-weight: 100; + padding: 0 40px; + font-size: 16px; +} + +.subjects_block input, +.periodic input, +.mailing_day input{ + display: none; +} + +.subjects_block input + label, +.periodic input + .radio{ + position: relative; + padding-left: 40px; + cursor: pointer; + font-size: 18px; +} + +.subjects_block input + label:before, +.periodic input + .radio:before, +.mailing_day input + .radio:before{ + content: ""; + display: inline-block; + width: 22px; + height: 22px; + border-radius: 50%; + border: 1px solid #e0e0e0; + position: absolute; + top: 0; + left:0; + transition: border-color .3s; +} + +.subjects_block input + label:after, +.periodic input + .radio:after, +.mailing_day input + .radio:after{ + content: ''; + display: block; + width: 23px; + height: 22px; + background: url(../images/checkbox.png); + position: absolute; + top: 1px; + left: 0; + opacity: 0; + transition: opacity .3s; +} + +.subjects_block input:checked + label:before, +.periodic input:checked + .radio:before, +.mailing_day input:checked + .radio:before{ + border-color: #FF6600; + transition: border-color .3s; +} + +.subjects_block input:checked + label:after, +.periodic input:checked + .radio:after, +.mailing_day input:checked + .radio:after{ + opacity: 1; + transition: opacity .3s; +} + +.periodic{ + width: 270px; + border-right: 1px solid #ebebeb; + padding-bottom: 45px; +} + +.periodic li{ + margin-bottom: 17px; + list-style: none; +} + +.mailing_day{ + padding-left: 110px; + padding-top: 20px; + vertical-align: top; +} + + +.mailing_day label{ + display: inline-block; + font-size: 25px; + font-weight: 300; + text-transform: uppercase; + width: 80px; + height: 80px; + background-color: #fff; + border-radius: 50%; + box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); + -moz-box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); + -webkit-box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); + -o-box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); + position: relative; + cursor: pointer; +} + +.mailing_day label:hover .radio:before, +.periodic label:hover .radio:before, +.subjects_block label:hover:before { + border-color: #FF6600; +} + +.mailing_day label + label{ + margin-left: 40px; +} + +.mailing_day input + .radio{ + display: block; + text-align: center; + cursor: pointer; + line-height: 80px; +} + +.mailing_day input + .radio:before{ + background-color: #fff; +} + +.mailing_day input + .radio:before, +.mailing_day input + .radio:after{ + left: auto; + right: 0; +} + +.button_block{ + padding: 62px 0; + text-align: center; +} + +.button_block button{ + display: block; + width: 265px; + height: 46px; + margin: 0 auto 26px; + border: 0; + background-color: #ff6600; + border-radius: 3px; + transition: background-color .3s; + color: #fff; + font-size: 19px; + font-weight: 300; + text-transform: uppercase; + cursor: pointer; +} + +.button_block button:hover{ + background-color: #ff9900; + transition: background-color .3s; +} + +.button_block a{ + color: #999; + font-size: 16px; +} + +.button_block a:hover{ + text-decoration: none; +} + +a.themes_trigger{ + display: block; + width: 190px; + height: 35px; + line-height: 35px; + background-color: #FF6600; + border-radius: 3px; + font-size: 19px; + color: #fff; + text-decoration: none; + text-align: center; + font-weight: 300; +} + +.selected{ + list-style: none; + font-size: 16px; + color: #333333; + font-weight: 100; +} + +.selected li{ + display: inline-block; + vertical-align: top; + border: 1px solid #FF6600; + border-radius: 3px; + padding: 6px 8px 6px 15px; + line-height: 16px; + margin-bottom: 10px; + margin-right: 10px; +} + +.selected li a{ + text-decoration: none; + margin-left: 15px; + color: #FF6600; + font-size: 22px; +} + +.popup-window{ + padding: 35px 50px 30px; + width: 640px; + font-size: 15px; +} + +.popup-window header{ + padding-bottom: 20px; + font-size: 35px; + line-height: 35px; + color: #f60; + font-weight: 100; +} + +.scroll-container{ + max-height: 230px; + overflow-y: scroll; +} + +.mCSB_scrollTools .mCSB_draggerRail { + width: 10px; + background: #dbdbdb; + border: 1px solid #ccc; +} + +.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar { + width: 8px; + border: solid #dbdbdb; + border-width: 2px 1px; +} + +.themes_wrapper{ + position: relative; + border: 1px solid #bdbdbd; + outline: 0; + width: 100%; + padding: 3px; + font-family: dindisplay_pro,sans-serif; + font-size: 15px; + line-height: 19px; + border-radius: 3px; + box-shadow: inset 0 2px 2px -2px #aaa; + background-color: #fff; +} + +.wait-ajax{ + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(191,191,191,.3) url('/static/client/img/ajax-loader.gif') no-repeat center; + display: none; +} + +.modal_checkboxes{ + list-style: none; + padding: 5px 10px; +} + +.modal_checkboxes li + li{ + margin-top: 4px; +} + +.modal_checkboxes .hidden_checkbox{ + display: none; +} + +.modal_checkboxes .hidden_checkbox + .custom_checkbox{ + display: inline-block; + vertical-align: middle; + width: 13px; + height: 13px; + line-height: 11px; + border-radius: 3px; + border: 1px solid #444; +} + +.modal_checkboxes .hidden_checkbox:checked + .custom_checkbox{ + border-color: #FF6600; +} + +.modal_checkboxes .hidden_checkbox:checked + .custom_checkbox:before{ + content: '∨'; + font-size: 10px; + height: 11px; + display: block; + text-align: center; + color: #FF6600; +} + +.modal_checkboxes .hidden{ + display: none; +} + +.modal_checkboxes .trigger{ + padding: 0 0 0 14px; + color: #464646; + position: relative; + font-weight: normal; + -webkit-font-smoothing: antialiased; +} + +.modal_checkboxes .trigger:hover{ + color: #FF6600; +} + +.modal_checkboxes .trigger[data-sub="true"]:before{ + content: "›"; + color: #FF6600; + position: absolute; + left: 3px; +} + +.modal_checkboxes .sub{ + list-style: none; + margin-left: 1em; + margin-top: .5em; +} + +.modal_checkboxes .label{ + padding-left: 14px; + font-weight: normal; + -webkit-font-smoothing: antialiased; +} + +.buttons_block{ + padding-top: 25px; +} + +.buttons_block button{ + display: inline-block; + vertical-align: top; + height: 40px; + border: 1px solid #fff; + outline: 0; + color: #fff; + font-family: dindisplay_pro,Arial,sans-serif; + font-weight: 700; + font-size: 15px; + line-height: 41px; + text-transform: uppercase; + padding: 0 25px; + border-radius: 4px; + -moz-box-sizing: border-box; + box-sizing: border-box; + box-shadow: 0 1px 0 rgba(0,0,0,.2),inset 0 1px 0 rgba(0,0,0,.2); + -webkit-filter: none; + filter: none; +} + +.buttons_block .modal-approve{ + background: #f60; + background: -webkit-gradient(linear,left top,left bottom,color-stop(0,#ff8000),color-stop(100%,#f60)); + background: -webkit-linear-gradient(top,#ff8000 0,#f60 100%); + background: -o-linear-gradient(top,#ff8000 0,#f60 100%); + background: -webkit-linear-gradient(top,#ff8000 0,#f60 100%); + background: -o-linear-gradient(top,#ff8000 0,#f60 100%); + background: linear-gradient(to bottom,#ff8000 0,#f60 100%); +} + +.buttons_block button:hover{ + margin-top: -1px; +} + +.modals{ + display: none; +} + +.resend_email_form fieldset{ + border: 0; +} + +.resend_email_form fieldset + fieldset{ + margin-top: 30px; +} + +.resend_email_form fieldset p + p{ + margin-top: 10px; +} + +.resend_email_form label{ + font-size: 18px; + display: inline-block; + vertical-align: middle; + width: 180px; +} + +.resend_email_form input{ + display: inline-block; + vertical-align: middle; + width: 350px; + height: 34px; + border: 1px solid #ebebeb; + border-radius: 3px; + background-color: #fff; + padding: 15px; +} + +.autocomplete_block{ + position: relative; + margin-bottom: 5px; +} + +.autocomplete_input{ + display: block; + min-width: 100%; + border: 0; + border-bottom: 1px dotted #cdcdcd; + height: 35px; + padding: 0 15px; + font-size: 15px; + color: rgb(34, 34, 34); + font-weight: 300; +} + +.autocomplete_themes_results{ + list-style: none; + max-height: 230px; + overflow-y: auto; + background-color: #fff; + border: 1px solid #cdcdcd; + position: absolute; + top: calc(100% - 1px); + left: 0; + right: 0; + z-index: 1; + display: none; +} + +.autocomplete_themes_results li{ + padding: 2px 10px; + cursor: pointer; + color: #464646; +} + +.autocomplete_themes_results li:hover{ + color: #ff6600; +} + +.autocomplete_themes_results span{ + color: #ababab; +} + +.popup-window .selected_themes{ + display: none; + border-bottom: 1px dotted #cdcdcd; + margin-bottom: 5px; + padding-bottom: 5px; +} + +.selected_themes.visible{ + display: block; +} + +.popup-window .selected_themes li { + margin-bottom: 3px; + margin-right: 3px; + padding: 3px 5px; +} + +.popup-window .selected_themes li a{ + margin-left: 5px; +} + +.tos{ + margin-bottom: 20px; + color: #999; + font-size: 16px; +} + +/* Authenticated user */ + +#pr-header{ + overflow:hidden; + min-height:98px; + padding:62px 0 10px; + box-sizing: content-box; +} +.pr-logo{ + float:left; + width:254px; + height:74px; + background:url(../images/pr-logo.png) no-repeat; + text-indent:-9999px; + overflow:hidden; +} +.pr-logo a{ + display:block; + height:100%; +} +.pr-slogan{ + float:left; + margin:0 0 0 20px; + background:url(../images/pr-line01.png) no-repeat 0 50%; + padding:28px 0 20px 20px; + color:#454545; + font:19px/21px 'pf_dindisplay_prolight', Arial, Helvetica, sans-serif; + text-transform:uppercase; +} +.pr-search-icon{ + background:url(../images/pr-icon01.png) no-repeat; + width:17px; + height:19px; + display:inline-block; + vertical-align:top; + margin:0 1px 0 3px; +} +.pr-header-box{ + float:right; + text-align:right; + margin:-4px 0 0; +} +.pr-phone{ + font-size: 25px; + line-height:30px; + text-decoration:none; + color:#454545; + display:inline-block; + vertical-align:top; + margin:0 0 5px; +} +.pr-social{ + margin:0; + padding:0; + list-style:none; + font-size: 0; + line-height:0; +} +.pr-social li{ + display:inline-block; + vertical-align:middle; + margin:0 0 0 6px; + -webkit-transition: all 100ms linear; + -moz-transition: all 100ms linear; + -ms-transition: all 100ms linear; + -o-transition: all 100ms linear; + transition: all 100ms linear; +} +.pr-social li:hover{ + opacity:0.8; +} + +#pr-promo{ + background:url(../images/pr-img01.jpg) no-repeat 50% 0; + background-size:cover; + min-height:400px; + padding:35px 0 47px; + color:#fff; +} +#pr-promo .pr-center{ + padding:0 25px; + width:950px; +} +#pr-promo h1{ + margin:0 0 16px; + font: 300 39px/39px 'dindisplay_pro', Arial, Helvetica, sans-serif; + color:#fff; + text-align: left; + padding-top: 0; +} +#pr-promo h2{ + margin:0 0 15px; + font:500 27px/33px 'dindisplay_pro', Arial, Helvetica, sans-serif; + color:#99fbff; + text-align: left; +} +#pr-promo p{ + margin:0; +} +.pr-promo-text{ + max-width:400px; + margin:0 0 22px; +} + +.pr-promo-text p{ + font-size: 20px; +} + +.pr-promo-text a{ + color: #fff; +} +.pr-form{ + width:509px; + text-align:center; +} + +.pr-form .pr-row{ + overflow:hidden; + margin:0 0 14px; +} +.pr-input{ + float:left; + height:46px; + width:186px; + padding:0 44px 0 18px; + margin:0 0 0 13px; + background:#fff; + border-radius:4px; + position:relative; +} +.pr-input:first-child{ + margin:0; +} +.pr-input:after{ + content:''; + position:absolute; + top:13px; + right:14px; + width:20px; + height:20px; +} +.pr-input.pr-name:after{ + background:url(../images/pr-icon02.png) no-repeat 50% 50%; +} +.pr-input.pr-email:after{ + background:url(../images/pr-icon03.png) no-repeat 50% 50%; +} + +.pr-form button{ + display:block; + border:2px solid #fff; + border-radius:4px; + background:#ff6900; + height:64px; + font: 30px/58px 'pf_dindisplay_proregular', Arial, Helvetica, sans-serif; + text-align:center; + text-transform:uppercase; + color:#fff; + width:100%; + cursor:pointer; + -webkit-transition: all 100ms linear; + -moz-transition: all 100ms linear; + -ms-transition: all 100ms linear; + -o-transition: all 100ms linear; + transition: all 100ms linear; +} \ No newline at end of file diff --git a/static/mailing_settings/images/logo2.png b/static/mailing_settings/images/logo2.png new file mode 100644 index 00000000..509fa364 Binary files /dev/null and b/static/mailing_settings/images/logo2.png differ diff --git a/static/mailing_settings/images/none.gif b/static/mailing_settings/images/none.gif new file mode 100644 index 00000000..35d42e80 Binary files /dev/null and b/static/mailing_settings/images/none.gif differ diff --git a/static/mailing_settings/images/pr-icon01.png b/static/mailing_settings/images/pr-icon01.png new file mode 100644 index 00000000..c239f83b Binary files /dev/null and b/static/mailing_settings/images/pr-icon01.png differ diff --git a/static/mailing_settings/images/pr-icon02.png b/static/mailing_settings/images/pr-icon02.png new file mode 100644 index 00000000..db6d6431 Binary files /dev/null and b/static/mailing_settings/images/pr-icon02.png differ diff --git a/static/mailing_settings/images/pr-icon03.png b/static/mailing_settings/images/pr-icon03.png new file mode 100644 index 00000000..2a965001 Binary files /dev/null and b/static/mailing_settings/images/pr-icon03.png differ diff --git a/static/mailing_settings/images/pr-icon04.png b/static/mailing_settings/images/pr-icon04.png new file mode 100644 index 00000000..2c87a30c Binary files /dev/null and b/static/mailing_settings/images/pr-icon04.png differ diff --git a/static/mailing_settings/images/pr-icon05.png b/static/mailing_settings/images/pr-icon05.png new file mode 100644 index 00000000..95dd0cf9 Binary files /dev/null and b/static/mailing_settings/images/pr-icon05.png differ diff --git a/static/mailing_settings/images/pr-icon06.png b/static/mailing_settings/images/pr-icon06.png new file mode 100644 index 00000000..0b14160b Binary files /dev/null and b/static/mailing_settings/images/pr-icon06.png differ diff --git a/static/mailing_settings/images/pr-img01.jpg b/static/mailing_settings/images/pr-img01.jpg new file mode 100644 index 00000000..dc1c874c Binary files /dev/null and b/static/mailing_settings/images/pr-img01.jpg differ diff --git a/static/mailing_settings/images/pr-line01.png b/static/mailing_settings/images/pr-line01.png new file mode 100644 index 00000000..2a0f721f Binary files /dev/null and b/static/mailing_settings/images/pr-line01.png differ diff --git a/static/mailing_settings/images/pr-logo.png b/static/mailing_settings/images/pr-logo.png new file mode 100644 index 00000000..0da07a2b Binary files /dev/null and b/static/mailing_settings/images/pr-logo.png differ diff --git a/static/mailing_settings/images/sm-icon-fb.png b/static/mailing_settings/images/sm-icon-fb.png new file mode 100644 index 00000000..bd286046 Binary files /dev/null and b/static/mailing_settings/images/sm-icon-fb.png differ diff --git a/static/mailing_settings/images/sm-icon-inst.png b/static/mailing_settings/images/sm-icon-inst.png new file mode 100644 index 00000000..a0f5c0c9 Binary files /dev/null and b/static/mailing_settings/images/sm-icon-inst.png differ diff --git a/static/mailing_settings/images/sm-icon-lin.png b/static/mailing_settings/images/sm-icon-lin.png new file mode 100644 index 00000000..6783ffd7 Binary files /dev/null and b/static/mailing_settings/images/sm-icon-lin.png differ diff --git a/static/mailing_settings/images/sm-icon-twit.png b/static/mailing_settings/images/sm-icon-twit.png new file mode 100644 index 00000000..642d994a Binary files /dev/null and b/static/mailing_settings/images/sm-icon-twit.png differ diff --git a/static/mailing_settings/images/sm-icon-vk.png b/static/mailing_settings/images/sm-icon-vk.png new file mode 100644 index 00000000..99b581c9 Binary files /dev/null and b/static/mailing_settings/images/sm-icon-vk.png differ diff --git a/static/mailing_settings/images/sm-icon-youtube.png b/static/mailing_settings/images/sm-icon-youtube.png new file mode 100644 index 00000000..a4305f8c Binary files /dev/null and b/static/mailing_settings/images/sm-icon-youtube.png differ diff --git a/static/subscribe_lending/css/all.css b/static/subscribe_lending/css/all.css index a8aafffd..618a04a7 100644 --- a/static/subscribe_lending/css/all.css +++ b/static/subscribe_lending/css/all.css @@ -163,6 +163,11 @@ body.pr { .pr-social li:hover{ opacity:0.8; } + + + + + #pr-promo{ background:url(../images/pr-img01.jpg) no-repeat 50% 0; background-size:cover; @@ -200,6 +205,11 @@ body.pr { width:509px; text-align:center; } + + + + + .pr-form .pr-row{ overflow:hidden; margin:0 0 14px; diff --git a/templates/client/accounts/mailing_settings.html b/templates/client/accounts/mailing_settings.html index 1e15c6c1..db4d0f61 100644 --- a/templates/client/accounts/mailing_settings.html +++ b/templates/client/accounts/mailing_settings.html @@ -16,18 +16,215 @@ - - {% include 'client/includes/accounts/mailing_settings_form.html' %} +
+
+

{% trans 'Включать ли новости / обзоры / статьи в письмо?' %}

+ +
+
+ {{ form.content_news }} + {{ form.content_news.label_tag }} +

{% trans "Получайте новости выставок и конференций по выбранным тематикам" %}

+
+ +
+ {{ form.content_overview }} + {{ form.content_overview.label_tag }} +

{% trans "Практические материалы, интервью, кейсы, которые помогут эффективно участвовать в выставках" %}

+
+ +
+ {{ form.content_articles }} + {{ form.content_articles.label_tag }} +

{% trans "Блог о том, как создавать и продвигать крутые event`ы" %}

+
+
+
+
+ +
+
+

{% trans 'Регулярность получения писем' %}

+ +
+
+
    + {% for field in form.periodic %} +
  • + +
  • + {% endfor %} +
+
+ +
+ {% for field in form.periodic_day %} + + {% endfor %} +
+
+
+
+ +
+
+
+ {% trans 'Нажимая «Подписаться», вы соглашаетесь получать' %}
{% trans 'материалы компании Expomap на свой электронный адрес' %}
+ {% trans "Пользовательское соглашение" %} +
+ + {% trans 'Не хочу быть в курсе событий (отписаться от всего)' %} +
+
+ + + diff --git a/templates/client/includes/accounts/mailing_settings_form.html b/templates/client/includes/accounts/mailing_settings_form.html deleted file mode 100644 index d4584d66..00000000 --- a/templates/client/includes/accounts/mailing_settings_form.html +++ /dev/null @@ -1,148 +0,0 @@ -{% load i18n %} -
- {% csrf_token %} -
-
-

{% trans 'Какие события включать в ваше письмо?' %}

- -
-
-

{% trans 'Ваши темы:' %}

- -
    - {% for theme in object.themes.all %} -
  • - - {{ theme }} - × -
  • - {% endfor %} - - {% for tag in object.tags.all %} -
  • - - {{ tag }} - × -
  • - {% endfor %} -
- {% trans 'Уточнить темы' %} -
- -
-

{% trans 'Ваши гео-фильтры:' %}

- - -
-
-
-
- -
-
-

{% trans 'Включать ли новости / обзоры / статьи в письмо?' %}

- -
-
- {{ form.content_news }} - {{ form.content_news.label_tag }} -

{% trans "Получайте новости выставок и конференций по выбранным тематикам" %}

-
- -
- {{ form.content_overview }} - {{ form.content_overview.label_tag }} -

{% trans "Практические материалы, интервью, кейсы, которые помогут эффективно участвовать в выставках" %}

-
- -
- {{ form.content_articles }} - {{ form.content_articles.label_tag }} -

{% trans "Блог о том, как создавать и продвигать крутые event`ы" %}

-
-
-
-
- -
-
-

{% trans 'Регулярность получения писем' %}

- -
-
-
    - {% for field in form.periodic %} -
  • - -
  • - {% endfor %} -
-
- -
- {% for field in form.periodic_day %} - - {% endfor %} -
-
-
-
- -
- -
-