Fixed issue: template.css not loaded after all other template styles

LimeSurvey · Oct 30, 2017 · b516c1a · b516c1a
1 parent 93ae9ea
commit b516c1a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/installer/create-database.php b/installer/create-database.php
@@ -752,11 +752,11 @@ function createDatabase($oDB){
         $oDB->createCommand()->createIndex('{{idx4_template_configuration}}', '{{template_configuration}}', 'uid', false);
 
         $headerArray = ['template_name','sid','gsid','uid','files_css','files_js','files_print_css','options','cssframework_name','cssframework_css','cssframework_js','packages_to_load','packages_ltr','packages_rtl'];
-        $oDB->createCommand()->insert("{{template_configuration}}", array_combine($headerArray,['default',NULL,NULL,NULL,'{"add": ["css/template.css", "css/animate.css"]}','{"add": ["scripts/template.js"]}','{"add":"css/print_template.css",}','{"ajaxmode":"on","brandlogo":"on", "brandlogofile": "./files/logo.png", "boxcontainer":"on", "backgroundimage":"off","animatebody":"off","bodyanimation":"fadeInRight","animatequestion":"off","questionanimation":"flipInX","animatealert":"off","alertanimation":"shake"}','bootstrap','{"replace": [["css/bootstrap.css","css/flatly.css"]]}','','["pjax"]','','']));
+        $oDB->createCommand()->insert("{{template_configuration}}", array_combine($headerArray,['default',NULL,NULL,NULL,'{"add": ["css/animate.css","css/template.css"]}','{"add": ["scripts/template.js"]}','{"add":"css/print_template.css",}','{"ajaxmode":"on","brandlogo":"on", "brandlogofile": "./files/logo.png", "boxcontainer":"on", "backgroundimage":"off","animatebody":"off","bodyanimation":"fadeInRight","animatequestion":"off","questionanimation":"flipInX","animatealert":"off","alertanimation":"shake"}','bootstrap','{"replace": [["css/bootstrap.css","css/flatly.css"]]}','','["pjax"]','','']));
 
-        $oDB->createCommand()->insert("{{template_configuration}}", array_combine($headerArray,['material',NULL,NULL,NULL,'{"add": ["css/template.css", "css/bootstrap-material-design.css", "css/ripples.min.css"]}','{"add": ["scripts/template.js", "scripts/material.js", "scripts/ripples.min.js"]}','{"add":"css/print_template.css",}','{"ajaxmode":"on","brandlogo":"on", "brandlogofile": "./files/logo.png", "animatebody":"off","bodyanimation":"fadeInRight","animatequestion":"off","questionanimation":"flipInX","animatealert":"off","alertanimation":"shake"}','bootstrap','{"replace": [["css/bootstrap.css","css/bootstrap.css"]]}','','["pjax"]','','']));
+        $oDB->createCommand()->insert("{{template_configuration}}", array_combine($headerArray,['material',NULL,NULL,NULL,'{"add": ["css/bootstrap-material-design.css", "css/ripples.min.css", "css/template.css",]}','{"add": ["scripts/template.js", "scripts/material.js", "scripts/ripples.min.js"]}','{"add":"css/print_template.css",}','{"ajaxmode":"on","brandlogo":"on", "brandlogofile": "./files/logo.png", "animatebody":"off","bodyanimation":"fadeInRight","animatequestion":"off","questionanimation":"flipInX","animatealert":"off","alertanimation":"shake"}','bootstrap','{"replace": [["css/bootstrap.css","css/bootstrap.css"]]}','','["pjax"]','','']));
 
-        $oDB->createCommand()->insert("{{template_configuration}}", array_combine($headerArray,['monochrome',NULL,NULL,NULL,'{"add":["css/template.css","css/animate.css","css/ajaxify.css","css/sea_green.css"]}','{"add":["scripts/template.js","scripts/ajaxify.js"]}','{"add":"css/print_template.css",}','{"ajaxmode":"off","brandlogo":"on","brandlogofile":".\/files\/logo.png","boxcontainer":"on","backgroundimage":"off","animatebody":"off","bodyanimation":"fadeInRight","animatequestion":"off","questionanimation":"flipInX","animatealert":"off","alertanimation":"shake"}','bootstrap','{}','','["pjax"]','','']));        
+        $oDB->createCommand()->insert("{{template_configuration}}", array_combine($headerArray,['monochrome',NULL,NULL,NULL,'{"add":["css/animate.css","css/ajaxify.css","css/sea_green.css", "css/template.css",]}','{"add":["scripts/template.js","scripts/ajaxify.js"]}','{"add":"css/print_template.css",}','{"ajaxmode":"off","brandlogo":"on","brandlogofile":".\/files\/logo.png","boxcontainer":"on","backgroundimage":"off","animatebody":"off","bodyanimation":"fadeInRight","animatequestion":"off","questionanimation":"flipInX","animatealert":"off","alertanimation":"shake"}','bootstrap','{}','','["pjax"]','','']));
 
         //tutorials
         $oDB->createCommand()->createTable(

diff --git a/templates/default/config.xml b/templates/default/config.xml
@@ -27,9 +27,9 @@
     -->
     <files>
         <css>
-            <add>css/template.css</add>
             <add>css/animate.css</add>
             <add>css/ajaxify.css</add>
+            <add>css/template.css</add>            
         </css>
         <js>
             <add>scripts/template.js</add>

diff --git a/templates/material/config.xml b/templates/material/config.xml
@@ -28,9 +28,9 @@
     -->
     <files>
         <css>
-            <add>css/template.css</add>
             <add>css/bootstrap-material-design.css</add>
             <add>css/ripples.min.css</add>
+            <add>css/template.css</add>            
         </css>
         <js>
             <add>scripts/template.js</add>

diff --git a/templates/monochrome/config.xml b/templates/monochrome/config.xml
@@ -27,10 +27,10 @@
     -->
     <files>
         <css>
-            <add>css/template.css</add>
             <add>css/animate.css</add>
             <add>css/ajaxify.css</add>
             <add>css/sea_green.css</add>
+            <add>css/template.css</add>            
         </css>
         <js>
             <add>scripts/template.js</add>

diff --git a/templates/monochrome/options/options.js b/templates/monochrome/options/options.js
@@ -114,7 +114,7 @@ var prepare = function(){
                     currentThemeObject = JSON.parse($('#TemplateConfiguration_files_css').val());
                 } catch(e){ console.error('No valid monochrom theme field!'); }
 
-                currentThemeObject = {"add" : ['css/template.css','css/animate.css','css/ajaxify.css', '']};
+                currentThemeObject = {"add" : ['css/animate.css','css/ajaxify.css', 'css/template.css', '']};
                 $('#simple_edit_add_css').val(currentThemeObject.add[0][1]);
             }
 
@@ -125,7 +125,7 @@ var prepare = function(){
                 } else {
 
                     currentThemeObject = {};
-                    currentThemeObject.add = ['css/template.css','css/animate.css','css/ajaxify.css', $('#simple_edit_add_css').val()];
+                    currentThemeObject.add = ['css/animate.css','css/ajaxify.css', $('#simple_edit_add_css').val(), 'css/template.css'];
                     $('#TemplateConfiguration_files_css').val(JSON.stringify(currentThemeObject));
                 }
             })