Merge https://github.com/friendica/red into zpull

5 files changed, 13 insertions, 5 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 02832b5f0..1a36c1c43 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -40,11 +40,11 @@ abbr {
 
 a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
 	font-weight: bold;
-	color: #0080FF; 
+	color: $link_colour; 
 	text-decoration: none; 
 }
 
-a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
+a:hover, .fakelink:hover { color: #c40003; text-decoration: underline; }
 
 .fakelink {
 	cursor: pointer;
@@ -2449,4 +2449,4 @@ img.mail-list-sender-photo {
 .online-now {
 	color: red;
 	cursor: pointer;
-}
\ No newline at end of file
+}
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 20355197f..d6adf5381 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -7,6 +7,7 @@ function theme_content(&$a) {
 
 	$arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' );
 	$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['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' );
 	$arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' );
@@ -33,6 +34,7 @@ function theme_post(&$a) {
 	if (isset($_POST['redbasic-settings-submit'])) {
 		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', 'link_colour', $_POST['redbasic_link_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']);
@@ -88,6 +90,7 @@ if(feature_enabled(local_user(),'expert'))
 		'$title' => t("Theme settings"),
 		'$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),
+		'$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']),
 		'$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']),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 9956ccd31..fcb762891 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -13,6 +13,7 @@
 
 // Load the owners pconfig
 		$banner_colour = get_pconfig($uid,'redbasic','banner_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");	
@@ -63,6 +64,8 @@
 			$nav_bg_3 = "#f00";
 			$nav_bg_4 = "#b00";
 		}
+	if (! $link_colour)
+		$link_colour = "#7b0000";
 	if (! $banner_colour)
 		$banner_colour = "fff";
 	if (! $bgcolour)
@@ -141,6 +144,7 @@ $options = array (
 '$nav_bg_2' => $nav_bg_2,
 '$nav_bg_3' => $nav_bg_3,
 '$nav_bg_4' => $nav_bg_4,
+'$link_colour' => $link_colour,
 '$banner_colour' => $banner_colour,
 '$search_background' => $search_background,
 '$bgcolour' => $bgcolour,
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index e0f546896..ca05986a2 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -6,6 +6,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=$link_colour}}
 {{include file="field_input.tpl" field=$bgcolour}}
 {{include file="field_input.tpl" field=$background_image}}
 {{include file="field_input.tpl" field=$item_colour}}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index f27afed09..048f53743 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -39,7 +39,7 @@
 			<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th nav-icon"></i></a>
 			<span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span>
 			<ul id="nav-network-menu" class="menu-popup notify-menus" rel="network">
-				<li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li>
+				{{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}}
 				<li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li>
 				<li class="empty">{{$emptynotifications}}</li>
 			</ul>
@@ -51,7 +51,7 @@
 			<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home nav-icon"></i></a>
 			<span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span>
 			<ul id="nav-home-menu" class="menu-popup notify-menus" rel="home">
-				<li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li>
+				{{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}}
 				<li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li>
 				<li class="empty">{{$emptynotifications}}</li>
 			</ul>