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

Conflicts:
	include/items.php
	util/messages.po

3 files changed, 16 insertions, 5 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 946e2d7d7..ad203867c 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1889,7 +1889,6 @@ nav .dropdown-menu {
 	color: #31708f;
 	background-color: #d9edf7;
 	margin-bottom: 3px;
-	border-radius: $radiuspx;
 	text-align: center;
 }
 
@@ -1898,7 +1897,6 @@ nav .dropdown-menu {
 	color: #8a6d3b;
 	background-color: #fcf8e3;
 	margin-bottom: 3px;
-	border-radius: $radiuspx;
 	text-align: center;
 }
 
@@ -1907,10 +1905,20 @@ nav .dropdown-menu {
 	color: #a94442;
 	background-color: #f2dede;
 	margin-bottom: 3px;
-	border-radius: $radiuspx;
 	text-align: center;
 }
 
+.section-content-tools-wrapper .section-content-info-wrapper,
+.section-content-wrapper .section-content-info-wrapper,
+.section-content-tools-wrapper .section-content-warning-wrapper,
+.section-content-wrapper .section-content-warning-wrapper,
+.section-content-tools-wrapper .section-content-danger-wrapper,
+.section-content-wrapper .section-content-danger-wrapper {
+	margin-bottom: 0px;
+	border-radius: $radiuspx;
+}
+
+
 .section-content-wrapper {
 	padding: 7px 10px;
 	background-color: $comment_item_colour;
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 2603fb267..fe3ea9742 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -84,8 +84,10 @@ function redbasic_form(&$a, $arr) {
 	if($files) {
 		foreach($files as $file) {
 			$f = basename($file, ".php");
-			$scheme_name = $f;
-			$scheme_choices[$f] = $scheme_name;
+			if($f != 'default') {
+				$scheme_name = $f;
+				$scheme_choices[$f] = $scheme_name;
+			}
 		}
 	}
 
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 956c1951c..6e68d38d5 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -70,6 +70,7 @@ if (($schema) && ($schema != '---')) {
 
 // If we haven't got a schema, load the default.  We shouldn't touch this - we
 // should leave it for admins to define for themselves.
+// default.php and default.css MUST be symlinks to existing schema files.
 if (! $schema) {
 
 	if(file_exists('view/theme/redbasic/schema/default.php')) {