Dev: moved relevant views to messages/

LimeSurvey · Dec 4, 2017 · 3f6382f · 3f6382f
1 parent 5498589
commit 3f6382f
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 9 deletions.
diff --git a/themes/survey/vanilla/views/layout_global.twig b/themes/survey/vanilla/views/layout_global.twig
@@ -110,7 +110,7 @@
                 {% endblock %}
 
                 {# Bootstrap alert modal #}
-                {{ include('./subviews/bootstrap_alert_modal.twig') }}
+                {{ include('./subviews/messages/bootstrap_alert_modal.twig') }}
 
             {# Basic ThemeScript options  #}
             {{ registerScript("BasicThemeScripts", " if(window.basicThemeScripts === undefined){ window.basicThemeScripts = new ThemeScripts(); } basicThemeScripts.initGlobal(); ", POS_END) }}

diff --git a/themes/survey/vanilla/views/layout_user_forms.twig b/themes/survey/vanilla/views/layout_user_forms.twig
@@ -201,7 +201,7 @@
         </div> <!-- outer frame container -->
 
         {# Bootstrap alert modal #}
-        {{ include('./subviews/bootstrap_alert_modal.twig') }}
+        {{ include('./subviews/messages/bootstrap_alert_modal.twig') }}
 
         {# Basic ThemeScript options  #}
         {{ registerScript("BasicThemeScripts", " if(window.basicThemeScripts === undefined){ window.basicThemeScripts = new ThemeScripts(); } basicThemeScripts.initGlobal(); ", POS_END) }}

diff --git a/themes/survey/vanilla/views/subviews/content/firstpage.twig b/themes/survey/vanilla/views/subviews/content/firstpage.twig
@@ -24,13 +24,13 @@
     {{ aSurveyInfo.EM.ScriptsAndHiddenInputs  }}
 
     {# Include the alert for no JavaScript #}
-    {{ include('./subviews/no_js_alert.twig') }}
+    {{ include('./subviews/messages/no_js_alert.twig') }}
 
     {# Include the language changer selector #}
     {{ include('./subviews/language_changer.twig') }}
 
     {# If survey mode is "All in One", this will add the welcome/privacy messages (if activated) #}
-    {{ include('./subviews/welcome.twig') }}
+    {{ include('./subviews/messages/welcome.twig') }}
 
     {% if(aSurveyInfo.anonymized) == "Y" %}
         {{ include('./subviews/privacy/privacy.twig') }}

diff --git a/themes/survey/vanilla/views/subviews/content/main.twig b/themes/survey/vanilla/views/subviews/content/main.twig
@@ -27,7 +27,7 @@
     {{ aSurveyInfo.EM.ScriptsAndHiddenInputs  }}
 
     {# Include the alert for no JavaScript #}
-    {{ include('./subviews/no_js_alert.twig') }}
+    {{ include('./subviews/messages/no_js_alert.twig') }}
 
     {# If survey mode is "All in One", it will add the welcome/privacy messages if needed #}
     {{ include('./subviews/privacy/allinone_mode_welcome_privacy.twig') }}

diff --git a/themes/survey/vanilla/views/subviews/content/submit.twig b/themes/survey/vanilla/views/subviews/content/submit.twig
@@ -42,7 +42,7 @@
 
             {# Assessments #}
             {% if (aSurveyInfo.aAssessments.show) %}
-                {{ include('./subviews/assessments.twig') }}
+                {{ include('./subviews/messages/assessments.twig') }}
             {% endif %}
 
             {#  Link to Print Answer Preview #}

diff --git a/themes/survey/vanilla/views/subviews/content/submit_preview.twig b/themes/survey/vanilla/views/subviews/content/submit_preview.twig
@@ -29,7 +29,7 @@
         <div class='{{ aSurveyInfo.class.previewsubmittext }}' {{ aSurveyInfo.attr.previewsubmittext }}>
             {# Assessments #}
             {% if (aSurveyInfo.aAssessments.show) %}
-                {{ include('./subviews/assessments.twig') }}
+                {{ include('./subviews/messages/assessments.twig') }}
             {% endif %}
 
             <br />

diff --git a/themes/survey/vanilla/views/subviews/content/survey_list.twig b/themes/survey/vanilla/views/subviews/content/survey_list.twig
@@ -25,7 +25,7 @@
     <div class="{{ aSurveyInfo.class.surveylistrow }} row" id="{{ aSurveyInfo.id.surveylistrow }}" {{ aSurveyInfo.attr.surveylistrow }}>
 
         {# include the alert for no JavaScript #}
-        {{ include('./subviews/no_js_alert.twig') }}
+        {{ include('./subviews/messages/no_js_alert.twig') }}
 
         <div id="{{ aSurveyInfo.id.surveylistrowjumbotron }}" {{ aSurveyInfo.attr.surveylistrowjumbotron }}>
             {{ image('./files/logo_340.png', aSurveyInfo.name, {"class": "img-responsive center-block"}) }}

diff --git a/...y/vanilla/views/subviews/assessments.twig → .../views/subviews/messages/assessments.twig b/...y/vanilla/views/subviews/assessments.twig → .../views/subviews/messages/assessments.twig
diff --git a/...y/vanilla/views/subviews/no_js_alert.twig → .../views/subviews/messages/no_js_alert.twig b/...y/vanilla/views/subviews/no_js_alert.twig → .../views/subviews/messages/no_js_alert.twig
diff --git a/...urvey/vanilla/views/subviews/welcome.twig → ...illa/views/subviews/messages/welcome.twig b/...urvey/vanilla/views/subviews/welcome.twig → ...illa/views/subviews/messages/welcome.twig
diff --git a/themes/survey/vanilla/views/subviews/privacy/allinone_mode_welcome_privacy.twig b/themes/survey/vanilla/views/subviews/privacy/allinone_mode_welcome_privacy.twig
@@ -20,7 +20,7 @@
 
 {% if aSurveyInfo.format == 'A' %}
     {% if not aSurveyInfo.showwelcome is defined or not aSurveyInfo.showwelcome != 'N' %}
-        {{ include('./subviews/welcome.twig') }}
+        {{ include('./subviews/messages/welcome.twig') }}
     {% endif %}
 
     {% if aSurveyInfo.anonymized == 'Y' %}

diff --git a/...views/subviews/bootstrap_alert_modal.twig → ...s/registration/bootstrap_alert_modal.twig b/...views/subviews/bootstrap_alert_modal.twig → ...s/registration/bootstrap_alert_modal.twig