aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-05 15:33:17 -0800
committerfriendica <info@friendica.com>2013-11-05 15:33:17 -0800
commit4a371480c8e0aab1084341204efec80efb930a93 (patch)
tree9f6c4a301c2b6bb41d8f67962461ecba30749995
parentf9e97d97acbdc0588a1b161924f81a300d2f39d6 (diff)
parent9dfa7c6030d673a05a5c9bc692c579ec7eeeb7db (diff)
downloadvolse-hubzilla-4a371480c8e0aab1084341204efec80efb930a93.tar.gz
volse-hubzilla-4a371480c8e0aab1084341204efec80efb930a93.tar.bz2
volse-hubzilla-4a371480c8e0aab1084341204efec80efb930a93.zip
Merge pull request #193 from git-marijus/master
make the font-colour for the banner adjustable as well
-rw-r--r--view/theme/redbasic/css/style.css2
-rw-r--r--view/theme/redbasic/php/config.php7
-rw-r--r--view/theme/redbasic/php/style.php6
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl3
4 files changed, 13 insertions, 5 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 9ecb23f5e..a19630292 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -188,7 +188,7 @@ header #banner {
text-align: center;
font-size: 1.4em;
font-family: tahoma, "Lucida Sans", sans;
- color: #FFF;
+ color: $banner_colour;
font-weight: bold;
margin-top: 1px;
}
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 0007d8c24..fa441e15e 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -5,6 +5,7 @@ function theme_content(&$a) {
$schema = get_pconfig(local_user(),'redbasic', 'schema' );
$nav_colour = get_pconfig(local_user(),'redbasic', 'nav_colour' );
+ $banner_colour = get_pconfig(local_user(),'redbasic', 'banner_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' );
@@ -16,7 +17,7 @@ function theme_content(&$a) {
$section_width=get_pconfig(local_user(),"redbasic","section_width");
$nav_min_opacity=get_pconfig(local_user(),"redbasic","nav_min_opacity");
$sloppy_photos=get_pconfig(local_user(),"redbasic","sloppy_photos");
- return redbasic_form($a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity,
+ return redbasic_form($a, $schema, $nav_colour, $banner_colour, $bgcolour, $background_image, $item_colour, $item_opacity,
$font_size, $font_colour, $radius, $shadow, $section_width,$nav_min_opacity,$sloppy_photos);
}
@@ -27,6 +28,7 @@ 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']);
@@ -42,7 +44,7 @@ function theme_post(&$a) {
// FIXME - this really should be an array
-function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity,
+function redbasic_form(&$a, $schema, $nav_colour, $banner_colour, $bgcolour, $background_image, $item_colour, $item_opacity,
$font_size, $font_colour, $radius, $shadow, $section_width,$nav_min_opacity,$sloppy_photos) {
$scheme_choices = array();
@@ -75,6 +77,7 @@ if(feature_enabled(local_user(),'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),
+ '$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $banner_colour),
'$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),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 56df0f4f2..6ea6faadc 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -12,6 +12,7 @@
$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");
@@ -54,6 +55,8 @@
$nav_bg_3 = "#f00";
$nav_bg_4 = "#b00";
}
+ if (! $banner_colour)
+ $banner_colour = "fff";
if (! $bgcolour)
$bgcolour = "fff";
if (! $background_image)
@@ -116,6 +119,7 @@ $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,
@@ -137,4 +141,4 @@ 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');
-} \ No newline at end of file
+}
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index c7f2bf124..48b9c07c3 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -5,6 +5,7 @@
{{if $expert}}
{{include file="field_select.tpl" field=$nav_colour}}
+{{include file="field_input.tpl" field=$banner_colour}}
{{include file="field_input.tpl" field=$bgcolour}}
{{include file="field_input.tpl" field=$background_image}}
{{include file="field_input.tpl" field=$item_colour}}
@@ -19,4 +20,4 @@
<div class="settings-submit-wrapper">
<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
</div>
-{{/if}} \ No newline at end of file
+{{/if}}