Dev: moved nav_bar, progress_bar and start form to header/

LimeSurvey · Dec 4, 2017 · 593bd0b · 593bd0b
1 parent 9862243
commit 593bd0b
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 10 deletions.
diff --git a/themes/survey/vanilla/views/layout_global.twig b/themes/survey/vanilla/views/layout_global.twig
@@ -92,12 +92,12 @@
 
                 {# Bootstrap Navigation Bar: the top menu #}
                 {% block nav_bar %}
-                    {{ include('./subviews/nav_bar.twig') }}
+                    {{ include('./subviews/header/nav_bar.twig') }}
                 {% endblock %}
 
                 {# Top Container: in this template, it contains only  #}
                 {% block progress %}
-                    {{ include('./subviews/progess_bar.twig') }}
+                    {{ include('./subviews/header/progess_bar.twig') }}
                 {% endblock %}
 
                 <!-- Outer Frame Container -->

diff --git a/themes/survey/vanilla/views/layout_user_forms.twig b/themes/survey/vanilla/views/layout_user_forms.twig
@@ -25,7 +25,7 @@
     <body class="{{ aSurveyInfo.class.body }} lang-{{surveylanguage}} {{surveyformat}}" {{ aSurveyInfo.attr.body }}>
 
         {# Bootstrap Navigation Bar: the top menu #}
-        {{ include('./subviews/nav_bar.twig') }}
+        {{ include('./subviews/header/nav_bar.twig') }}
 
 
         <!-- Outer Frame Container -->

diff --git a/themes/survey/vanilla/views/subviews/content/firstpage.twig b/themes/survey/vanilla/views/subviews/content/firstpage.twig
@@ -12,13 +12,13 @@
     (¯`·._.·(¯`·._.· Content First Page  ·._.·´¯)·._.·´¯)
 
     This content is included inside mainrow.twig
-    
+
 #}
 
 {# render the layout_global content block #}
 
 {# Include the form opening tag #}
-{{ include('./subviews/start_form.twig') }} <!-- main form -->
+{{ include('./subviews/header/start_form.twig') }} <!-- main form -->
 
     {# This will display the script and the hidden inputs needed for Expression Manager #}
     {{ aSurveyInfo.EM.ScriptsAndHiddenInputs  }}

diff --git a/themes/survey/vanilla/views/subviews/content/main.twig b/themes/survey/vanilla/views/subviews/content/main.twig
@@ -21,7 +21,7 @@
 }
 
 {# Include the form opening tag #}
-{{ include('./subviews/start_form.twig') }} <!-- main form -->
+{{ include('./subviews/header/start_form.twig') }} <!-- main form -->
 
     {# This will display the script and the hidden inputs needed for Expression Manager #}
     {{ aSurveyInfo.EM.ScriptsAndHiddenInputs  }}

diff --git a/themes/survey/vanilla/views/subviews/content/quotas.twig b/themes/survey/vanilla/views/subviews/content/quotas.twig
@@ -24,7 +24,7 @@
 
 
     {# Include the form opening tag #}
-    {{ include('./subviews/start_form.twig') }} <!-- main form -->
+    {{ include('./subviews/header/start_form.twig') }} <!-- main form -->
 
         {# This will display the script and the hidden inputs needed for Expression Manager #}
         {{ aSurveyInfo.EM.ScriptsAndHiddenInputs  }}

diff --git a/themes/survey/vanilla/views/subviews/content/save.twig b/themes/survey/vanilla/views/subviews/content/save.twig
@@ -34,7 +34,7 @@
 
 
 {# Include the form opening tag #}
-{{ include('./subviews/start_form.twig') }} <!-- main form -->
+{{ include('./subviews/header/start_form.twig') }} <!-- main form -->
 
     {# This will display the script and the hidden inputs needed for Expression Manager #}
     {{ aSurveyInfo.EM.ScriptsAndHiddenInputs  }}

diff --git a/themes/survey/vanilla/views/subviews/content/submit.twig b/themes/survey/vanilla/views/subviews/content/submit.twig
@@ -26,7 +26,7 @@
 
 {# include the form opening tag #}
 <!-- main form -->
-{{ include('./subviews/start_form.twig') }}
+{{ include('./subviews/header/start_form.twig') }}
 
     {# This will display the script and the hidden inputs needed for Expression Manager #}
     {{ aSurveyInfo.EM.ScriptsAndHiddenInputs  }}

diff --git a/themes/survey/vanilla/views/subviews/content/submit_preview.twig b/themes/survey/vanilla/views/subviews/content/submit_preview.twig
@@ -22,7 +22,7 @@
 
 {# include the form opening tag #}
 <!-- main form -->
-{{ include('./subviews/start_form.twig') }}
+{{ include('./subviews/header/start_form.twig') }}
 
 
     <div class="{{ aSurveyInfo.class.previewsubmit }}" {{ aSurveyInfo.attr.previewsubmit }}>

diff --git a/...urvey/vanilla/views/subviews/nav_bar.twig → ...anilla/views/subviews/header/nav_bar.twig b/...urvey/vanilla/views/subviews/nav_bar.twig → ...anilla/views/subviews/header/nav_bar.twig
diff --git a/...y/vanilla/views/subviews/progess_bar.twig → ...la/views/subviews/header/progess_bar.twig b/...y/vanilla/views/subviews/progess_bar.twig → ...la/views/subviews/header/progess_bar.twig
diff --git a/...ey/vanilla/views/subviews/start_form.twig → ...lla/views/subviews/header/start_form.twig b/...ey/vanilla/views/subviews/start_form.twig → ...lla/views/subviews/header/start_form.twig