fix MDL-27801

moodle · Jun 9, 2011 · b0f3720 · b0f3720
1 parent 6911fa1
commit b0f3720
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/theme/formal_white/db/install.php b/theme/formal_white/db/install.php
@@ -58,10 +58,23 @@ function xmldb_theme_formal_white_install() {
     // Remove alwayslangmenu
     unset_config('alwayslangmenu', 'theme_formal_white');
 
-    // Create a new config setting called lblockcolumnbgc and give it blockcolumnbgc's value.
-    set_config('lblockcolumnbgc', $currentsetting->blockcolumnbgc, 'theme_formal_white');
-    // Remove blockcolumnbgc
-    unset_config('blockcolumnbgc', 'theme_formal_white');
-
+    // previous releases of formal_white them were not equipped with version number
+    // so I can not know if a theme specific variable exists or not.
+    // This is the reason why I try to use them both.
+    if (isset($currentsetting->backgroundcolor)) {
+        // Create a new config setting called lblockcolumnbgc and give it backgroundcolor's value.
+        set_config('lblockcolumnbgc', $currentsetting->backgroundcolor, 'theme_formal_white');
+        // Remove backgroundcolor
+        unset_config('backgroundcolor', 'theme_formal_white');
+    } elseif (isset($currentsetting->blockcolumnbgc)) {
+		// Create a new config setting called lblockcolumnbgc and give it blockcolumnbgc's value.
+		set_config('lblockcolumnbgc', $currentsetting->blockcolumnbgc, 'theme_formal_white');
+		// Remove blockcolumnbgc
+		unset_config('blockcolumnbgc', 'theme_formal_white');
+    } else {
+		// Create a new config setting called lblockcolumnbgc and give it the default value.
+		set_config('lblockcolumnbgc', '#E3DFD4', 'theme_formal_white');
+    }
+
     return true;
 }
diff --git a/theme/formal_white/style/core.css b/theme/formal_white/style/core.css
@@ -183,12 +183,19 @@ input[type="radio"] {
     margin-left: 21%;
 }
 
+/* Admin management
+-----------------------*/
+.plugincompattable {
+    font-size: 100%;
+    text-align: left;
+}
+
 /* User
 -----------------------*/
 
 .userinfobox {
-border-color: #ddd;
-padding: 0
+    border-color: #ddd;
+    padding: 0
 }
 
 .userinfobox .content {

diff --git a/theme/formal_white/style/formal_white.css b/theme/formal_white/style/formal_white.css
@@ -70,7 +70,7 @@ h1.headerheading {margin:14px 11px 8px 11px;float:left;font-size:200%;}
 .breadcrumb {margin-left:0.8em;}
 
 /* generalbox */
-.generalbox {border-color:#E3DFD4;}
+.generalbox {border-color:#E3DFD4;padding:1em;}
 
 /* generalbox */
 #page-admin-setting-manageauths .generalbox {border:none;}
@@ -88,6 +88,8 @@ h1.headerheading {margin:14px 11px 8px 11px;float:left;font-size:200%;}
 #page-admin-course-category .generalbox td,
 #attempts th,
 #attempts td,
+.plugincompattable th,
+.plugincompattable td,
 .environmenttable th,
 .environmenttable td,
 .forumheaderlist td,