From 6573a2b535eff56ff42aa2fdcd27eb10255274e3 Mon Sep 17 00:00:00 2001
From: reliberate <git@reliberate.com>
Date: Tue, 5 Apr 2016 19:38:50 -0600
Subject: [PATCH] Theme: Add settings to control main and sub menu border size,
 color and corner radius.

---
 themes/default/app_defaults.php | 42 +++++++++++++++++++++++++++++++++
 themes/default/template.php     | 15 ++++++++++--
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/themes/default/app_defaults.php b/themes/default/app_defaults.php
index e2312c8738..3968f26782 100644
--- a/themes/default/app_defaults.php
+++ b/themes/default/app_defaults.php
@@ -277,6 +277,27 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_description'] = 'Set the text size of the main menu items.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'menu_main_border_radius';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '0 0 4px 4px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the border radius of the main menu.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'menu_main_border_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '1px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the border size of the main menu.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'menu_main_border_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#ffffff';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the border color (and opacity) of the main menu.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'menu_position';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = 'top';
@@ -347,6 +368,27 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_enabled'] = 'false';
 		$array[$x]['default_setting_description'] = 'Set the text size of the sub menu items.';
 		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'menu_sub_border_radius';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '0 0 4px 4px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the border radius of the sub menu.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'menu_sub_border_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '1px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the border size of the sub menu.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'menu_sub_border_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#ffffff';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the border color (and opacity) of the sub menu.';
+		$x++;
 		/* body elements */
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'heading_text_font';
diff --git a/themes/default/template.php b/themes/default/template.php
index 07ace5f267..82156fd044 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -225,7 +225,16 @@
 		-webkit-box-shadow: <?php echo ($_SESSION['theme']['menu_main_shadow_color']['text'] != '') ? '0 0 5px '.$_SESSION['theme']['menu_main_shadow_color']['text'] : 'none';?>;
 		-moz-box-shadow: <?php echo ($_SESSION['theme']['menu_main_shadow_color']['text'] != '') ? '0 0 5px '.$_SESSION['theme']['menu_main_shadow_color']['text'] : 'none';?>;
 		box-shadow: <?php echo ($_SESSION['theme']['menu_main_shadow_color']['text'] != '') ? '0 0 5px '.$_SESSION['theme']['menu_main_shadow_color']['text'] : 'none';?>;
-		border: none;
+		border-color: <?php echo ($_SESSION['theme']['menu_main_border_color']['text'] != '') ? $_SESSION['theme']['menu_main_border_color']['text'] : '#ffffff'; ?>;
+		border-size: <?php echo ($_SESSION['theme']['menu_main_border_size']['text'] != '') ? $_SESSION['theme']['menu_main_border_size']['text'] : '0'; ?>;
+		<?php
+		switch ($_SESSION['theme']['menu_style']['text']) {
+			case 'inline': $default_radius = '4px'; break;
+			case 'static': $default_radius = '0 0 4px 4px'; break;
+			default: $default_radius = '0';
+		}
+		?>
+		border-radius: <?php echo ($_SESSION['theme']['menu_main_border_radius']['text'] != '') ? $_SESSION['theme']['menu_main_border_radius']['text'] : $default_radius; ?>;
 		}
 
 	/* main menu logo */
@@ -299,11 +308,13 @@
 	.navbar-nav > li > .dropdown-menu {
 		margin-top: 0;
 		padding-bottom: 10px;
-		border: none;
+		border-color: <?php echo ($_SESSION['theme']['menu_sub_border_color']['text'] != '') ? $_SESSION['theme']['menu_sub_border_color']['text'] : '#ffffff'; ?>;
+		border-size: <?php echo ($_SESSION['theme']['menu_sub_border_size']['text'] != '') ? $_SESSION['theme']['menu_sub_border_size']['text'] : '0'; ?>;
 		background: <?php echo ($_SESSION['theme']['menu_sub_background_color']['text'] != '') ? $_SESSION['theme']['menu_sub_background_color']['text'] : 'rgba(0,0,0,0.90)'; ?>;
 		-webkit-box-shadow: <?php echo ($_SESSION['theme']['menu_sub_shadow_color']['text'] != '') ? '0 0 5px '.$_SESSION['theme']['menu_sub_shadow_color']['text'] : 'none';?>;
 		-moz-box-shadow: <?php echo ($_SESSION['theme']['menu_sub_shadow_color']['text'] != '') ? '0 0 5px '.$_SESSION['theme']['menu_sub_shadow_color']['text'] : 'none';?>;
 		box-shadow: <?php echo ($_SESSION['theme']['menu_sub_shadow_color']['text'] != '') ? '0 0 5px '.$_SESSION['theme']['menu_sub_shadow_color']['text'] : 'none';?>;
+		border-radius: <?php echo ($_SESSION['theme']['menu_sub_border_radius']['text'] != '') ? $_SESSION['theme']['menu_sub_border_radius']['text'] : '0 0 4px 4px'; ?>;
 		}
 
 	/* sub menu item */