Dev: put new twig in vanilla

LimeSurvey · Jun 23, 2018 · 8d22e28 · 8d22e28
1 parent b119cd4
commit 8d22e28
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/themes/survey/vanilla/config.xml b/themes/survey/vanilla/config.xml
@@ -113,6 +113,7 @@
                     <file type="view" role="subview">./subviews/footer/footer.twig</file>
                     <file type="view" role="subview">./subviews/content/mainrow.twig</file>
                     <file type="view" role="subview">./subviews/content/outerframe.twig</file>
+                    <file type="view" role="subview">./subviews/navigation/language_changer_form.twig</file>
                     <file type="css">./css/theme.css</file>
                     <file type="js">./scripts/theme.js</file>
                     <file type="css">./css/custom.css</file>
@@ -133,7 +134,7 @@
                     <file type="view" role="subview">./subviews/messages/warnings.twig</file>
                     <file type="view" role="subview">./subviews/messages/no_js_alert.twig</file>
                     <file type="view" role="subview">./subviews/privacy/privacy.twig</file>
-                    <file type="view" role="subview">./subviews/navigation/language_changer_first_page.twig</file>
+                    <file type="view" role="subview">./subviews/navigation/language_changer.twig</file>
                     <file type="css">./css/theme.css</file>
                     <file type="js">./scripts/theme.js</file>
                     <file type="css">./css/custom.css</file>
@@ -237,6 +238,7 @@
                     <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/language_changer.twig</file>
                     <file type="view" role="subview">./subviews/navigation/question_index_menu.twig</file>
                     <file type="view" role="subview">./subviews/navigation/navigator.twig</file>
                     <file type="view" role="subview">./subviews/navigation/navigator_complement.twig</file>

diff --git a/themes/survey/vanilla/views/subviews/content/firstpage.twig b/themes/survey/vanilla/views/subviews/content/firstpage.twig
@@ -27,7 +27,7 @@
     {{ include('./subviews/messages/no_js_alert.twig') }}
 
     {# Include the language changer selector #}
-    {{ include('./subviews/navigation/language_changer_first_page.twig') }}
+    {{ include('./subviews/navigation/language_changer.twig') }}
 
     {# If survey mode is "All in One", this will add the welcome/privacy messages (if activated) #}
     {{ include('./subviews/messages/welcome.twig') }}

diff --git a/themes/survey/vanilla/views/subviews/registration/register_head.twig b/themes/survey/vanilla/views/subviews/registration/register_head.twig
@@ -15,8 +15,8 @@
 
 #}
 
-<div class="pull-right">
-    {{ include('./subviews/navigation/language_changer_first_page.twig') }}
+<div class="pull-right ls-no-js-hidden">
+    {{ include('./subviews/navigation/language_changer.twig') }}
 </div>
 
 <div class="{{ aSurveyInfo.class.registerhead }} row h2" {{ aSurveyInfo.attr.registerhead }}>