PCSS Redbasic

1 files changed, 86 insertions, 23 deletions

diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index ad5df57ce..24bdc7794 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -4,13 +4,20 @@
  */
 
 function theme_content(&$a) {
+	// Doesn't yet work for anyone other than the channel owner, and stupid mode isn't finished, so return both for now.
 	if(!local_user()) { return;	}
-
+	if(! feature_enabled(local_user(),'expert')) {return;}
+	
 	$font_size = get_pconfig(local_user(),'redbasic', 'font_size' );
 	$line_height = get_pconfig(local_user(), 'redbasic', 'line_height' );
 	$colour = get_pconfig(local_user(), 'redbasic', 'colour' );
-	
-	return redbasic_form($a, $font_size, $line_height, $colour);
+	$shadow = get_pconfig(local_user(), 'redbasic', 'shadow' );
+	$navcolour = get_pconfig(local_user(), 'redbasic', 'navcolour');
+	$displaystyle = get_pconfig(local_user(), 'redbasic', 'displaystyle');
+	$linkcolour = get_pconfig(local_user(), 'redbasic', 'linkcolour');
+	$iconset = get_pconfig(local_user(), 'redbasic', 'iconset');
+	$shiny = get_pconfig(local_user(), 'redbasic', 'shiny');
+	return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny);
 }
 
 function theme_post(&$a) {
@@ -20,26 +27,47 @@ function theme_post(&$a) {
 		set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']);
 		set_pconfig(local_user(), 'redbasic', 'line_height', $_POST['redbasic_line_height']);
 		set_pconfig(local_user(), 'redbasic', 'colour', $_POST['redbasic_colour']);	
+		set_pconfig(local_user(), 'redbasic', 'shadow', $_POST['redbasic_shadow']);	
+		set_pconfig(local_user(), 'redbasic', 'navcolour', $_POST['redbasic_navcolour']);
+		set_pconfig(local_user(), 'redbasic', 'displaystyle', $_POST['redbasic_displaystyle']);
+		set_pconfig(local_user(), 'redbasic', 'linkcolour', $_POST['redbasic_linkcolour']);
+		set_pconfig(local_user(), 'redbasic', 'iconset', $_POST['redbasic_iconset']);
+		set_pconfig(local_user(), 'redbasic', 'shiny', $_POST['redbasic_shiny']);
 	}
 }
 
-function theme_admin(&$a) {
-	$font_size = get_config('redbasic', 'font_size' );
-	$line_height = get_config('redbasic', 'line_height' );
-	$colour = get_config('redbasic', 'colour' );	
-	
-	return redbasic_form($a, $font_size, $line_height, $colour);
-}
+// We probably don't want these if we're having global settings, but we'll comment out for now, just in case
+//function theme_admin(&$a) {	$font_size = get_config('redbasic', 'font_size' );
+//	$line_height = get_config('redbasic', 'line_height' );
+//	$colour = get_config('redbasic', 'colour' );	
+//	$shadow = get_config('redbasic', 'shadow' );	
+//	$navcolour = get_config('redbasic', 'navcolour' );
+//	$opaquenav = get_config('redbasic', 'opaquenav' );
+//	$itemstyle = get_config('redbasic', 'itemstyle' );
+//	$linkcolour = get_config('redbasic', 'linkcolour' );
+//	$iconset = get_config('redbasic', 'iconset' );
+//	$shiny = get_config('redbasic', 'shiny' );
+//	
+//	return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $itemstyle, $linkcolour, $iconset, $shiny);
+//}
 
-function theme_admin_post(&$a) {
-	if (isset($_POST['redbasic-settings-submit'])) {
-		set_config('redbasic', 'font_size', $_POST['redbasic_font_size']);
-		set_config('redbasic', 'line_height', $_POST['redbasic_line_height']);
-		set_config('redbasic', 'colour', $_POST['redbasic_colour']);
-	}
-}
+//function theme_admin_post(&$a) {
+//	if (isset($_POST['redbasic-settings-submit'])) {
+//		set_config('redbasic', 'font_size', $_POST['redbasic_font_size']);
+//		set_config('redbasic', 'line_height', $_POST['redbasic_line_height']);
+//		set_config('redbasic', 'colour', $_POST['redbasic_colour']);
+//		set_config('redbasic', 'shadow', $_POST['redbasic_shadow']);
+//		set_config('redbasic', 'navcolour', $_POST['redbasic_navcolour']);
+//		set_config('redbasic', 'opaquenav', $_POST['redbasic_opaquenav']);
+//		set_config('redbasic', 'itemstyle', $_POST['redbasic_itemstyle']);
+//		set_config('redbasic', 'linkcolour', $_POST['redbasic_linkcolour']);
+//		set_config('redbasic', 'iconset', $_POST['redbasic_iconset']);
+//		set_config('redbasic', 'shiny', $_POST['redbasic_shiny']);
+//	}
+//}
 
-function redbasic_form(&$a, $font_size, $line_height, $colour) {
+// These aren't all used yet, but they're not bloat - we'll use drop down menus in idiot mode.
+function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny) {
 	$line_heights = array(
 		"1.3" => "1.3",
 		"---" => "---",
@@ -61,19 +89,54 @@ function redbasic_form(&$a, $font_size, $line_height, $colour) {
 		'12' => '12',
 	);
 	$colours = array(
-		'light' => 'light',		
-		'dark' => 'dark',						
+		'redbasic' => 'light',		
+		'fancyred' => 'dark',						
+	);
+	
+	$shadows = array(
+		  'true' => 'Yes',
+		  'false' => 'No',
 	);
 
-	$t = get_markup_template('theme_settings.tpl');
-	$o .= replace_macros($t, array(
+	$navcolours = array (
+		  'red' => 'red',
+		  'black' => 'black',	
+	);
+	
+	$displaystyles = array (
+		    'fancy' => 'fancy',
+		    'classic' => 'classic',
+	);
+	
+	$linkcolours = array (
+		    'blue' => 'blue',
+		    'red' => 'red',
+	);
+	
+	$iconsets = array (
+		    'default' => 'default',
+	);
+	
+	$shinys = array (
+		    'none' => 'none',
+		    'opaque' => 'opaque',
+	);
+	if(feature_enabled(local_user(),'expert')) {
+	  $t = get_markup_template('theme_settings.tpl');
+	  $o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
 		'$baseurl' => $a->get_baseurl(),
 		'$title' => t("Theme settings"),
 		'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
 		'$line_height' => array('redbasic_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
 		'$colour' => array('redbasic_colour', t('Set colour scheme'), $colour, '', $colours),	
-	));
+		'$shadow' => array('redbasic_shadow', t('Draw shadows'), $shadow, '', $shadows),
+		'$navcolour' => array('redbasic_navcolour', t('Navigation bar colour'), $navcolour, '', $navcolours),
+		'$displaystyle' => array('redbasic_displaystyle', t('Display style'), $displaystyle, '', $displaystyles),
+		'$linkcolour' => array('redbasic_linkcolour', t('Display colour of links - hex value, do not include the #'), $linkcolour, '', $linkcolours),
+		'$iconset' => array('redbasic_iconset', t('Icons'), $iconset, '', $iconsets),
+		'$shiny' => array('redbasic_shiny', t('Shiny style'), $shiny, '', $shinys),
+	  ));}
 
 	return $o;
 }