diff options
Diffstat (limited to 'view/theme/redbasic/php')
| -rw-r--r-- | view/theme/redbasic/php/config.php | 78 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 44 |
2 files changed, 85 insertions, 37 deletions
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 053940219..eb583d9bf 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -3,19 +3,25 @@ function theme_content(&$a) { if(!local_user()) { return;} - $schema = get_pconfig(local_user(),'redbasic', 'schema' ); - $nav_colour = get_pconfig(local_user(),'redbasic', 'nav_colour' ); - $bgcolour = get_pconfig(local_user(),'redbasic', 'background_colour' ); - $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' ); - $font_size = get_pconfig(local_user(),'redbasic', 'font_size' ); - $font_colour = get_pconfig(local_user(),'redbasic', 'font_colour' ); - $radius = get_pconfig(local_user(),'redbasic', 'radius' ); - $shadow = get_pconfig(local_user(),'redbasic', 'photo_shadow' ); - $section_width=get_pconfig(local_user(),"redbasic","section_width"); - return redbasic_form($a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, - $font_size, $font_colour, $radius, $shadow, $section_width); + $arr = array(); + + $arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' ); + $arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_colour' ); + $arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' ); + $arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' ); + $arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' ); + $arr['item_colour'] = get_pconfig(local_user(),'redbasic', 'item_colour' ); + $arr['item_opacity'] = get_pconfig(local_user(),'redbasic', 'item_opacity' ); + $arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour'); + $arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour'); + $arr['font_size'] = get_pconfig(local_user(),'redbasic', 'font_size' ); + $arr['font_colour'] = get_pconfig(local_user(),'redbasic', 'font_colour' ); + $arr['radius'] = get_pconfig(local_user(),'redbasic', 'radius' ); + $arr['shadow'] = get_pconfig(local_user(),'redbasic', 'photo_shadow' ); + $arr['section_width']=get_pconfig(local_user(),"redbasic","section_width"); + $arr['nav_min_opacity']=get_pconfig(local_user(),"redbasic","nav_min_opacity"); + $arr['sloppy_photos']=get_pconfig(local_user(),"redbasic","sloppy_photos"); + return redbasic_form($a, $arr); } function theme_post(&$a) { @@ -25,19 +31,26 @@ function theme_post(&$a) { 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', 'banner_colour', $_POST['redbasic_banner_colour']); set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']); set_pconfig(local_user(), 'redbasic', 'item_colour', $_POST['redbasic_item_colour']); set_pconfig(local_user(), 'redbasic', 'item_opacity', $_POST['redbasic_item_opacity']); + set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']); + set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']); set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']); set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']); set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']); set_pconfig(local_user(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']); set_pconfig(local_user(), 'redbasic', 'section_width', $_POST['redbasic_section_width']); + set_pconfig(local_user(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']); + set_pconfig(local_user(), 'redbasic', 'sloppy_photos', $_POST['redbasic_sloppy_photos']); } } -function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, - $font_size, $font_colour, $radius, $shadow, $section_width) { + + +function redbasic_form(&$a, $arr) { + $scheme_choices = array(); $scheme_choices["---"] = t("Default"); @@ -52,10 +65,10 @@ function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $nav_colours = array ( - '' => 'Scheme Default', - 'red' => 'red', - 'black' => 'black', - 'silver' => 'silver', + '' => t('Scheme Default'), + 'red' => t('red'), + 'black' => t('black'), + 'silver' => t('silver'), ); if(feature_enabled(local_user(),'expert')) @@ -67,17 +80,22 @@ if(feature_enabled(local_user(),'expert')) '$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), - '$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), - '$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $font_size), - '$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $font_colour), - '$radius' => array('redbasic_radius', t('Set radius of corners'), $radius), - '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $shadow), - '$section_width' => array('redbasic_section_width',t('Set width of main section'),$section_width), + '$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices), + '$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $arr['nav_colour'], '', $nav_colours), + '$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']), + '$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']), + '$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']), + '$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $arr['item_colour']), + '$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $arr['item_opacity']), + '$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic colour for item icons'),$arr['toolicon_colour']), + '$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover colour for item icons'),$arr['toolicon_activecolour']), + '$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']), + '$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $arr['font_colour']), + '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']), + '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), + '$section_width' => array('redbasic_section_width',t('Set width of main section'),$arr['section_width']), + '$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']), + '$sloppy_photos' => array('redbasic_sloppy_photos',t('Sloppy photo albums'),$arr['sloppy_photos'],t('Are you a clean desk or a messy desk person?')), )); return $o; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index c4bd2e15a..716a2dd9e 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -12,9 +12,12 @@ $nav_colour = get_pconfig($uid, "redbasic", "nav_colour"); // Load the owners pconfig + $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); $schema = get_pconfig($uid,'redbasic','schema'); $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); $background_image = get_pconfig($uid, "redbasic", "background_image"); + $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour'); + $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour'); $item_colour = get_pconfig($uid, "redbasic", "item_colour"); $item_opacity = get_pconfig($uid, "redbasic", "item_opacity"); $font_size = get_pconfig($uid, "redbasic", "font_size"); @@ -22,16 +25,21 @@ $radius = get_pconfig($uid, "redbasic", "radius"); $shadow = get_pconfig($uid,"redbasic","photo_shadow"); $section_width=get_pconfig($uid,"redbasic","section_width"); + $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); + $sloppy_photos=get_pconfig($uid,'redbasic','sloppy_photos'); // 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 != '---')) { + if (($schema) && ($schema != '---')) { + // Check it exists, because this setting gets distributed to clones + if(file_exists('view/theme/redbasic/schema/' . $schema . '.php')) { $schemefile = 'view/theme/redbasic/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) { @@ -52,18 +60,24 @@ $nav_bg_3 = "#f00"; $nav_bg_4 = "#b00"; } + if (! $banner_colour) + $banner_colour = "fff"; if (! $bgcolour) - $bgcolour = "fff"; + $bgcolour = "#f8f8f8"; if (! $background_image) $background_image =''; if (! $item_colour) - $item_colour = "fff"; + $item_colour = "#f8f8f8"; + if (! $toolicon_colour) + $toolicon_colour = '#777777'; + if (! $toolicon_activecolour) + $toolicon_activecolour = '#000'; if (! $item_opacity) $item_opacity = "1"; if (! $font_size) $font_size = "12"; if (! $font_colour) - $font_colour = "000"; + $font_colour = "#4D4D4D"; if (! $radius) $radius = "5"; if (! $shadow) @@ -72,8 +86,15 @@ $active_colour = '#FFFFFF'; if (! $section_width) $section_width="72%"; - - + if($nav_min_opacity === false || $nav_min_opacity === '') { + $nav_float_min_opacity = 1.0; + $nav_percent_min_opacity = 100; + } + else { + $nav_float_min_opacity = (float) $nav_min_opacity; + $nav_percent_min_opacity = (int) 100 * $nav_min_opacity; + } + // Nav colours have nested values, so we have to define the actual variables // used in the CSS from the higher level "red", "black", etc here @@ -107,19 +128,28 @@ $options = array ( '$nav_bg_2' => $nav_bg_2, '$nav_bg_3' => $nav_bg_3, '$nav_bg_4' => $nav_bg_4, +'$banner_colour' => $banner_colour, '$search_background' => $search_background, '$bgcolour' => $bgcolour, '$background_image' => $background_image, '$item_colour' => $item_colour, '$item_opacity' => $item_opacity, +'$toolicon_colour' => $toolicon_colour, +'$toolicon_activecolour' => $toolicon_activecolour, '$font_size' => $font_size, '$font_colour' => $font_colour, '$radius' => $radius, '$shadow' => $shadow, '$active_colour' => $active_colour, -'$section_width' => $section_width +'$section_width' => $section_width, +'$nav_float_min_opacity' => $nav_float_min_opacity, +'$nav_percent_min_opacity' => $nav_percent_min_opacity ); echo str_replace(array_keys($options), array_values($options), $x); } + +if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) { + echo file_get_contents('view/theme/redbasic/css/sloppy_photos.css'); +} |