Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

LimeSurvey · Mar 24, 2016 · f6ade6d · f6ade6d
2 parents 3788e72 + c55c3d0
commit f6ade6d
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 1,709 deletions.
diff --git a/application/controllers/admin/templates.php b/application/controllers/admin/templates.php
@@ -952,6 +952,8 @@ protected function _initialise($templatename, $screenname, $editfile, $showsumma
             // User templates (are published only if exists)
             $oEditedTemplate->config->files->css->filename[]="../../../styles-public/bootstrap-for-template-editor.css";
             $oEditedTemplate->config->files->js->filename[]="../../../scripts/bootstrap-for-template-editor.js";
+
+            $oEditedTemplate->config->files->css->filename[]="../../styles-public/template.css";
         }
 
         //App()->getClientScript()->reset();

diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
@@ -62,6 +62,7 @@ public function run()
         if($oTemplate->cssFramework == 'bootstrap')
         {
             App()->bootstrap->register();
+            App()->getClientScript()->registerCssFile( Yii::app()->getBaseUrl(true).'/styles-public/template.css' );
         }
 
         useFirebug();

diff --git a/templates/default/css/template.css → styles-public/template.css b/templates/default/css/template.css → styles-public/template.css
diff --git a/templates/default/config.xml b/templates/default/config.xml
@@ -28,7 +28,6 @@
             <filename>css/jquery-ui-custom.css</filename>
             <filename>css/bootstrap-slider.css</filename>
             <filename>css/flat_and_modern.css</filename>
-            <filename>css/template.css</filename>
         </css>
         <js>
             <filename>scripts/template.js</filename>
@@ -59,7 +58,6 @@
     <files_editable>
             <css>
                 <filename>css/flat_and_modern.css</filename>
-                <filename>css/template.css</filename>
             </css>
             <js>
                 <filename>scripts/template.js</filename>

diff --git a/templates/minimal-config.xml b/templates/minimal-config.xml
@@ -25,7 +25,6 @@
     <!-- For template editor : need fix : allow edit even if not exist-->
     <files_editable>
             <css>
-                <filename>template.css</filename>
                 <filename>template-rtl.css</filename>
                 <filename>jquery-ui.css</filename>
                 <filename>jquery-ui-custom.css</filename>

diff --git a/templates/news_paper/config.xml b/templates/news_paper/config.xml
@@ -27,7 +27,6 @@
             <filename>css/jquery-ui-custom.css</filename>
             <filename>css/bootstrap-slider.css</filename>
             <filename>css/news_paper.css</filename>
-            <filename>css/template.css</filename>
         </css>
         <js>
             <filename>scripts/template.js</filename>
@@ -47,7 +46,7 @@
         <!-- The logo is used for now only for Surveys List  -->
         <logo>
             <filename>files/logo.png</filename>
-        </logo>        
+        </logo>
     </files>
 
     <!--
@@ -58,7 +57,6 @@
     <files_editable>
             <css>
                 <filename>css/news_paper.css</filename>
-                <filename>css/template.css</filename>
             </css>
             <js>
                 <filename>scripts/template.js</filename>