From 2ae3be3a9abd769d13b4b02dbaa53e3b8a5e016c Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Sun, 17 Aug 2014 06:30:31 +0000
Subject: [PATCH] Enhanced Theme: Added Default Settings to control the color,
 background color, opacity and hide delay of header response messages.

---
 .../default_settings/default_setting_edit.php |  8 ++-
 themes/enhanced/app_defaults.php              | 57 ++++++++++++++++++-
 themes/enhanced/template.php                  | 24 ++++----
 3 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 590ab61583..64b480d7e2 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -417,7 +417,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		$category == "theme" && $subcategory == "background_color" && $name == "array" ||
 		$category == "theme" && $subcategory == "login_background_color" && $name == "text" ||
 		$category == "theme" && $subcategory == "footer_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "footer_background_color" && $name == "text"
+		$category == "theme" && $subcategory == "footer_background_color" && $name == "text" ||
+		$category == "theme" && $subcategory == "message_default_background_color" && $name == "text" ||
+		$category == "theme" && $subcategory == "message_default_color" && $name == "text" ||
+		$category == "theme" && $subcategory == "message_negative_background_color" && $name == "text" ||
+		$category == "theme" && $subcategory == "message_negative_color" && $name == "text" ||
+		$category == "theme" && $subcategory == "message_alert_background_color" && $name == "text" ||
+		$category == "theme" && $subcategory == "message_alert_color" && $name == "text"
 		) {
 		echo "	<style>";
 		echo "		DIV.rui-colorpicker  { width: 253px; }";
diff --git a/themes/enhanced/app_defaults.php b/themes/enhanced/app_defaults.php
index 32cd24a8ae..744c9e7627 100644
--- a/themes/enhanced/app_defaults.php
+++ b/themes/enhanced/app_defaults.php
@@ -77,6 +77,62 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_value'] = '0.2';
 		$array[$x]['default_setting_enabled'] = 'true';
 		$array[$x]['default_setting_description'] = 'Set the opacity of the footer bar (decimal).';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'message_default_background_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#ccffcc';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Set the background color (HTML compatible) for the positive (default) message bar.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'message_default_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#004200';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Set the foreground color (HTML compatible) for the positive (default) message bar text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'message_negative_background_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#ffcdcd';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Set the background color (HTML compatible) for the negative message bar.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'message_negative_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#670000';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Set the foreground color (HTML compatible) for the negative message bar text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'message_alert_background_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#ffe585';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Set the background color (HTML compatible) for the alert message bar.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'message_alert_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#d66721';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Set the foreground color (HTML compatible) for the alert message bar text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'message_opacity';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '0.7';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Set the opacity of the message bar (decimal).';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'message_delay';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '1.75';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Set the hide delay of the message bar (seconds).';
 
 	//iterate and add each, if necessary
 		foreach ($array as $index => $default_settings) {
@@ -91,7 +147,6 @@ if ($domains_processed == 1) {
 				$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
 				unset($prep_statement);
 				if ($row['num_rows'] == 0) {
-
 					$orm = new orm;
 					$orm->name('default_settings');
 					$orm->save($array[$index]);
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 3dd75d85d0..74494b28e4 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -802,27 +802,27 @@ legend {
 	}
 
 	.message_container_mood_default {
-		background-color: #ccffcc;
+		background-color: <?php echo $_SESSION['theme']['message_default_background_color']['text']; ?>;
 	}
 
 	.message_container_mood_negative {
-		background-color: #ffcdcd;
+		background-color: <?php echo $_SESSION['theme']['message_negative_background_color']['text']; ?>;
 	}
 
 	.message_container_mood_alert {
-		background-color: #ffe585;
+		background-color: <?php echo $_SESSION['theme']['message_alert_background_color']['text']; ?>;
 	}
 
 	.message_text_mood_default {
-		color: #004200;
+		color: <?php echo $_SESSION['theme']['message_default_color']['text']; ?>;
 	}
 
 	.message_text_mood_negative {
-		color: #670000;
+		color: <?php echo $_SESSION['theme']['message_negative_color']['text']; ?>;
 	}
 
 	.message_text_mood_alert {
-		color: #d66721;
+		color: <?php echo $_SESSION['theme']['message_alert_color']['text']; ?>;
 	}
 
 	#logout_icon {
@@ -841,7 +841,7 @@ legend {
 		cursor: pointer;
 	}
 
-	#domains_show_icon {
+	#domain_selector_icon {
 		filter: alpha(opacity=80);
 		opacity: 0.8;
 		-moz-opacity: 0.8;
@@ -849,7 +849,7 @@ legend {
 		margin-left: 17px;
 	}
 
-	#domains_show_icon:hover {
+	#domain_selector_icon:hover {
 		filter: alpha(opacity=100);
 		opacity: 1;
 		-moz-opacity: 1;
@@ -963,7 +963,7 @@ legend {
 <script language="JavaScript" type="text/javascript">
 	$(document).ready(function() {
 
-		$("#domains_show_icon").click(function() { show_domains(); });
+		$("#domain_selector_icon").click(function() { show_domains(); });
 		$("#domains_hide").click(function() { hide_domains(); });
 
 		function show_domains() {
@@ -1031,8 +1031,8 @@ legend {
 			$("#message_text").html(msg);
 			$("#message_container").css({height: $("#message_text").css("height")});
 			$("#message_container").css({width: inner_width});
-			$("#message_text").animate({top: '+=200'}, 0).animate({opacity: 1}, "fast").delay(1750).animate({top: '-=200'}, 1000).animate({opacity: 0});
-			$("#message_container").animate({top: '+=200'}, 0).animate({opacity: 0.7}, "fast").delay(1750).animate({top: '-=200'}, 1000).animate({opacity: 0}, function() {
+			$("#message_text").animate({top: '+=200'}, 0).animate({opacity: 1}, "fast").delay(<?php echo (1000 * (float) $_SESSION['theme']['message_delay']['text']); ?>).animate({top: '-=200'}, 1000).animate({opacity: 0});
+			$("#message_container").animate({top: '+=200'}, 0).animate({opacity: <?php echo $_SESSION['theme']['message_opacity']['text']; ?>}, "fast").delay(<?php echo (1000 * (float) $_SESSION['theme']['message_delay']['text']); ?>).animate({top: '-=200'}, 1000).animate({opacity: 0}, function() {
 				$("#message_container").removeClass('message_container_mood_'+mood);
 			});
 		}
@@ -1270,7 +1270,7 @@ if (strlen($_SESSION['message']) > 0) {
 
 								//domain selector icon
 									if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
-										echo "<img id='domains_show_icon' src='".PROJECT_PATH."/themes/enhanced/images/icon_domain_selector.png' style='width: 28px; height: 23px; border: none; margin-top: 15px;' title='".$_SESSION['domain_name']." &#10;".$text['theme-label-open_selector']."' align='absmiddle'>";
+										echo "<img id='domain_selector_icon' src='".PROJECT_PATH."/themes/enhanced/images/icon_domain_selector.png' style='width: 28px; height: 23px; border: none; margin-top: 15px;' title='".$_SESSION['domain_name']." &#10;".$text['theme-label-open_selector']."' align='absmiddle'>";
 									}
 
 									echo "</span>\n";