Fixed issue #18097: Data policy checkbox has confusing location

LimeSurvey · May 10, 2022 · 4b8048e · 4b8048e
1 parent 2a8c0b6
commit 4b8048e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/assets/packages/template-core/template-core.css b/assets/packages/template-core/template-core.css
@@ -266,6 +266,12 @@ table.ls-answers input[type="radio"] {
 .dir-rtl .radio-item label.ls-label-xs-visibility>*,
 .dir-rtl .checkbox-item label.ls-label-xs-visibility>* {
     left: -10000px;
+}
+
+/* Align survey policy checkbox to top */
+#datasecurity_accepted {
+    vertical-align: top;
+}
 
 /*
 Max width before this PARTICULAR table gets nasty
@@ -349,4 +355,4 @@ only screen and (max-width: 760px),
     .dir-rtl table.ls-answers .radio-item label.ls-label-xs-visibility::before,.dir-rtl table.ls-answers .checkbox-item label.ls-label-xs-visibility::before {margin-right:0px;}
     .dir-ltr table.ls-answers .radio-item label.ls-label-xs-visibility::after,.dir-ltr table.ls-answers .checkbox-item label.ls-label-xs-visibility::after {margin-left:0px;}
     .dir-rtl table.ls-answers .radio-item label.ls-label-xs-visibility::after,.dir-rtl table.ls-answers .checkbox-item label.ls-label-xs-visibility::after {margin-right:0px;}
-}
+}
diff --git a/themes/survey/vanilla/views/subviews/privacy/privacy_datasecurity_notice_label.twig b/themes/survey/vanilla/views/subviews/privacy/privacy_datasecurity_notice_label.twig
@@ -6,9 +6,9 @@
 {% if(aSurveyInfo.showsurveypolicynotice == 2) %}
     {% set STARTPOLICYLINK = "<a href='#data-security-modal-" ~ aSurveyInfo.sid ~ "' data-toggle='collapse'>" %}
     {% set ENDPOLICYLINK = "</a>" %}
-{% endif %}
-{% if( strpos( " " ~ dataSecurityNoticeLabel, '{STARTPOLICYLINK}') == false and strpos( " " ~ dataSecurityNoticeLabel, '{ENDPOLICYLINK}') == false) %}
-    {% set dataSecurityNoticeLabel = dataSecurityNoticeLabel ~ "<br/> {STARTPOLICYLINK}" ~ gT("Show policy") ~ "{ENDPOLICYLINK}" %}
+    {% if( strpos( " " ~ dataSecurityNoticeLabel, '{STARTPOLICYLINK}') == false and strpos( " " ~ dataSecurityNoticeLabel, '{ENDPOLICYLINK}') == false) %}
+        {% set dataSecurityNoticeLabel = dataSecurityNoticeLabel ~ "<br/> {STARTPOLICYLINK}" ~ gT("Show policy") ~ "{ENDPOLICYLINK}" %}
+    {% endif %}
 {% endif %}
 {% set haveENDPOLICYLINK = strpos( " " ~ dataSecurityNoticeLabel, '{ENDPOLICYLINK}') %}
 {% set dataSecurityNoticeLabel = str_replace('{STARTPOLICYLINK}', STARTPOLICYLINK, dataSecurityNoticeLabel) %}

diff --git a/themes/survey/vanilla/views/subviews/privacy/privacy_modal.twig b/themes/survey/vanilla/views/subviews/privacy/privacy_modal.twig
@@ -24,8 +24,8 @@
 		{% set describeprivacy = "datasecurity_error " ~ describeprivacy %}
 	{% endif %}
 {% endif %}
-<label for="datasecurity_accepted" class="control-label {{ aSurveyInfo.class.privacydataseccheckboxlabel }}">{{ aSurveyInfo.datasecurity_notice_label }}</label>
 <input required class="{{ aSurveyInfo.class.privacydataseccheckbox }}" type="checkbox" name="datasecurity_accepted" id="datasecurity_accepted" />
+<label for="datasecurity_accepted" class="control-label {{ aSurveyInfo.class.privacydataseccheckboxlabel }}">{{ aSurveyInfo.datasecurity_notice_label }}</label>
 
 <div class="collapse fade" id="data-security-modal-{{aSurveyInfo.sid}}">
     <div class="panel panel-primary">