From b5ebfa5777059c4f1b894c5afb0eb949f5d2698e Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Fri, 25 Jul 2014 00:57:43 +0000 Subject: [PATCH] Default Settings: Array type modifications, change Theme background color to type array instead of text, add order field to v_default_settings table. --- core/default_settings/app_config.php | 5 +++ themes/enhanced/app_defaults.php | 10 +++--- themes/enhanced/template.php | 46 ++++++++++++++-------------- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/core/default_settings/app_config.php b/core/default_settings/app_config.php index 7feb9ff61a..4c10fa078e 100644 --- a/core/default_settings/app_config.php +++ b/core/default_settings/app_config.php @@ -77,6 +77,10 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the value."; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "default_setting_order"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "default_setting_enabled"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; @@ -84,4 +88,5 @@ $apps[$x]['db'][$y]['fields'][$z]['name'] = "default_setting_description"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + ?> \ No newline at end of file diff --git a/themes/enhanced/app_defaults.php b/themes/enhanced/app_defaults.php index 7c8bfeb2e9..3d8d251f42 100644 --- a/themes/enhanced/app_defaults.php +++ b/themes/enhanced/app_defaults.php @@ -44,16 +44,18 @@ if ($domains_processed == 1) { $array[$x]['default_setting_description'] = 'Specify a folder path or file path/url to enable background image(s) within a selected compatible template.'; $x++; $array[$x]['default_setting_category'] = 'theme'; - $array[$x]['default_setting_subcategory'] = 'background_color_1'; - $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_subcategory'] = 'background_color'; + $array[$x]['default_setting_name'] = 'array'; $array[$x]['default_setting_value'] = '#ffffff'; $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_order'] = '0'; $array[$x]['default_setting_description'] = 'Enter a background (HTML compatible) color.'; $x++; $array[$x]['default_setting_category'] = 'theme'; - $array[$x]['default_setting_subcategory'] = 'background_color_2'; - $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_subcategory'] = 'background_color'; + $array[$x]['default_setting_name'] = 'array'; $array[$x]['default_setting_value'] = '#f0f2f6'; + $array[$x]['default_setting_order'] = '1'; $array[$x]['default_setting_enabled'] = 'false'; $array[$x]['default_setting_description'] = 'Enter a secondary background (HTML compatible) color, for a gradient effect.'; $x++; diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php index e3c02d7e37..facd16d4c0 100644 --- a/themes/enhanced/template.php +++ b/themes/enhanced/template.php @@ -62,8 +62,8 @@ DIV#page { /* Set the position and dimensions of the background image. */ DIV#page-background { @@ -77,18 +77,18 @@ if ( .page-background-gradient { - background-color: ; - background-image: -ms-linear-gradient(top, 0%, 100%); - background-image: -moz-linear-gradient(top , 0%, 100%); - background-image: -o-linear-gradient(top , 0%, 100%); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, ), color-stop(1, )); - background-image: -webkit-linear-gradient(top , 0%, 100%); - background-image: linear-gradient(to bottom, 0%, 100%); + background-color: ; + background-image: -ms-linear-gradient(top, 0%, 100%); + background-image: -moz-linear-gradient(top , 0%, 100%); + background-image: -o-linear-gradient(top , 0%, 100%); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, ), color-stop(1, )); + background-image: -webkit-linear-gradient(top , 0%, 100%); + background-image: linear-gradient(to bottom, 0%, 100%); } 0 && ( isset($_SESSION['theme']['background_image']['text']) || - isset($_SESSION['theme']['background_color_1']['text']) || - isset($_SESSION['theme']['background_color_2']['text']) + $_SESSION['theme']['background_color'][0] != '' || + $_SESSION['theme']['background_color'][1] != '' )) { ?> background-color: #FFFFFF; background-attachment: fixed; @@ -1076,24 +1076,24 @@ legend { // check for background color else if ( - isset($_SESSION['theme']['background_color_1']['text']) || - isset($_SESSION['theme']['background_color_2']['text']) + $_SESSION['theme']['background_color'][0] != '' || + $_SESSION['theme']['background_color'][1] != '' ) { // background color 1 or 2 is enabled - echo "bg1 = ".$_SESSION['theme']['background_color_1']['text']."

"; - echo "bg2 = ".$_SESSION['theme']['background_color_2']['text']."

"; + echo "bg1 = ".$_SESSION['theme']['background_color'][0]."

"; + echo "bg2 = ".$_SESSION['theme']['background_color'][1]."

"; - if ($_SESSION['theme']['background_color_1']['text'] != '' && $_SESSION['theme']['background_color_2']['text'] == '') { // use color 1 - echo "
 
\n"; + if ($_SESSION['theme']['background_color'][0] != '' && $_SESSION['theme']['background_color'][1] == '') { // use color 1 + echo "
 
\n"; } - else if ($_SESSION['theme']['background_color_1']['text'] == '' && $_SESSION['theme']['background_color_2']['text'] != '') { // use color 2 - echo "
 
\n"; + else if ($_SESSION['theme']['background_color'][0] == '' && $_SESSION['theme']['background_color'][1] != '') { // use color 2 + echo "
 
\n"; } - else if ($_SESSION['theme']['background_color_1']['text'] != '' && $_SESSION['theme']['background_color_2']['text'] != '') { // vertical gradient + else if ($_SESSION['theme']['background_color'][0] != '' && $_SESSION['theme']['background_color'][1] != '') { // vertical gradient echo "
 
\n"; } else { // default: white - echo "
 
\n"; + echo "
 
\n"; } } ?>