Dev: adding more navigator part to theme editor

LimeSurvey · Jun 21, 2018 · 81b024b · 81b024b
1 parent 6eef5f9
commit 81b024b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 16 deletions.
diff --git a/themes/survey/vanilla/config.xml b/themes/survey/vanilla/config.xml
@@ -235,10 +235,16 @@
                     <file type="view" role="content">./subviews/content/main.twig</file>
                     <file type="view" role="subview">./subviews/navigation/ajax_indicator.twig</file>
                     <file type="view" role="subview">./subviews/navigation/clearall_links.twig</file>
+                    <file type="view" role="subview">./subviews/navigation/save_links.twig</file>
                     <file type="view" role="subview">./subviews/navigation/language_changer_top_menu.twig</file>
-                    <file type="view" role="subview">./subviews/navigation/navigator.twig</file>
                     <file type="view" role="subview">./subviews/navigation/question_index_menu.twig</file>
-                    <file type="view" role="subview">./subviews/navigation/save_links.twig</file>
+                    <file type="view" role="subview">./subviews/navigation/navigator.twig</file>
+                    <file type="view" role="subview">./subviews/navigation/navigator_complement.twig</file>
+                    <file type="view" role="subview">./subviews/navigation/clearall_buttons.twig</file>
+                    <file type="view" role="subview">./subviews/navigation/save_buttons.twig</file>
+                    <file type="view" role="subview">./subviews/navigation/question_index_buttons.twig</file>
+                    <file type="view" role="subview">./subviews/navigation/question_index_questions_buttons.twig</file>
+                    <file type="view" role="subview">./subviews/navigation/question_index_groups_buttons.twig</file>
                 </navigation>
 
             </screens>

diff --git a/themes/survey/vanilla/views/subviews/navigation/navigator_complement.twig b/themes/survey/vanilla/views/subviews/navigation/navigator_complement.twig
@@ -3,19 +3,22 @@
     Copyright (C) 2018 The LimeSurvey Project Team
     This file render extra part for navigator
 #}
-<!-- extra tools, can be shown with javascript too (just remove ls-js-hidden class -->
-<div class="row ls-js-hidden">
-    <!-- Extra button container -->
-    <div class="col-xs-6 clearall-saveall-wrapper">
-        {% if aSurveyInfo.aNavigator.load.show == "Y" or aSurveyInfo.bShowClearAll == true %}
-            {{ include('./subviews/navigation/save_buttons.twig') }}
-        {% endif %}
-        {% if aSurveyInfo.bShowClearAll == true %}
-            {{ include('./subviews/navigation/clearall_buttons.twig') }}
+{% if aSurveyInfo.aNavigator.load.show == "Y" or aSurveyInfo.aNavigator.save.show == "Y" or aSurveyInfo.aQuestionIndex.bShow == true %}
+    <!-- extra tools, can be shown with javascript too (just remove ls-js-hidden class -->
+    <div class="row ls-js-hidden">
+        <!-- Extra button container -->
+        <div class="col-xs-6 clearall-saveall-wrapper">
+            {% if aSurveyInfo.aNavigator.load.show == "Y" or aSurveyInfo.aNavigator.save.show == "Y" %}
+                {{ include('./subviews/navigation/save_buttons.twig') }}
+            {% endif %}
+            {% if aSurveyInfo.bShowClearAll == true %}
+                {{ include('./subviews/navigation/clearall_buttons.twig') }}
+            {% endif %}
+        </div>
+         <!-- Index container -->
+        {% if (aSurveyInfo.aQuestionIndex.bShow == true) %}
+            {{ include('./subviews/navigation/question_index_buttons.twig') }}
         {% endif %}
     </div>
-     <!-- Index container -->
-    {% if (aSurveyInfo.aQuestionIndex.bShow == true) %}
-        {{ include('./subviews/navigation/question_index_buttons.twig') }}
-    {% endif %}
-</div>
+{% endif %}
+