Do PCSS properly

1 files changed, 55 insertions, 144 deletions

diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 8643925d3..26990823a 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -1,159 +1,70 @@
 <?php
-  // This needs changing now, if we're going for global settings.  Admin settings have been removed in preparation, You *should* just be able to remove all 
-  // the get_config bits, though this is untested.  
-  // We also need to eventually.  Use the page owners settings for everybody - get_pconfig(page_owner()) or whatever that would look like.
-
 
+//Set some defaults
+
+	$nav_colour = "red";
+		$nav_bg_1 = "f88";
+		$nav_bg_2 = "b00";
+		$nav_bg_3 = "f00";
+		$nav_bg_4 = "b00";
+	$background_colour = "fff";
+	$background_image ='';
+	$item_colour = "fff";
+	$item_opacity = "1";
+	$font_size = "12";
+	$font_colour = "000";
+	$radius = "5";
+
+// Get the UID of the channel owner
 	$uid = get_theme_uid();
 
 	if($uid)
 	    load_pconfig($uid,'redbasic');
 
-    $line_height = false;
-    $redbasic_font_size = false;
-    $resolution = false;
-    $colour = false;
-    $shadows = false;
-    $navcolour = false;
-    $nav_bg_1 = "f88";
-    $nav_bg_2 = "b00";
-	$nav_bg_3 = "f00";
-	$nav_bg_4 = "b00";
-    $displaystyle = false;
-    $linkcolour = false;
-    $shiny = false;
-	$radius = 5;
-    $site_line_height = get_config("redbasic","line_height");
-    $site_redbasic_font_size = get_config("redbasic", "font_size" );
-    $site_colour = get_config("redbasic", "colour" );
-    $shadows = get_config("redbasic", "shadow" );
-    $navcolour = get_config("redbasic", "navcolour" );
-    $displaystyle = get_config("redbasic", "displaystyle" );
-    $linkcolour = get_config("redbasic", "linkcolour" );
-    $shiny = get_config("redbasic", "shiny" );
-
-	$x = get_config('redbasic','radius');
-	if($x !== false)
-		$radius = $x;
-    
-    if ($uid) {
-        $line_height = get_pconfig($uid, "redbasic","line_height");
-        $redbasic_font_size = get_pconfig($uid, "redbasic", "font_size");
-        $colour = get_pconfig($uid, "redbasic", "colour");
-        $shadows = get_pconfig($uid, "redbasic", "shadow");
-        $navcolour = get_pconfig($uid, "redbasic", "navcolour");
-        $displaystyle = get_pconfig($uid, "redbasic", "displaystyle");
-        $linkcolour = get_pconfig($uid, "redbasic", "linkcolour");
-        $shiny = get_pconfig($uid, "redbasic", "shiny");
-		$x = get_pconfig($uid,'redbasic','radius');
-		if($x !== false)
-			$radius = $x;
-
-        if (! feature_enabled($uid,'expert')) {$colour_scheme = get_pconfig($uid, "redbasic", "colour_scheme");}
-    }
+// Nav colours are mess.  Set $nav_colour as a single word for the sake of letting folk pick one
+// but it actually consists of at least two colours to form a gradient - $nav_bg_1 and $nav_bg_2
+// A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme
+// wants to implement that
+	    $nav_colour = get_pconfig($uid, "redbasic", "nav_colour");	
+		if ($nav_colour == "red") {
+					$nav_bg_1 = "#f88";
+					$nav_bg_2 = "#b00";
+					$nav_bg_3 = "#f00";
+					$nav_bg_4 = "#b00";
+		}
 
-    // In non-expert mode, we just let them choose font size, line height, and a colour scheme.  A colour scheme is just a pre-defined set of the above variables.
-    // But only apply these settings in non-expert mode to prevent confusion when turning expert mode on and off.
-    if(! feature_enabled($uid,'expert')) {
-	    if ($colour_scheme === 'fancyred') {$shadows = true; $navcolour = 'black'; $displaystyle = 'fancy'; $linkcolour = 'f00'; $shiny = "opaque";}
-	    // Dark themes are very different - we need to do some of these from scratch, so don't bother setting vars for anything else
-	    if ($colour_scheme === 'dark') {$colour = 'dark'; $navcolour = 'black';}
-	    if ($colour_scheme === 'redbasic'){$navcolour = 'red';}
-		$shadows = false;
-		$radius = 5;
-}
+		if ($nav_colour == "black") {
+				    $nav_bg_1 = $nav_bg_3 = "#000";
+		      		    $nav_bg_2 = $nav_bg_4 = "#222";
+		}
 
-// This is probably the easiest place to apply global settings.  Don't bother with site line height and such.  Instead, check pconfig for global user settings.  
-// eg, if ($redbasic_font_size === false) {$redbasic_font_size = get_pconfig($uid, "global", "font_size");  If it's not set, we'll just use the CSS with no changes.
-// Then all you need to do is add a "Global Settings" tab to settings/display, and make an equivalent of theme_settings.tpl and config.php to be loaded there.  Easy.
+	    $background_colour = 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");	
 
-    if ($line_height === false) {$line_height = $site_line_height;}
-    if ($line_height === false) {$line_height = "1.2";}
-    if ($redbasic_font_size === false) {$redbasic_font_size = $site_redbasic_font_size;}
-    if ($redbasic_font_size === false) {$redbasic_font_size = "12";}
-    if ($colour === false) {$colour = $site_colour;}
-    if ($colour === false) {$colour = "light";}
-	    if ($navcolour === "black") {$nav_bg_1 = "000";
-			      $nav_bg_2 = "2e2f2e";}
 
