From c1e0987b880c116b392d65a2b40cda2fd53debe0 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 21 Jun 2015 17:53:44 +0200
Subject: [PATCH] do not show default in scheme selection dropdown. default.php
 and default.css should be symlinks. adjust doco accordingly.

---
 doc/Schema-development.md          | 1 +
 doc/schema_development.bb          | 1 +
 view/theme/redbasic/php/config.php | 6 ++++--
 view/theme/redbasic/php/style.php  | 1 +
 view/tpl/photos_upload.tpl         | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/Schema-development.md b/doc/Schema-development.md
index 3ac96a02b..e811bb8c3 100644
--- a/doc/Schema-development.md
+++ b/doc/Schema-development.md
@@ -30,6 +30,7 @@ If no personal options are set, and no schema is selected, we will first try to
 with the file name "default.php".  This file should never be included with a theme.  If it
 is, merge conflicts will occur as people update their code.  Rather, this should be defined
 by administrators on a site by site basis.
+default.php and default.css MUST be symlinks to existing scheme files.
 
 You schema does not need to - and should not - contain all of these values.  Only the values
 that differ from the defaults should be listed.  This gives you some very powerful options
diff --git a/doc/schema_development.bb b/doc/schema_development.bb
index 998111431..3d4c84e85 100644
--- a/doc/schema_development.bb
+++ b/doc/schema_development.bb
@@ -28,6 +28,7 @@ If no personal options are set, and no schema is selected, we will first try to
 with the file name &quot;default.php&quot;.  This file should never be included with a theme. If it
 is, merge conflicts will occur as people update their code. Rather, this should be defined
 by administrators on a site by site basis.
+default.php and default.css MUST be symlinks to existing scheme files.
 
 You schema does not need to - and should not - contain all of these values.  Only the values
 that differ from the defaults should be listed.  This gives you some very powerful options
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 8ab31efc0..c0b2b6da9 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')) {
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 06e3ef612..ee0bbd86b 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -1,4 +1,4 @@
-<div id="photo-upload-form" class="generic-content-wrapper">
+<div id="photo-upload-form">
 	<div class="section-content-tools-wrapper">
 		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
 			<input type="hidden" id="photos-upload-source" name="source" value="photos" />