From 2e1ccdeb71fc491184bd5d7150da1caf2f80d4ed Mon Sep 17 00:00:00 2001 From: Andrey Ivnitsky Date: Mon, 30 Jul 2018 14:21:51 +0500 Subject: [PATCH] =?UTF-8?q?issue=20#426:=20legal=20-=20=D0=B2=D0=BD=D0=B5?= =?UTF-8?q?=D0=B4=D1=80=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BF=D0=B5=D1=86?= =?UTF-8?q?=D0=B8=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BC=D0=BE?= =?UTF-8?q?=D0=B4=D1=83=D0=BB=D1=8F=20=D0=BF=D1=80=D0=B8=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20(#1150)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * issue #426: legal - внедрение специального модуля принятия правил * issue #426: legal - внедрение специального модуля принятия правил * issue #426: legal - внедрение специального модуля принятия правил --- profiles/drupalru/themes/druru/css/style.css | 208 +++++++++++++++--- .../druru/less/drupal/modules/_fz152.less | 4 + .../all/modules/custom/drurum/drurum.install | 7 + 3 files changed, 185 insertions(+), 34 deletions(-) diff --git a/profiles/drupalru/themes/druru/css/style.css b/profiles/drupalru/themes/druru/css/style.css index 1073cc17..93a212ee 100644 --- a/profiles/drupalru/themes/druru/css/style.css +++ b/profiles/drupalru/themes/druru/css/style.css @@ -504,7 +504,7 @@ small, mark, .mark { background-color: #fcf8e3; - padding: .2em; + padding: 0.2em; } .text-left { text-align: left; @@ -3392,7 +3392,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { } .label { display: inline; - padding: .2em .6em .3em; + padding: 0.2em 0.6em 0.3em; font-size: 75%; font-weight: bold; line-height: 1; @@ -3400,7 +3400,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { text-align: center; white-space: nowrap; vertical-align: baseline; - border-radius: .25em; + border-radius: 0.25em; } a.label:hover, a.label:focus { @@ -5500,7 +5500,7 @@ input.form-radio + label::before { } #foo:checked, .form-disabled input.form-checkbox + label::before { - opacity: .4; + opacity: 0.4; } #foo:checked, body.in-maintenance input.form-radio + label::before { @@ -5548,7 +5548,7 @@ form table input.form-radio { width: auto; } form table .form-disabled input.form-checkbox { - opacity: .4; + opacity: 0.4; } /* Form Fixes for Webkit Browsers. */ @media screen and (-webkit-min-device-pixel-ratio: 0) { @@ -5824,13 +5824,95 @@ fieldset[disabled] .btn-accent.focus { margin-left: -15px; margin-right: -15px; } -.col-xs-1, .col-sm-1, .col-vsd-1, .col-sd-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-vsd-2, .col-sd-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-vsd-3, .col-sd-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-vsd-4, .col-sd-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-vsd-5, .col-sd-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-vsd-6, .col-sd-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-vsd-7, .col-sd-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-vsd-8, .col-sd-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-vsd-9, .col-sd-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-vsd-10, .col-sd-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-vsd-11, .col-sd-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-vsd-12, .col-sd-12, .col-md-12, .col-lg-12 { +.col-xs-1, +.col-sm-1, +.col-vsd-1, +.col-sd-1, +.col-md-1, +.col-lg-1, +.col-xs-2, +.col-sm-2, +.col-vsd-2, +.col-sd-2, +.col-md-2, +.col-lg-2, +.col-xs-3, +.col-sm-3, +.col-vsd-3, +.col-sd-3, +.col-md-3, +.col-lg-3, +.col-xs-4, +.col-sm-4, +.col-vsd-4, +.col-sd-4, +.col-md-4, +.col-lg-4, +.col-xs-5, +.col-sm-5, +.col-vsd-5, +.col-sd-5, +.col-md-5, +.col-lg-5, +.col-xs-6, +.col-sm-6, +.col-vsd-6, +.col-sd-6, +.col-md-6, +.col-lg-6, +.col-xs-7, +.col-sm-7, +.col-vsd-7, +.col-sd-7, +.col-md-7, +.col-lg-7, +.col-xs-8, +.col-sm-8, +.col-vsd-8, +.col-sd-8, +.col-md-8, +.col-lg-8, +.col-xs-9, +.col-sm-9, +.col-vsd-9, +.col-sd-9, +.col-md-9, +.col-lg-9, +.col-xs-10, +.col-sm-10, +.col-vsd-10, +.col-sd-10, +.col-md-10, +.col-lg-10, +.col-xs-11, +.col-sm-11, +.col-vsd-11, +.col-sd-11, +.col-md-11, +.col-lg-11, +.col-xs-12, +.col-sm-12, +.col-vsd-12, +.col-sd-12, +.col-md-12, +.col-lg-12 { position: relative; min-height: 1px; padding-left: 15px; padding-right: 15px; } -.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { +.col-xs-1, +.col-xs-2, +.col-xs-3, +.col-xs-4, +.col-xs-5, +.col-xs-6, +.col-xs-7, +.col-xs-8, +.col-xs-9, +.col-xs-10, +.col-xs-11, +.col-xs-12 { float: left; } .col-xs-12 { @@ -5987,7 +6069,18 @@ fieldset[disabled] .btn-accent.focus { margin-left: 0%; } @media (min-width: 748px) { - .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { + .col-sm-1, + .col-sm-2, + .col-sm-3, + .col-sm-4, + .col-sm-5, + .col-sm-6, + .col-sm-7, + .col-sm-8, + .col-sm-9, + .col-sm-10, + .col-sm-11, + .col-sm-12 { float: left; } .col-sm-12 { @@ -6145,7 +6238,18 @@ fieldset[disabled] .btn-accent.focus { } } @media (min-width: 1004px) { - .col-vsd-1, .col-vsd-2, .col-vsd-3, .col-vsd-4, .col-vsd-5, .col-vsd-6, .col-vsd-7, .col-vsd-8, .col-vsd-9, .col-vsd-10, .col-vsd-11, .col-vsd-12 { + .col-vsd-1, + .col-vsd-2, + .col-vsd-3, + .col-vsd-4, + .col-vsd-5, + .col-vsd-6, + .col-vsd-7, + .col-vsd-8, + .col-vsd-9, + .col-vsd-10, + .col-vsd-11, + .col-vsd-12 { float: left; } .col-vsd-12 { @@ -6303,7 +6407,18 @@ fieldset[disabled] .btn-accent.focus { } } @media (min-width: 1260px) { - .col-sd-1, .col-sd-2, .col-sd-3, .col-sd-4, .col-sd-5, .col-sd-6, .col-sd-7, .col-sd-8, .col-sd-9, .col-sd-10, .col-sd-11, .col-sd-12 { + .col-sd-1, + .col-sd-2, + .col-sd-3, + .col-sd-4, + .col-sd-5, + .col-sd-6, + .col-sd-7, + .col-sd-8, + .col-sd-9, + .col-sd-10, + .col-sd-11, + .col-sd-12 { float: left; } .col-sd-12 { @@ -6461,7 +6576,18 @@ fieldset[disabled] .btn-accent.focus { } } @media (min-width: 1580px) { - .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 { + .col-md-1, + .col-md-2, + .col-md-3, + .col-md-4, + .col-md-5, + .col-md-6, + .col-md-7, + .col-md-8, + .col-md-9, + .col-md-10, + .col-md-11, + .col-md-12 { float: left; } .col-md-12 { @@ -6619,7 +6745,18 @@ fieldset[disabled] .btn-accent.focus { } } @media (min-width: 1900px) { - .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { + .col-lg-1, + .col-lg-2, + .col-lg-3, + .col-lg-4, + .col-lg-5, + .col-lg-6, + .col-lg-7, + .col-lg-8, + .col-lg-9, + .col-lg-10, + .col-lg-11, + .col-lg-12 { float: left; } .col-lg-12 { @@ -6867,7 +7004,7 @@ fieldset[disabled] .btn-accent.focus { } .navbar.navbar-default .nav .dropdown-menu.dropdown-menu-right li.leaf a { background-color: #4e86af; - padding: .6em 1.2em; + padding: 0.6em 1.2em; color: #fff; } .navbar.navbar-default .nav .dropdown-menu.dropdown-menu-right li.leaf a:hover, @@ -6987,7 +7124,7 @@ fieldset[disabled] .btn-accent.focus { } @media screen and (max-width: 747px) { .navbar .navbar-second .nav > li a { - padding: .5em .7em; + padding: 0.5em 0.7em; font-size: 1.4em; } } @@ -7165,7 +7302,7 @@ ol.with-parent > li ol > li ol > li:before { content: counter(first-lvl) "." counter(second-lvl) "." counter(third-lvl) ". "; } sup.label { - padding: .1em .3em; + padding: 0.1em 0.3em; } .label-accent { background-color: #df9b10; @@ -7309,7 +7446,7 @@ form.confirmation .form-submit { } form.confirmation #edit-cancel { float: right; - margin: .5em 1em; + margin: 0.5em 1em; } form .table-striped > tbody tr.admin-menu-tweak-permissions-processed td { background-color: rgba(0, 0, 0, 0.1); @@ -7323,7 +7460,7 @@ form .table-striped > tbody tr.admin-menu-tweak-permissions-processed:first-chil border-top: none; } form .tabledrag-toggle-weight-wrapper { - font-size: .9em; + font-size: 0.9em; } form#system-modules .module-filter-inputs-wrapper label { position: relative; @@ -7745,7 +7882,7 @@ body.admin-menu { } .navbar > .container .navbar-brand .site-slogan { margin-left: 4px; - font-size: .8em; + font-size: 0.8em; } @media screen and (min-width: 748px) { .navbar > .container .navbar-brand { @@ -8081,7 +8218,7 @@ body aside ul:not(.pager) > * a:first-of-type.active.active { background: #d9b7b7; } .main-content .comment .dropdown { - opacity: .5; + opacity: 0.5; -webkit-transition: opacity 0.2s; -o-transition: opacity 0.2s; transition: opacity 0.2s; @@ -8193,7 +8330,7 @@ body aside ul:not(.pager) > * a:first-of-type.active.active { clear: both; } .description { - font-size: .9em; + font-size: 0.9em; color: #808080; } .page-header { @@ -8449,8 +8586,8 @@ body footer.footer .site-links ul li { @media screen and (min-width: 1004px) { body footer.footer .site-links ul { padding-left: 2em; - padding-top: .7em; - padding-bottom: .7em; + padding-top: 0.7em; + padding-bottom: 0.7em; border-left: 1px solid rgba(0, 0, 0, 0.1); -webkit-box-shadow: inset 1px 0 0 0 rgba(255, 255, 255, 0.1); -moz-box-shadow: inset 1px 0 0 0 rgba(255, 255, 255, 0.1); @@ -8958,7 +9095,7 @@ ul.li-accent > *:before { float: left; margin-left: -15px; font-size: 1.2em; - line-height: .9em; + line-height: 0.9em; } #block-system-main .views-row, #block-system-main .node-teaser { @@ -9294,7 +9431,7 @@ body.not-front div:not(.alttracker.list-group) .user-picture { .chosen-container-multi .chosen-drop:before { display: block; content: "No items found"; - padding: .4em 1em; + padding: 0.4em 1em; background: #eee; font-style: italic; color: #888; @@ -9942,7 +10079,7 @@ body.adminimal-menu #admin-menu #admin-menu-wrapper .dropdown li li.expandable a * Therefore, we can add our styles inside of Editor */ .cke_editable { - padding: .7em; + padding: 0.7em; } .modal-body { overflow: auto; @@ -10089,7 +10226,7 @@ html.js div.ctools-dropdown .ctools-dropdown-container-wrapper .ctools-dropdown- z-index: 98; } html.js div.ctools-dropdown .ctools-dropdown-container-wrapper .ctools-dropdown-container a { - padding: 5px .3em 5px .7em; + padding: 5px 0.3em 5px 0.7em; font-size: 16px; font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 400; @@ -10105,7 +10242,7 @@ html.js div.ctools-dropdown a.ctools-dropdown-image-link { height: 18px; width: 20px; display: block; - margin: calc(12px - 6px + 1px) calc(0.5em + 1px) 1px calc(.2em + 1px); + margin: calc(6px + 1px) calc(0.5em + 1px) 1px calc(.2em + 1px); padding: 6px 8px; box-sizing: content-box; z-index: 99; @@ -10302,7 +10439,7 @@ html.js .node div.ctools-dropdown .ctools-dropdown-container { .view-content .views-row .item-actions .fa-times, .view-content .views-row .item-actions .fa-close { font-size: 18px; - line-height: .6; + line-height: 0.6; } .page-messages .privatemsg-message { margin-top: 6px; @@ -10335,7 +10472,7 @@ html.js .node div.ctools-dropdown .ctools-dropdown-container { right: 5px; } .page-messages .privatemsg-message .media-body .privatemsg-message-actions a { - opacity: .2; + opacity: 0.2; } .page-messages .privatemsg-message .media-body .privatemsg-message-actions a:focus, .page-messages .privatemsg-message .media-body .privatemsg-message-actions a:hover { @@ -10840,7 +10977,7 @@ fieldset[disabled] #inner_poll_add_field_link a.focus { border-radius: 50%; border: 1px solid; right: -35px; - top: .3em; + top: 0.3em; background: #fafafa; } } @@ -10891,8 +11028,11 @@ fieldset[disabled] #inner_poll_add_field_link a.focus { .form-item-fz152-agreement { text-align: right; } +.form-item-fz152-agreement label { + display: inline; +} .popover-content .ticket-info { - padding: .3em 0; + padding: 0.3em 0; } .popover-content .ticket-info blockquote, .popover-content .ticket-info .well { @@ -10907,7 +11047,7 @@ fieldset[disabled] #inner_poll_add_field_link a.focus { .popover-content .ticket-category, .popover-content .ticket-body, .popover-content .ticket-metadata { - padding: .5em .7em; + padding: 0.5em 0.7em; } h3.popover-title { color: #333333; @@ -11442,7 +11582,7 @@ table .checkbox input[type="checkbox"] { } sup.beta { color: #b1dcb1; - font-size: .6em; - line-height: .3em; + font-size: 0.6em; + line-height: 0.3em; margin: 0; } diff --git a/profiles/drupalru/themes/druru/less/drupal/modules/_fz152.less b/profiles/drupalru/themes/druru/less/drupal/modules/_fz152.less index 2a2c8830..80733f87 100644 --- a/profiles/drupalru/themes/druru/less/drupal/modules/_fz152.less +++ b/profiles/drupalru/themes/druru/less/drupal/modules/_fz152.less @@ -1,3 +1,7 @@ .form-item-fz152-agreement { text-align: right; + + label { + display: inline; + } } \ No newline at end of file diff --git a/sites/all/modules/custom/drurum/drurum.install b/sites/all/modules/custom/drurum/drurum.install index 3c3cd135..c0bdc682 100644 --- a/sites/all/modules/custom/drurum/drurum.install +++ b/sites/all/modules/custom/drurum/drurum.install @@ -791,3 +791,10 @@ function drurum_update_7041() { ->condition('bid', 109) ->execute(); } + +/** + * Rules during registration. + */ +function drurum_update_7042() { + variable_set('fz152_checkbox_title', 'Я даю согласие на обработку моих персональных данных.
Нажимая кнопку "Регистрация", вы соглашаетесь с правилами сайта.'); +}