From 0bf68af0a71ebe8049284117e56f378e00827c44 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 12 May 2014 20:33:14 +0200 Subject: make comment_indent an option and removeitem_opacity as it is not working properly at the current state - we have got item background opacity now (allthough not yet for custom colors because the colorpicker does not work with rgba colors). Reset left comment border width to 3px as it is barely visible otherwise. --- view/theme/redbasic/php/config.php | 6 +++--- view/theme/redbasic/php/style.php | 5 ++--- view/theme/redbasic/tpl/theme_settings.tpl | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index a40fe67f2..6855c8c32 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -22,7 +22,7 @@ function theme_content(&$a) { $arr['item_colour'] = get_pconfig(local_user(),'redbasic', 'item_colour' ); $arr['comment_item_colour'] = get_pconfig(local_user(),'redbasic', 'comment_item_colour' ); $arr['comment_border_colour'] = get_pconfig(local_user(),'redbasic', 'comment_border_colour' ); - $arr['item_opacity'] = get_pconfig(local_user(),'redbasic', 'item_opacity' ); + $arr['comment_indent'] = get_pconfig(local_user(),'redbasic', 'comment_indent' ); $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' ); @@ -60,7 +60,7 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'item_colour', $_POST['redbasic_item_colour']); set_pconfig(local_user(), 'redbasic', 'comment_item_colour', $_POST['redbasic_comment_item_colour']); set_pconfig(local_user(), 'redbasic', 'comment_border_colour', $_POST['redbasic_comment_border_colour']); - set_pconfig(local_user(), 'redbasic', 'item_opacity', $_POST['redbasic_item_opacity']); + set_pconfig(local_user(), 'redbasic', 'comment_indent', $_POST['redbasic_comment_indent']); 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']); @@ -117,7 +117,7 @@ if(feature_enabled(local_user(),'expert')) '$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $arr['item_colour']), '$comment_item_colour' => array('redbasic_comment_item_colour', t('Set the background colour of comments'), $arr['comment_item_colour']), '$comment_border_colour' => array('redbasic_comment_border_colour', t('Set the border colour of comments'), $arr['comment_border_colour']), - '$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $arr['item_opacity']), + '$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']), '$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']), '$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index e03d1c741..881ddcf4f 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -27,7 +27,7 @@ if(! $a->install) { $item_colour = get_pconfig($uid, "redbasic", "item_colour"); $comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour"); $comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour"); - $item_opacity = get_pconfig($uid, "redbasic", "item_opacity"); + $comment_indent = get_pconfig($uid, "redbasic", "comment_indent"); $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"); @@ -251,7 +251,7 @@ if(! $a->install) { if (!$comment_padding) $comment_padding="0px"; if (!$comment_border_left) - $comment_border_left="2px solid"; + $comment_border_left="3px solid"; if (!$comment_border_right) $comment_border_right="0px solid"; if (!$comment_border_top) @@ -300,7 +300,6 @@ $options = array ( '$item_colour' => $item_colour, '$comment_item_colour' => $comment_item_colour, '$comment_border_colour' => $comment_border_colour, -'$item_opacity' => $item_opacity, '$toolicon_colour' => $toolicon_colour, '$toolicon_activecolour' => $toolicon_activecolour, '$font_size' => $font_size, diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index effdc6705..b6573af8c 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -21,7 +21,7 @@ {{include file="field_colorinput.tpl" field=$item_colour}} {{include file="field_colorinput.tpl" field=$comment_item_colour}} {{include file="field_colorinput.tpl" field=$comment_border_colour}} -{{include file="field_input.tpl" field=$item_opacity}} +{{include file="field_input.tpl" field=$comment_indent}} {{include file="field_colorinput.tpl" field=$toolicon_colour}} {{include file="field_colorinput.tpl" field=$toolicon_activecolour}} {{include file="field_input.tpl" field=$body_font_size}} -- cgit v1.2.3