+// Apply the settings
 	if(file_exists('view/theme/' . current_theme() . '/css/style.css')) {
 		$x = file_get_contents('view/theme/' . current_theme() . '/css/style.css');
-		if(get_config('system','pcss_compress')) {
-			// this shaves off about 10%, probably not enough to worry about right now.
-			logger('pcss compress: original size: ' . strlen($x), LOGGER_DEBUG);
-			$x = str_replace(array("\r","\t","  "),array("",' ',' '),$x);
-			$x = preg_replace('/(\n[ ]+?)/s',"\n",$x);
-			$x = str_replace("\n","",$x);
-			logger('pcss compress: final size: ' . strlen($x), LOGGER_DEBUG);
-		}
-		echo str_replace(array('$radius'),array($radius),$x);
-    }
-    echo "\r\n";
-
-// use $colour_scheme for idiot mode.
-    if($colour === "dark") {if (file_exists('view/theme/' . current_theme() . '/css/dark.css')) {
-		  $dark = (file_get_contents('view/theme/' . current_theme() . '/css/dark.css'));
-	      echo "$dark";}
-	  }
-
-
 
-// Enforce sane limits for expert mode - otherwise we'll end up with "experts" who think font size is a percentage.
+$options = array (
+'$nav_bg_1' => $nav_bg_1,
+'$nav_bg_2' => $nav_bg_2,
+'$nav_bg_3' => $nav_bg_3,
+'$nav_bg_4' => $nav_bg_4,
+'$background_colour' => $background_colour,
+'$background_image' => $background_image,
+'$item_colour' => $item_colour,
+'$item_opacity' => $item_opacity,
+'$font_size' => $font_size,
+'$font_colour' => $font_colour,
+'$radius' => $radius
+);
+
+echo str_replace(array_keys($options), array_values($options), $x);    
 
-	if(($redbasic_font_size >= 8.0) && ($redbasic_font_size <= 20.0)) {
-		echo ".wall-item-content { font-size: ${redbasic_font_size}px;}\r\n";
-	}
-
-	if(($line_height >= 1.0) && ($line_height <= 2.0)) {
-		echo ".wall-item-content { line-height: $line_height; }\r\n";
-	}	
-
-
-// Minimum value shadows - they shouldn't all be the same size; just get it working, clean up later.
-	if($shadows === "true") {
-		echo "code, blockquote, .wall-item-content-wrapper, .wall-item-content-wrapper.comment, .wall-item-content img, #profile-jot-perms, #profile-jot-submit, .tab, .tab.active, .settings-widget li, .wall-item-photo, .photo, .contact-block-img, .my-comment-photo, #posted-date-selector:hover, .contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .group-selected, .nets-selected, .fileas-selected, .categories-selected {
-		box-shadow: 5px 5px 5px #111;}\r\n
-		
-		.tab.active, #jot-title, #jot-category, .comment-edit-text-empty, .comment-edit-text-full, iframe#profile-jot-text_ifr, #profile-jot-text {
-		box-shadow: 5px 5px 5px #666 inset;}\r\n";
-	
-	}
-	
-// Since every change would otherwise require five lines, it's simpler to just set a default and echo this without first checking if we've set it.  
-	echo "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%) !important;
-	      background-image: -webkit-linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%);
-	      background-image: -ms-linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%);}";
-
-	if($navcolour === false || $navcolour === 'red') {
-		echo "nav:hover {background-image: linear-gradient(bottom, #$nav_bg_3 26%, #$nav_bg_4 82%);
-	      background-image: -o-linear-gradient(bottom, #$nav_bg_3 26%, #$nav_bg_4 82%);
-	      background-image: -moz-linear-gradient(bottom, #$nav_bg_3 26%, #$nav_bg_4 82%) !important;
-	      background-image: -webkit-linear-gradient(bottom, #$nav_bg_3 26%, #$nav_bg_4 82%);
-	      background-image: -ms-linear-gradient(bottom, #$nav_bg_3 26%, #$nav_bg_4 82%);}";
-	}
-
-// This takes quite a lot of code, so we'll keep it in a separate file, and echo the lot.  Devs still don't have to worry about - it's just overrides.
-// Theme devs can play with it without facing scary PHP.
-
-	if ($displaystyle === "fancy") 
-	      {if (file_exists('view/theme/' . current_theme() . '/css/fancy.css')) {
-		  $fancy = (file_get_contents('view/theme/' . current_theme() . '/css/fancy.css'));
-			echo str_replace(array('$radius'),array($radius),$fancy);
-	      }
-	  }
-    
-// Put the # here to force hex colours - if we don't, somebody is going to do something odd, using RGB and we're all going to be confused on the support forums
-// until one of us works out what they've done.
-
-	  if ($linkcolour != false) {
-		    echo "a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {color: #$linkcolour;}\r\n";
-	}
-	
-// If you want a shiny that just sets a different colour, add an if $shiny != false and handle it as the linkcolour above.
-
-	if ($shiny === 'opaque') {
-		    echo "div.wall-item-content-wrapper.shiny {opacity: 1;}\r\n
-			 .wall-item-content-wrapper {opacity: 0.8;}";
-	}
\ No newline at end of file
+}