whitespace

This commit is contained in:
Mario Vavti 2015-06-06 15:51:15 +02:00
parent 1d80c33207
commit d60c2b1621

View File

@ -1,13 +1,15 @@
<?php <?php
if(! $a->install) { if(! $a->install) {
// Get the UID of the channel owner // Get the UID of the channel owner
$uid = get_theme_uid(); $uid = get_theme_uid();
if($uid) if($uid) {
load_pconfig($uid,'redbasic'); load_pconfig($uid,'redbasic');
}
// Load the owners pconfig // Load the owners pconfig
$nav_bg = get_pconfig($uid, "redbasic", "nav_bg"); $nav_bg = get_pconfig($uid, "redbasic", "nav_bg");
$nav_gradient_top = get_pconfig($uid, "redbasic", "nav_gradient_top"); $nav_gradient_top = get_pconfig($uid, "redbasic", "nav_gradient_top");
$nav_gradient_bottom = get_pconfig($uid, "redbasic", "nav_gradient_bottom"); $nav_gradient_bottom = get_pconfig($uid, "redbasic", "nav_gradient_bottom");
@ -41,154 +43,158 @@ if(! $a->install) {
} }
// Now load the scheme. If a value is changed above, we'll keep the settings // 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 // If not, we'll keep those defined by the schema
// Setting $schema to '' wasn't working for some reason, so we'll check it's // Setting $schema to '' wasn't working for some reason, so we'll check it's
// not --- like the mobile theme does instead. // not --- like the mobile theme does instead.
// Allow layouts to over-ride the schema
// Allow layouts to over-ride the schema if($_REQUEST['schema']) {
if($_REQUEST['schema'])
$schema = $_REQUEST['schema']; $schema = $_REQUEST['schema'];
}
if (($schema) && ($schema != '---')) {
if (($schema) && ($schema != '---')) {
// Check it exists, because this setting gets distributed to clones // Check it exists, because this setting gets distributed to clones
if(file_exists('view/theme/redbasic/schema/' . $schema . '.php')) { if(file_exists('view/theme/redbasic/schema/' . $schema . '.php')) {
$schemefile = 'view/theme/redbasic/schema/' . $schema . '.php'; $schemefile = 'view/theme/redbasic/schema/' . $schema . '.php';
require_once ($schemefile); require_once ($schemefile);
} }
if(file_exists('view/theme/redbasic/schema/' . $schema . '.css')) { if(file_exists('view/theme/redbasic/schema/' . $schema . '.css')) {
$schemecss = file_get_contents('view/theme/redbasic/schema/' . $schema . '.css'); $schemecss = file_get_contents('view/theme/redbasic/schema/' . $schema . '.css');
} }
} }
// 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 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/redbasic/schema/default.php')) { if(file_exists('view/theme/redbasic/schema/default.php')) {
$schemefile = 'view/theme/redbasic/schema/default.php'; $schemefile = 'view/theme/redbasic/schema/default.php';
require_once ($schemefile); require_once ($schemefile);
} }
if(file_exists('view/theme/redbasic/schema/default.css')) { if(file_exists('view/theme/redbasic/schema/default.css')) {
$schemecss = file_get_contents('view/theme/redbasic/schema/default.css'); $schemecss = file_get_contents('view/theme/redbasic/schema/default.css');
} }
}
}
//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //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. //individually. If we don't, we'll have problems if a user has set one, but not all options.
if (! $nav_bg)
if (! $nav_bg)
$nav_bg = "#222"; $nav_bg = "#222";
if (! $nav_gradient_top) if (! $nav_gradient_top)
$nav_gradient_top = "#3c3c3c"; $nav_gradient_top = "#3c3c3c";
if (! $nav_gradient_bottom) if (! $nav_gradient_bottom)
$nav_gradient_bottom = "#222"; $nav_gradient_bottom = "#222";
if (! $nav_active_gradient_top) if (! $nav_active_gradient_top)
$nav_active_gradient_top = "#222"; $nav_active_gradient_top = "#222";
if (! $nav_active_gradient_bottom) if (! $nav_active_gradient_bottom)
$nav_active_gradient_bottom = "#282828"; $nav_active_gradient_bottom = "#282828";
if (! $nav_bd) if (! $nav_bd)
$nav_bd = "#222"; $nav_bd = "#222";
if (! $nav_icon_colour) if (! $nav_icon_colour)
$nav_icon_colour = "#999"; $nav_icon_colour = "#999";
if (! $nav_active_icon_colour) if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#fff"; $nav_active_icon_colour = "#fff";
if (! $link_colour) if (! $link_colour)
$link_colour = "#337AB7"; $link_colour = "#337AB7";
if (! $banner_colour) if (! $banner_colour)
$banner_colour = "#fff"; $banner_colour = "#fff";
if (! $bgcolour) if (! $bgcolour)
$bgcolour = "#fdfdfd"; $bgcolour = "#fdfdfd";
if (! $background_image) if (! $background_image)
$background_image =''; $background_image ='';
if (! $item_colour) if (! $item_colour)
$item_colour = "rgba(238,238,238,0.8)"; $item_colour = "rgba(238,238,238,0.8)";
if (! $comment_item_colour) if (! $comment_item_colour)
$comment_item_colour = "rgba(254,254,254,0.4)"; $comment_item_colour = "rgba(254,254,254,0.4)";
if (! $comment_border_colour) if (! $comment_border_colour)
$comment_border_colour = "rgba(238,238,238,0.8)"; $comment_border_colour = "rgba(238,238,238,0.8)";
if (! $toolicon_colour) if (! $toolicon_colour)
$toolicon_colour = '#777'; $toolicon_colour = '#777';
if (! $toolicon_activecolour) if (! $toolicon_activecolour)
$toolicon_activecolour = '#000'; $toolicon_activecolour = '#000';
if (! $item_opacity) if (! $item_opacity)
$item_opacity = "1"; $item_opacity = "1";
if (! $font_size) if (! $font_size)
$font_size = "0.9rem"; $font_size = "0.9rem";
if (! $body_font_size) if (! $body_font_size)
$body_font_size = "0.75rem"; $body_font_size = "0.75rem";
if (! $font_colour) if (! $font_colour)
$font_colour = "#4d4d4d"; $font_colour = "#4d4d4d";
if (! $radius) if (! $radius)
$radius = "4"; $radius = "4";
if (! $shadow) if (! $shadow)
$shadow = "0"; $shadow = "0";
if (! $converse_width) if (! $converse_width)
$converse_width = "1024"; $converse_width = "1024";
if(! $top_photo) if(! $top_photo)
$top_photo = '48px'; $top_photo = '48px';
if(! $comment_indent) if(! $comment_indent)
$comment_indent = '0px'; $comment_indent = '0px';
if(! $reply_photo) if(! $reply_photo)
$reply_photo = '32px'; $reply_photo = '32px';
if($nav_min_opacity === false || $nav_min_opacity === '') { if($nav_min_opacity === false || $nav_min_opacity === '') {
$nav_float_min_opacity = 1.0; $nav_float_min_opacity = 1.0;
$nav_percent_min_opacity = 100; $nav_percent_min_opacity = 100;
} }
else { else {
$nav_float_min_opacity = (float) $nav_min_opacity; $nav_float_min_opacity = (float) $nav_min_opacity;
$nav_percent_min_opacity = (int) 100 * $nav_min_opacity; $nav_percent_min_opacity = (int) 100 * $nav_min_opacity;
} }
// Apply the settings // Apply the settings
if(file_exists('view/theme/redbasic/css/style.css')) { if(file_exists('view/theme/redbasic/css/style.css')) {
$x = file_get_contents('view/theme/redbasic/css/style.css'); $x = file_get_contents('view/theme/redbasic/css/style.css');
// left aside is 231px + converse width
$main_width = (231 + intval($converse_width));
// left aside is 231px + converse width // prevent main_width smaller than 768px
$main_width = (231 + intval($converse_width)); $main_width = (($main_width < 768) ? 768 : $main_width) . 'px';
// prevent main_width smaller than 768px $options = array (
$main_width = (($main_width < 768) ? 768 : $main_width) . 'px'; '$nav_bg' => $nav_bg,
'$nav_gradient_top' => $nav_gradient_top,
'$nav_gradient_bottom' => $nav_gradient_bottom,
'$nav_active_gradient_top' => $nav_active_gradient_top,
'$nav_active_gradient_bottom' => $nav_active_gradient_bottom,
'$nav_bd' => $nav_bd,
'$nav_icon_colour' => $nav_icon_colour,
'$nav_active_icon_colour' => $nav_active_icon_colour,
'$link_colour' => $link_colour,
'$banner_colour' => $banner_colour,
'$bgcolour' => $bgcolour,
'$background_image' => $background_image,
'$item_colour' => $item_colour,
'$comment_item_colour' => $comment_item_colour,
'$comment_border_colour' => $comment_border_colour,
'$toolicon_colour' => $toolicon_colour,
'$toolicon_activecolour' => $toolicon_activecolour,
'$font_size' => $font_size,
'$font_colour' => $font_colour,
'$body_font_size' => $body_font_size,
'$radius' => $radius,
'$shadow' => $shadow,
'$converse_width' => $converse_width,
'$nav_float_min_opacity' => $nav_float_min_opacity,
'$nav_percent_min_opacity' => $nav_percent_min_opacity,
'$top_photo' => $top_photo,
'$reply_photo' => $reply_photo,
'$pmenu_top' => $pmenu_top,
'$pmenu_reply' => $pmenu_reply,
'$comment_indent' => $comment_indent,
'$main_width' => $main_width,
);
$options = array ( echo str_replace(array_keys($options), array_values($options), $x);
'$nav_bg' => $nav_bg,
'$nav_gradient_top' => $nav_gradient_top,
'$nav_gradient_bottom' => $nav_gradient_bottom,
'$nav_active_gradient_top' => $nav_active_gradient_top,
'$nav_active_gradient_bottom' => $nav_active_gradient_bottom,
'$nav_bd' => $nav_bd,
'$nav_icon_colour' => $nav_icon_colour,
'$nav_active_icon_colour' => $nav_active_icon_colour,
'$link_colour' => $link_colour,
'$banner_colour' => $banner_colour,
'$bgcolour' => $bgcolour,
'$background_image' => $background_image,
'$item_colour' => $item_colour,
'$comment_item_colour' => $comment_item_colour,
'$comment_border_colour' => $comment_border_colour,
'$toolicon_colour' => $toolicon_colour,
'$toolicon_activecolour' => $toolicon_activecolour,
'$font_size' => $font_size,
'$font_colour' => $font_colour,
'$body_font_size' => $body_font_size,
'$radius' => $radius,
'$shadow' => $shadow,
'$converse_width' => $converse_width,
'$nav_float_min_opacity' => $nav_float_min_opacity,
'$nav_percent_min_opacity' => $nav_percent_min_opacity,
'$top_photo' => $top_photo,
'$reply_photo' => $reply_photo,
'$pmenu_top' => $pmenu_top,
'$pmenu_reply' => $pmenu_reply,
'$comment_indent' => $comment_indent,
'$main_width' => $main_width,
);
echo str_replace(array_keys($options), array_values($options), $x);
} }
if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {