From bbf851eb9482726f158ad3febde0f4ebc164f376 Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Sat, 10 May 2014 22:44:07 +1000
Subject: [PATCH] Remove alternate and add link color setting

---
 assets/css/sportspress.css                            | 9 ++++++++-
 includes/admin/settings/class-sp-settings-general.php | 8 ++++----
 includes/class-sp-frontend-scripts.php                | 6 +++---
 includes/class-sp-install.php                         | 2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/assets/css/sportspress.css b/assets/css/sportspress.css
index 137139c0..6d2e40f0 100644
--- a/assets/css/sportspress.css
+++ b/assets/css/sportspress.css
@@ -151,12 +151,19 @@
 	margin-bottom: 4em;
 }
 
-/* Templates */
+/* View all */
 .sp-view-all-link {
 	display: block;
 	margin-top: 0.5em;
 }
 
+/* Alternate */
+.sp-data-table tbody tr.odd,
+.sp-data-table tbody tr.alternate,
+.sp-calendar tbody td#today {
+	background: rgba(0, 0, 0, 0.02);
+}
+
 @media only screen and (max-width: 40em) {
 	.sp-responsive-table {
 		margin-bottom: 0;
diff --git a/includes/admin/settings/class-sp-settings-general.php b/includes/admin/settings/class-sp-settings-general.php
index 08726dd7..e527f42b 100644
--- a/includes/admin/settings/class-sp-settings-general.php
+++ b/includes/admin/settings/class-sp-settings-general.php
@@ -126,15 +126,15 @@ class SP_Settings_General extends SP_Settings_Page {
 			$primary 		= ( ! empty( $_POST['sportspress_frontend_css_primary'] ) ) ? sp_format_hex( $_POST['sportspress_frontend_css_primary'] ) : '';
 			$heading 		= ( ! empty( $_POST['sportspress_frontend_css_heading'] ) ) ? sp_format_hex( $_POST['sportspress_frontend_css_heading'] ) : '';
 			$text 			= ( ! empty( $_POST['sportspress_frontend_css_text'] ) ) ? sp_format_hex( $_POST['sportspress_frontend_css_text'] ) : '';
+			$link 			= ( ! empty( $_POST['sportspress_frontend_css_link'] ) ) ? sp_format_hex( $_POST['sportspress_frontend_css_link'] ) : '';
 			$background 	= ( ! empty( $_POST['sportspress_frontend_css_background'] ) ) ? sp_format_hex( $_POST['sportspress_frontend_css_background'] ) : '';
-			$alternate 		= ( ! empty( $_POST['sportspress_frontend_css_alternate'] ) ) ? sp_format_hex( $_POST['sportspress_frontend_css_alternate'] ) : '';
 
 			$colors = array(
 				'primary' 		=> $primary,
 				'heading' 		=> $heading,
 				'text' 			=> $text,
 				'background' 	=> $background,
-				'alternate' 	=> $alternate
+				'link' 			=> $link
 			);
 
 			update_option( 'sportspress_frontend_css_colors', $colors );
@@ -186,14 +186,14 @@ class SP_Settings_General extends SP_Settings_Page {
 				if ( empty( $colors['heading'] ) ) $colors['heading'] = '#ffffff';
 				if ( empty( $colors['text'] ) ) $colors['text'] = '#222222';
 				if ( empty( $colors['background'] ) ) $colors['background'] = '#f5f5f5';
-	            if ( empty( $colors['alternate'] ) ) $colors['alternate'] = '#f0f0f0';
+	            if ( empty( $colors['link'] ) ) $colors['link'] = '#00a69c';
 
 				// Show inputs
 	    		$this->color_picker( __( 'Primary', 'sportspress' ), 'sportspress_frontend_css_primary', $colors['primary'] );
 	    		$this->color_picker( __( 'Heading', 'sportspress' ), 'sportspress_frontend_css_heading', $colors['heading'] );
 	    		$this->color_picker( __( 'Text', 'sportspress' ), 'sportspress_frontend_css_text', $colors['text'] );
+	    		$this->color_picker( __( 'Link', 'sportspress' ), 'sportspress_frontend_css_link', $colors['link'] );
 	    		$this->color_picker( __( 'Background', 'sportspress' ), 'sportspress_frontend_css_background', $colors['background'] );
-	    		$this->color_picker( __( 'Alternate', 'sportspress' ), 'sportspress_frontend_css_alternate', $colors['alternate'] );
 
 		    ?><br>
 			    <label for="sportspress_enable_frontend_css">
diff --git a/includes/class-sp-frontend-scripts.php b/includes/class-sp-frontend-scripts.php
index 9503dfaf..faef09ca 100644
--- a/includes/class-sp-frontend-scripts.php
+++ b/includes/class-sp-frontend-scripts.php
@@ -108,11 +108,11 @@ class SP_Frontend_Scripts {
 				if ( isset( $colors['text'] ) )
 					echo '.sp-data-table tbody,.sp-calendar tbody{color: ' . $colors['text'] . ' !important}';
 
+				if ( isset( $colors['link'] ) )
+					echo '.sp-data-table tbody a,.sp-data-table tbody a:hover,.sp-calendar tbody a:focus{color: ' . $colors['link'] . ' !important}';
+
 				if ( isset( $colors['background'] ) )
 					echo '.sp-data-table tbody,.sp-calendar tbody{background: ' . $colors['background'] . ' !important}';
-
-				if ( isset( $colors['alternate'] ) )
-					echo '.sp-data-table tbody tr.odd,.sp-data-table tbody tr.alternate,.sp-calendar tbody td#today{background: ' . $colors['alternate'] . ' !important}';
 			}
 
 			if ( ! empty( $custom ) )
diff --git a/includes/class-sp-install.php b/includes/class-sp-install.php
index 547a1821..0be080ec 100644
--- a/includes/class-sp-install.php
+++ b/includes/class-sp-install.php
@@ -129,8 +129,8 @@ class SP_Install {
 	    add_option( 'sportspress_frontend_css_primary', '#00a69c' );
 	    add_option( 'sportspress_frontend_css_heading', '#ffffff' );
 	    add_option( 'sportspress_frontend_css_text', '#222222' );
+	    add_option( 'sportspress_frontend_css_link', '#00a69c' );
 	    add_option( 'sportspress_frontend_css_background', '#f5f5f5' );
-	    add_option( 'sportspress_frontend_css_alternate', '#f0f0f0' );
 
 		if ( ! get_option( 'sportspress_installed' ) ) {
 			// Configure default sport