Merge pull request #296 from tazmandevil/master

link color
This commit is contained in:
friendica 2014-02-01 20:47:19 -08:00
commit a9ceeff988
4 changed files with 11 additions and 3 deletions

View File

@ -40,11 +40,11 @@ abbr {
a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
font-weight: bold; font-weight: bold;
color: #0080FF; color: $link_colour;
text-decoration: none; text-decoration: none;
} }
a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } a:hover, .fakelink:hover { color: #c40003; text-decoration: underline; }
.fakelink { .fakelink {
cursor: pointer; cursor: pointer;
@ -2449,4 +2449,4 @@ img.mail-list-sender-photo {
.online-now { .online-now {
color: red; color: red;
cursor: pointer; cursor: pointer;
} }

View File

@ -7,6 +7,7 @@ function theme_content(&$a) {
$arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' ); $arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' );
$arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_colour' ); $arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_colour' );
$arr['link_colour'] = get_pconfig(local_user(),'redbasic', 'link_colour' );
$arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' ); $arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' );
$arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' ); $arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' );
$arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' ); $arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' );
@ -33,6 +34,7 @@ function theme_post(&$a) {
if (isset($_POST['redbasic-settings-submit'])) { if (isset($_POST['redbasic-settings-submit'])) {
set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']); 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', 'nav_colour', $_POST['redbasic_nav_colour']);
set_pconfig(local_user(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']);
set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_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', 'banner_colour', $_POST['redbasic_banner_colour']);
set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']); set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']);
@ -88,6 +90,7 @@ if(feature_enabled(local_user(),'expert'))
'$title' => t("Theme settings"), '$title' => t("Theme settings"),
'$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices), '$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), '$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $arr['nav_colour'], '', $nav_colours),
'$link_colour' => array('redbasic_link_colour', t('link colour'), $arr['link_colour'], '', $link_colours),
'$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']), '$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']), '$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']), '$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']),

View File

@ -13,6 +13,7 @@
// Load the owners pconfig // Load the owners pconfig
$banner_colour = get_pconfig($uid,'redbasic','banner_colour'); $banner_colour = get_pconfig($uid,'redbasic','banner_colour');
$link_colour = get_pconfig($uid, "redbasic", "link_colour");
$schema = get_pconfig($uid,'redbasic','schema'); $schema = get_pconfig($uid,'redbasic','schema');
$bgcolour = get_pconfig($uid, "redbasic", "background_colour"); $bgcolour = get_pconfig($uid, "redbasic", "background_colour");
$background_image = get_pconfig($uid, "redbasic", "background_image"); $background_image = get_pconfig($uid, "redbasic", "background_image");
@ -63,6 +64,8 @@
$nav_bg_3 = "#f00"; $nav_bg_3 = "#f00";
$nav_bg_4 = "#b00"; $nav_bg_4 = "#b00";
} }
if (! $link_colour)
$link_colour = "#7b0000";
if (! $banner_colour) if (! $banner_colour)
$banner_colour = "fff"; $banner_colour = "fff";
if (! $bgcolour) if (! $bgcolour)
@ -141,6 +144,7 @@ $options = array (
'$nav_bg_2' => $nav_bg_2, '$nav_bg_2' => $nav_bg_2,
'$nav_bg_3' => $nav_bg_3, '$nav_bg_3' => $nav_bg_3,
'$nav_bg_4' => $nav_bg_4, '$nav_bg_4' => $nav_bg_4,
'$link_colour' => $link_colour,
'$banner_colour' => $banner_colour, '$banner_colour' => $banner_colour,
'$search_background' => $search_background, '$search_background' => $search_background,
'$bgcolour' => $bgcolour, '$bgcolour' => $bgcolour,

View File

@ -6,6 +6,7 @@
{{if $expert}} {{if $expert}}
{{include file="field_select.tpl" field=$nav_colour}} {{include file="field_select.tpl" field=$nav_colour}}
{{include file="field_input.tpl" field=$banner_colour}} {{include file="field_input.tpl" field=$banner_colour}}
{{include file="field_input.tpl" field=$link_colour}}
{{include file="field_input.tpl" field=$bgcolour}} {{include file="field_input.tpl" field=$bgcolour}}
{{include file="field_input.tpl" field=$background_image}} {{include file="field_input.tpl" field=$background_image}}
{{include file="field_input.tpl" field=$item_colour}} {{include file="field_input.tpl" field=$item_colour}}