Dev: moved classes, id and attribute to core for language_changer.twig

LimeSurvey · Aug 18, 2017 · a123641 · a123641
1 parent 93810bf
commit a123641
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -1779,6 +1779,14 @@ private function setClassAndIds()
         $this->aSurveyInfo['attr']['navbartoggle']    = ' data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar" ';
         $this->aSurveyInfo['attr']['navbar']  =  $this->aSurveyInfo['attr']['navbarheader']  = $this->aSurveyInfo['attr']['navbarbrand'] = $this->aSurveyInfo['attr']['navbarcollapse']  = $this->aSurveyInfo['attr']['navbarlink'] = '';
 
+        // Language changer
+        $this->aSurveyInfo['class']['languagechanger'] = '  form-inline form-change-lang  ';
+        $this->aSurveyInfo['class']['formgroup']       = '  form-group ';
+        $this->aSurveyInfo['class']['controllabel']    = '  control-label  ';
+        $this->aSurveyInfo['class']['formcontrol']     = '  form-control  ';
+        $this->aSurveyInfo['class']['aLCDWithForm']    = '  btn btn-default ls-js-hidden  ';
+
+
 
         // Maybe add a plugin event here?
 

diff --git a/templates/default/views/subviews/language_changer.twig b/templates/default/views/subviews/language_changer.twig
@@ -30,15 +30,15 @@
     #}
     {% set htmlOptions = {
             'id'             : false,
-            'class'          : 'form-control',
+            'class'          : aSurveyInfo.class.formcontrol,
             'data-targeturl' : aLCD.targetUrl,
         }
     %}
 
     <!-- Language Changer -->
-    <div class="form-inline form-change-lang {{ aSurveyInfo.alanguageChanger.sClass }} " >
-        <label class="form-group">
-            <span class="control-label">{{ "Language:" | t }}</span>
+    <div class=" {{ aSurveyInfo.class.languagechanger }} " >
+        <label class="{{ aSurveyInfo.class.formgroup }}">
+            <span class="{{ aSurveyInfo.class.controllabel }}">{{ "Language:" | t }}</span>
             {{
                 C.Html.dropDownList(
                     'lang',
@@ -50,22 +50,22 @@
 
         </label>
 
-            {% if aLCD.withForm == true %}
-                <!-- for no js functionality (need form) -->
-                {% set buttonhtmlOptions = {
-                        'type' : 'submit',
-                        'value': 'changelang',
-                        'name' : 'move',
-                        'class': 'btn btn-default ls-js-hidden',
-                        }
-                %}
+        {% if aLCD.withForm == true %}
+            <!-- for no js functionality (need form) -->
+            {% set buttonhtmlOptions = {
+                    'type' : 'submit',
+                    'value': 'changelang',
+                    'name' : 'move',
+                    'class': aSurveyInfo.class.aLCDWithForm,
+                }
+            %}
 
-                {{
-                    C.Html.htmlButton(
+            {{
+                C.Html.htmlButton(
                     ("Change the language" | gT ),
                     htmlOptions
-                    )
-                }}
+                )
+            }}
             {% endif %}
     </div>
 {% endif %}