From 036d907a4bfdbf5d58de786bea7109f52bf4a709 Mon Sep 17 00:00:00 2001 From: sasiflo Date: Wed, 9 Apr 2014 23:13:25 +0200 Subject: Extended theme redbasic: Allow to center the content (aside + converse) Added an option to settings of redbasic theme. You are now able to activate centering the left aside and the conversion regions in the middle of the screen. This respects configuration of conversion region width and works without special actions for mobile devices. TODO: Find a way to handle conversion width given in percent. --- view/theme/redbasic/css/converse_center.css | 5 ++++ view/theme/redbasic/php/config.php | 5 +++- view/theme/redbasic/php/style.php | 37 ++++++++++++++++++----------- view/theme/redbasic/tpl/theme_settings.tpl | 1 + 4 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 view/theme/redbasic/css/converse_center.css (limited to 'view/theme') diff --git a/view/theme/redbasic/css/converse_center.css b/view/theme/redbasic/css/converse_center.css new file mode 100644 index 000000000..e5ecfbfe0 --- /dev/null +++ b/view/theme/redbasic/css/converse_center.css @@ -0,0 +1,5 @@ +body { + margin-left: auto; + margin-right: auto; + width: $body_width; +} diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 608a9bda7..ab819f05b 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -6,7 +6,7 @@ function theme_content(&$a) { $arr = array(); $arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' ); - $arr['narrow_navbar'] = get_pconfig(local_user(),'redbasic', 'narrow_navbar' ); + $arr['narrow_navbar'] = get_pconfig(local_user(),'redbasic', 'narrow_navbar' ); $arr['nav_bg'] = get_pconfig(local_user(),'redbasic', 'nav_bg' ); $arr['nav_gradient_top'] = get_pconfig(local_user(),'redbasic', 'nav_gradient_top' ); $arr['nav_gradient_bottom'] = get_pconfig(local_user(),'redbasic', 'nav_gradient_bottom' ); @@ -29,6 +29,7 @@ function theme_content(&$a) { $arr['radius'] = get_pconfig(local_user(),'redbasic', 'radius' ); $arr['shadow'] = get_pconfig(local_user(),'redbasic', 'photo_shadow' ); $arr['converse_width']=get_pconfig(local_user(),"redbasic","converse_width"); + $arr['converse_center']=get_pconfig(local_user(),"redbasic","converse_center"); $arr['nav_min_opacity']=get_pconfig(local_user(),"redbasic","nav_min_opacity"); $arr['top_photo']=get_pconfig(local_user(),"redbasic","top_photo"); $arr['reply_photo']=get_pconfig(local_user(),"redbasic","reply_photo"); @@ -64,6 +65,7 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']); set_pconfig(local_user(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']); set_pconfig(local_user(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']); + set_pconfig(local_user(), 'redbasic', 'converse_center', $_POST['redbasic_converse_center']); set_pconfig(local_user(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']); set_pconfig(local_user(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']); set_pconfig(local_user(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']); @@ -118,6 +120,7 @@ if(feature_enabled(local_user(),'expert')) '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']), '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), '$converse_width' => array('redbasic_converse_width',t('Set maximum width of conversation regions'),$arr['converse_width']), + '$converse_center' => array('redbasic_converse_center',t('Center conversation regions'),$arr['converse_center']), '$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']), '$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), '$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index c3153a025..49852036b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -18,20 +18,21 @@ if(! $a->install) { $nav_active_icon_colour = get_pconfig($uid, "redbasic", "nav_active_icon_colour"); $narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar'); $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); - $link_colour = get_pconfig($uid, "redbasic", "link_colour"); + $link_colour = get_pconfig($uid, "redbasic", "link_colour"); $schema = get_pconfig($uid,'redbasic','schema'); - $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); - $background_image = get_pconfig($uid, "redbasic", "background_image"); + $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"); - $body_font_size = get_pconfig($uid, "redbasic", "body_font_size"); - $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"); - $converse_width=get_pconfig($uid,"redbasic","converse_width"); + $item_colour = get_pconfig($uid, "redbasic", "item_colour"); + $item_opacity = get_pconfig($uid, "redbasic", "item_opacity"); + $body_font_size = get_pconfig($uid, "redbasic", "body_font_size"); + $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"); + $converse_width=get_pconfig($uid,"redbasic","converse_width"); + $converse_center=get_pconfig($uid,"redbasic","converse_center"); $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); $sloppy_photos=get_pconfig($uid,'redbasic','sloppy_photos'); $top_photo=get_pconfig($uid,'redbasic','top_photo'); @@ -116,8 +117,9 @@ if(! $a->install) { $shadow = "0"; if(! $active_colour) $active_colour = '#FFFFFF'; - if (! $converse_width) - $converse_width="1024px"; + if (! $converse_width) { + $converse_width="1024px"; + } if(! $top_photo) $top_photo = '48px'; $pmenu_top = intval($top_photo) - 16 . 'px'; @@ -141,6 +143,8 @@ if(! $a->install) { if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); +$body_width = (231 + $converse_width) . 'px'; // aside is 231px + converse width; have to find a way for calculation with 'px', cannot handle '%' + $options = array ( '$nav_bg' => $nav_bg, '$nav_gradient_top' => $nav_gradient_top, @@ -173,7 +177,8 @@ $options = array ( '$pmenu_top' => $pmenu_top, '$pmenu_reply' => $pmenu_reply, '$wwtop' => $wwtop, -'$comment_indent' => $comment_indent +'$comment_indent' => $comment_indent, +'$body_width' => $body_width ); echo str_replace(array_keys($options), array_values($options), $x); @@ -185,3 +190,7 @@ if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) { if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); } +if($converse_center && file_exists('view/theme/redbasic/css/converse_center.css')) { + $x = file_get_contents('view/theme/redbasic/css/converse_center.css'); + echo str_replace(array_keys($options), array_values($options), $x); +} diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index ccd183049..b20d17804 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -28,6 +28,7 @@ {{include file="field_input.tpl" field=$radius}} {{include file="field_input.tpl" field=$shadow}} {{include file="field_input.tpl" field=$converse_width}} +{{include file="field_checkbox.tpl" field=$converse_center}} {{include file="field_input.tpl" field=$nav_min_opacity}} {{include file="field_input.tpl" field=$top_photo}} {{include file="field_input.tpl" field=$reply_photo}} -- cgit v1.2.3