Dev: replaced "box container" option by a "container fluid" option

LimeSurvey · Dec 6, 2017 · 80687d7 · 80687d7
1 parent be94a99
commit 80687d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/themes/survey/fruity/config.xml b/themes/survey/fruity/config.xml
@@ -55,7 +55,7 @@
         <ajaxmode>off</ajaxmode>
         <brandlogo>on</brandlogo>
         <brandlogofile>./files/logo.png</brandlogofile>
-        <boxcontainer>on</boxcontainer>
+        <container>on</container>
         <backgroundimage>off</backgroundimage>
         <backgroundimagefile>./files/pattern.png</backgroundimagefile>
         <animatebody>off</animatebody>

diff --git a/themes/survey/fruity/options/options.twig b/themes/survey/fruity/options/options.twig
@@ -318,23 +318,23 @@
                 </div>
 
                 <div class='col-sm-12 col-md-6'>
-                    {# Box container #}
+                    {# Container #}
                     <div class='form-group row'>
-                        <label for='simple_edit_options_backgroundimage' class='control-label'>Box container</label>
+                        <label for='simple_edit_options_backgroundimage' class='control-label'>Container</label>
                         <div class='col-sm-12'>
                             <div class="btn-group" data-toggle="buttons">
                                 <label class="btn btn-default">
-                                    <input type='radio' name='boxcontainer' value='on' class='selector_option_radio_field simple_edit_options_boxcontainer ' data-id='boxcontainer'/>
+                                    <input type='radio' name='container' value='on' class='selector_option_radio_field simple_edit_options_container ' data-id='container'/>
                                     Yes
                                 </label>
                                 <label class="btn btn-default">
-                                    <input type='radio' name='boxcontainer' value='off' class='selector_option_radio_field simple_edit_options_boxcontainer ' data-id='boxcontainer'/>
+                                    <input type='radio' name='container' value='off' class='selector_option_radio_field simple_edit_options_container ' data-id='container'/>
                                     No
                                 </label>
                                 {# If this is a root template setting, don't show the inherit button #}
                                 {% if templateConfiguration.sid is not empty or templateConfiguration.gsid is not empty %}
                                     <label class="btn btn-default">
-                                        <input type='radio' name='boxcontainer' value='inherit' class='selector_option_radio_field simple_edit_options_boxcontainer ' data-id='boxcontainer'/>
+                                        <input type='radio' name='container' value='inherit' class='selector_option_radio_field simple_edit_options_container ' data-id='container'/>
                                         Inherit
                                     </label>
                                 {% endif %}

diff --git a/themes/survey/fruity/views/subviews/content/outerframe.twig b/themes/survey/fruity/views/subviews/content/outerframe.twig
@@ -19,7 +19,7 @@
 #}
 
 <!-- outer frame container -->
-<div class="{{ aSurveyInfo.class.outerframe }} container {% if (aSurveyInfo.options.animatebody == "on") %} animated {{ aSurveyInfo.options.bodyanimation }} {%endif%}" id="{{ aSurveyInfo.id.outerframe }}" {{ aSurveyInfo.attr.outerframe }} >
+<div class="{{ aSurveyInfo.class.outerframe }} {% if (aSurveyInfo.options.container == "on") %} container {%else%} container-fluid {%endif%} {% if (aSurveyInfo.options.animatebody == "on") %} animated {{ aSurveyInfo.options.bodyanimation }} {%endif%}" id="{{ aSurveyInfo.id.outerframe }}" {{ aSurveyInfo.attr.outerframe }} >
     {# Wich file to include for content is decided inside the layout #}
     {% include './subviews/content/mainrow.twig' with {'include_content': include_content } %}
 </div>