Merge https://github.com/friendica/red into zpull

4 files changed, 63 insertions, 16 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a43dbf55f..33e48bd80 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -8,17 +8,17 @@
 
 /* generals */
 body {
-	font-family: arial,freesans,clean,sans-serif;
+	font-family: arial,freesans,sans-serif;
 	font-size: 12px;
-	background-color: #$background_colour;
+	background-color: $bgcolour;
 	background-image: url('$background_image');
 	background-attachment: fixed;
 	background-size: cover;
-	color: #$font_colour;
+	color: $font_colour;
 	margin: 0px;
 }
 .jslider {
-	font-family: arial,freesans,clean,sans-serif;
+	font-family: arial,freesans,sans-serif;
 }
 
 abbr {
@@ -117,7 +117,7 @@ blockquote {
 	filter:alpha(opacity=100);
 }
 
-nav {background-image: linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%);
+nav {background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
 	      background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
 	      background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%);
 	      background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
@@ -823,7 +823,7 @@ footer {
 	margin-top: 10px;
 	position: relative;
 	border-radius: $radiuspx;
-	background-color: #$item_colour;
+	background-color: $item_colour;
 	opacity: $item_opacity;
 }
 
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index c5c2be5df..be021e85c 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -3,8 +3,9 @@
 function theme_content(&$a) {
 	if(!local_user()) { return;}
 
+	$schema = get_pconfig(local_user(),'redbasic', 'schema' );
 	$nav_colour = get_pconfig(local_user(),'redbasic', 'nav_colour' );
-	$background_colour = get_pconfig(local_user(),'redbasic', 'background_colour' );
+	$bgcolour = get_pconfig(local_user(),'redbasic', 'bgcolour' );
 	$background_image = get_pconfig(local_user(),'redbasic', 'background_image' );
 	$item_colour = get_pconfig(local_user(),'redbasic', 'item_colour' );
 	$item_opacity = get_pconfig(local_user(),'redbasic', 'item_opacity' );
@@ -12,7 +13,7 @@ function theme_content(&$a) {
 	$font_colour = get_pconfig(local_user(),'redbasic', 'font_colour' );
 	$radius = get_pconfig(local_user(),'redbasic', 'radius' );
 	$shadow = get_pconfig(local_user(),'redbasic', 'photo_shadow' );
-	return redbasic_form($a, $nav_colour, $background_colour, $background_image, $item_colour, $item_opacity, 
+	return redbasic_form($a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, 
 		$font_size, $font_colour, $radius, $shadow);
 }
 
@@ -20,6 +21,7 @@ function theme_post(&$a) {
 	if(!local_user()) { return;}
 
 	if (isset($_POST['redbasic-settings-submit'])) {
+		set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']);
 		set_pconfig(local_user(), 'redbasic', 'nav_colour', $_POST['redbasic_nav_colour']);
 		set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']);
 		set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']);
@@ -32,22 +34,40 @@ function theme_post(&$a) {
 	}
 }
 
-function redbasic_form(&$a, $nav_colour, $background_colour, $background_image, $item_colour, $item_opacity, 
+function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, 
 		$font_size, $font_colour, $radius, $shadow) {
 
+	$scheme_choices = array();
+	$scheme_choices["---"] = t("Default");
+	$files = glob('view/theme/' . current_theme() . '/schema/*');
+	if($files) {
+		foreach($files as $file) {
+			$f = basename($file, ".php");
+			$scheme_name = $f;
+			$scheme_choices[$f] = $scheme_name;
+		}
+	}
+		
+		
 		$nav_colours = array (
+		  '' => 'Scheme Default',
 		  'red' => 'red',
 		  'black' => 'black',	
 		  'silver' => 'silver',	
 		);
 
+if(feature_enabled(local_user(),'expert')) 
+				$expert = 1;
+					
 	  $t = get_markup_template('theme_settings.tpl');
 	  $o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
 		'$baseurl' => $a->get_baseurl(),
+		'$expert' => $expert,
 		'$title' => t("Theme settings"),
+		'$schema' => array('redbasic_schema', t('Set scheme'), $schema, '', $scheme_choices),
 		'$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $nav_colour, '', $nav_colours),
-		'$background_colour' => array('redbasic_background_colour', t('Set the background colour'), $background_colour),
+		'$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $bgcolour),
 		'$background_image' => array('redbasic_background_image', t('Set the background image'), $background_image),
 		'$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $item_colour),
 		'$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $item_opacity),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index cb17f8298..0245680d7 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -29,15 +29,35 @@
 					$search_background = '#EEEEEE';
 		}
 
-	    $background_colour = get_pconfig($uid, "redbasic", "background_colour");	
+// Load the owners pconfig
+	    $bgcolour = get_pconfig($uid, "redbasic", "background_colour");	
 	    $background_image = get_pconfig($uid, "redbasic", "background_image");	
 	    $item_colour = get_pconfig($uid, "redbasic", "item_colour");	
 	    $item_opacity = get_pconfig($uid, "redbasic", "item_opacity");	
 	    $font_size = get_pconfig($uid, "redbasic", "font_size");	
 	    $font_colour = get_pconfig($uid, "redbasic", "font_colour");	
 	    $radius = get_pconfig($uid, "redbasic", "radius");	
-		$shadow = get_pconfig($uid,"redbasic","photo_shadow");
+	    $shadow = get_pconfig($uid,"redbasic","photo_shadow");
 
+// Now load the scheme.  If a value is changed above, we'll keep the settings
+// If not, we'll keep those defined by the schema
+// Setting $scheme to '' wasn't working for some reason, so we'll check it's
+// not --- like the mobile theme does instead.
+
+		if (($schema) && ($schema != '---')) {
+			$schemefile = 'view/theme/' . current_theme() . '/schema/' . $schema . '.php';
+			require_once ($schemefile);
+		}
+		// 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.
+			if (! $schema) {
+			      if(file_exists('view/theme/' . current_theme() . '/schema/default.php')) {
+				    $schemefile = 'view/theme/' . current_theme() . '/schema/' . 'default.php';
+				    require_once ($schemefile);
+				    }
+			}
+		
+		
 //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
 //individually.  If we don't, we'll have problems if a user has set one, but not all options.
 
@@ -48,8 +68,8 @@
 			$nav_bg_3 = "#f00";
 			$nav_bg_4 = "#b00";
 		}
-	if (! $background_colour)
-		$background_colour = "fff";
+	if (! $bgcolour)
+		$bgcolour = "fff";
 	if (! $background_image)
 		$background_image ='';
 	if (! $item_colour)
@@ -77,7 +97,7 @@ $options = array (
 '$nav_bg_3' => $nav_bg_3,
 '$nav_bg_4' => $nav_bg_4,
 '$search_background' => $search_background,
-'$background_colour' => $background_colour,
+'$bgcolour' => $bgcolour,
 '$background_image' => $background_image,
 '$item_colour' => $item_colour,
 '$item_opacity' => $item_opacity,
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 412af5c44..45dd529fa 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,5 +1,11 @@
+{{include file="field_select.tpl" field=$schema}}
+<div class="settings-submit-wrapper">
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
+</div>
+
+{{if $expert}}
 {{include file="field_select.tpl" field=$nav_colour}}
-{{include file="field_input.tpl" field=$background_colour}}
+{{include file="field_input.tpl" field=$bgcolour}}
 {{include file="field_input.tpl" field=$background_image}}
 {{include file="field_input.tpl" field=$item_colour}}
 {{include file="field_input.tpl" field=$item_opacity}}
@@ -11,3 +17,4 @@
 <div class="settings-submit-wrapper">
 	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
 </div>
+{{/if}}
\ No newline at end of file