Dev: more classes and attr to core

LimeSurvey · Aug 28, 2017 · 1079ecc · 1079ecc
1 parent ad4cc94
commit 1079ecc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -1740,7 +1740,7 @@ private function setClassAndIds()
     {
 
         // Welcome
-        $this->aSurveyInfo['id']['welcomecontainer']     =  ' welcome-container ';
+        $this->aSurveyInfo['id']['welcomecontainer']     =  'welcome-container ';
         $this->aSurveyInfo['class']['welcomecontainer']  = '';
         $this->aSurveyInfo['class']['surveyname']        = " survey-name text-center ";
         $this->aSurveyInfo['class']['description']       = " text-info text-center survey-description ";
@@ -1751,12 +1751,13 @@ private function setClassAndIds()
         $this->aSurveyInfo['attr']['questioncounttext'] = '';
 
         // Global
-        $this->aSurveyInfo['id']['outerframe'] = 'outerframeContainer' ;
-        $this->aSurveyInfo['id']['mainrow'] = 'main-row' ;
-        $this->aSurveyInfo['id']['maincol'] = 'main-col' ;
+        $this->aSurveyInfo['id']['outerframe']    = 'outerframeContainer' ;
+        $this->aSurveyInfo['id']['mainrow']       = 'main-row' ;
+        $this->aSurveyInfo['id']['maincol']       = 'main-col' ;
+        $this->aSurveyInfo['id']['dynamicreload'] = 'dynamicReloadContainer' ;
 
         $this->aSurveyInfo['class']['html']  = 'no-js';
-        $this->aSurveyInfo['class']['body']  = 'default';
+        $this->aSurveyInfo['class']['body']  = '';
         $this->aSurveyInfo['class']['outerframe'] = ' outerframe container ' ;
         $this->aSurveyInfo['class']['maincol'] = ' col-centered ' ;
         $this->aSurveyInfo['attr']['html']   = $thissurvey['attr']['body'] = $thissurvey['attr']['mainrow'] = $thissurvey['attr']['maincol']  = '';

diff --git a/templates/default/views/layout_errors.twig b/templates/default/views/layout_errors.twig
@@ -26,7 +26,7 @@
 {% set aError     = aSurveyInfo.aError    %}
 
 <!DOCTYPE html>
-<html lang="{{ aSurveyInfo.languagecode }}" dir="{{ aSurveyInfo.dir }}" class="no-js {{ aSurveyInfo.languagecode }} dir-{{ aSurveyInfo.dir }} ">
+<html lang="{{ aSurveyInfo.languagecode }}" dir="{{ aSurveyInfo.dir }}" class="{{ aSurveyInfo.languagecode }} dir-{{ aSurveyInfo.dir }} {{ aSurveyInfo.class.html }}" {{ aSurveyInfo.attr.html }}>
 
     <head>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
@@ -118,7 +118,7 @@
         <link rel="shortcut icon" href="{{ templateurl }}favicon.ico" />
     </head>
 
-    <body  class="default lang-{{surveylanguage}} {{surveyformat}}" marginwidth="0" marginheight="0">
+    <body  class="{{ aSurveyInfo.class.body }} default lang-{{surveylanguage}} {{surveyformat}}" marginwidth="0" marginheight="0" {{ aSurveyInfo.attr.body }}>
         <div id="block_error">
             <div>
                 <h2>{{ aError.title }}</h2>

diff --git a/templates/default/views/layout_global.twig b/templates/default/views/layout_global.twig
@@ -21,14 +21,14 @@
         {# Headers, metadata, etc #}
         {{ include('./subviews/head.twig') }}
 
-    <body class="{{ aSurveyInfo.class.body }} lang-{{aSurveyInfo.languagecode}} {{aSurveyInfo.surveyformat}} {% if( aSurveyInfo.options.brandlogo == "on") %}brand-logo{%endif%}" {{ aSurveyInfo.attr.body }} >
+    <body class="default {{ aSurveyInfo.class.body }} lang-{{aSurveyInfo.languagecode}} {{aSurveyInfo.surveyformat}} {% if( aSurveyInfo.options.brandlogo == "on") %}brand-logo{%endif%}" {{ aSurveyInfo.attr.body }} >
     {% if (aSurveyInfo.options.ajaxmode == "on" ) %}
         <div class="progress ajax_loading_indicator" id="ajax_loading_indicator">
             <div class="progress-bar progress-bar-info ajax_loading_indicator_bar" id="ajax_loading_indicator_bar" role="progressbar">
             </div>
         </div>
     {% endif %}
-    
+
     {% if (aSurveyInfo.options.backgroundimage == "on") %}
         {{ registerTemplateCssFile("css/background-image.css") }}
     {% endif %}
@@ -43,7 +43,7 @@
 
 {# Ajaxify cannot handle an element that is a direct child of body, so => create simple wrapper section #}
 <section>
-<div id="dynamicReloadContainer">
+<div id="{{ aSurveyInfo.id.dynamicreload }}">
 {% block body %}
 
     {# Bootstrap Navigation Bar: the top menu #}

diff --git a/templates/default/views/layout_user_forms.twig b/templates/default/views/layout_user_forms.twig
@@ -18,12 +18,12 @@ TODO: register
 #}
 
 <!DOCTYPE html>
-<html lang="{{ aSurveyInfo.languagecode }}" dir="{{ aSurveyInfo.dir }}" class="no-js {{ aSurveyInfo.languagecode }} dir-{{ aSurveyInfo.dir }} ">
+<html lang="{{ aSurveyInfo.languagecode }}" dir="{{ aSurveyInfo.dir }}" class="{{ aSurveyInfo.class.html }} {{ aSurveyInfo.languagecode }} dir-{{ aSurveyInfo.dir }} " {{ aSurveyInfo.attr.html }}>
 
     {# Headers, metadatas, etc #}
     {{ include('./subviews/head.twig') }}
 
-    <body class="default lang-{{surveylanguage}} {{surveyformat}}">
+    <body class="default {{ aSurveyInfo.class.body }} lang-{{surveylanguage}} {{surveyformat}}" {{ aSurveyInfo.attr.body }}>
 
         {# Bootstrap Navigation Bar: the top menu #}
         {{ include('./subviews/nav_bar.twig') }}
@@ -104,7 +104,7 @@ TODO: register
                                             <span class="sr-only text-danger asterisk">
                                                 ( {{ "Mandatory" | t }} )
                                             <span>
-                                            
+
                                         </label>
 
                                         <div class='col-sm-7 load-survey-input input-cell'>