diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index e40636dbaf..a799d156ad 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -403,6 +403,23 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { } elseif ($category == "provision" && $subcategory == "password" && $name == "var" ) { echo " \n"; + } + elseif ($category == "theme" && $subcategory == "background_images" && $name == "var") { + echo " \n"; } else { echo " \n"; } diff --git a/themes/enhanced/app_defaults.php b/themes/enhanced/app_defaults.php new file mode 100644 index 0000000000..b7a00bc709 --- /dev/null +++ b/themes/enhanced/app_defaults.php @@ -0,0 +1,58 @@ + + Portions created by the Initial Developer are Copyright (C) 2008-2012 + the Initial Developer. All Rights Reserved. + + Contributor(s): + Mark J Crane +*/ + +if ($domains_processed == 1) { + + //add theme settings default settings + $sql = "select count(*) as num_rows from v_default_settings "; + $sql .= "where default_setting_category = 'theme' "; + $sql .= "and default_setting_subcategory = 'background_images' "; + $sql .= "and default_setting_name = 'var' "; + $prep_statement = $db->prepare($sql); + if ($prep_statement) { + $prep_statement->execute(); + $row = $prep_statement->fetch(PDO::FETCH_ASSOC); + unset($prep_statement); + if ($row['num_rows'] == 0) { + $x = 0; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'background_images'; + $array[$x]['default_setting_name'] = 'var'; + $array[$x]['default_setting_value'] = 'true'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Enable background images in the selected template (where available).'; + $x++; + $orm = new orm; + $orm->name('default_settings'); + $orm->save($array[0]); + $message = $orm->message; + //print_r($message); + } + unset($row); + } +} + +?> diff --git a/themes/enhanced/app_languages.php b/themes/enhanced/app_languages.php index 178f49b18c..1f29fe20cf 100644 --- a/themes/enhanced/app_languages.php +++ b/themes/enhanced/app_languages.php @@ -11,7 +11,7 @@ $text['theme-label-domain']['pt-pt'] = "Domínio:"; $text['theme-label-domain']['fr-fr'] = "Domaine:"; - $text['theme-label-open_selector']['en-us'] = "Open Domain Selector"; + $text['theme-label-open_selector']['en-us'] = "Open Domain Selector [ESC]"; $text['theme-label-open_selector']['es-cl'] = "Selector de Dominio Abierto"; $text['theme-label-open_selector']['pt-pt'] = "Seletor de Domínio Aberto"; $text['theme-label-open_selector']['fr-fr'] = "Sélecteur Domaine Ouvert"; diff --git a/themes/enhanced/images/logo.png b/themes/enhanced/images/logo.png index 819d78a095..1dcd520efa 100644 Binary files a/themes/enhanced/images/logo.png and b/themes/enhanced/images/logo.png differ diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php index c5bca949f1..b254d8f5e9 100644 --- a/themes/enhanced/template.php +++ b/themes/enhanced/template.php @@ -59,6 +59,18 @@ DIV#page { overflow: auto; } + + /* Set the position and dimensions of the background image. */ + DIV#page-background { + z-index: 0; + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + } + + img { border: none; } @@ -433,10 +445,13 @@ legend { .menu_bar { background-image: url('/themes/enhanced/images/background_black.png'); - -webkit-border-radius: 4px 4px 4px 4px; - -moz-border-radius: 4px 4px 4px 4px; - border-radius: 4px 4px 4px 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; padding: 4px; + -webkit-box-shadow: 0px 1px 4px #aaa; + -moz-box-shadow: 0px 1px 4px #aaa; + box-shadow: 0px 1px 4px #aaa; } .menu_bg { @@ -461,11 +476,10 @@ legend { filter:alpha(opacity=90); -moz-opacity:0.9; -khtml-opacity: 0.9; - opacity: 0.9; - -webkit-border-radius: 3px 3px 3px 3px; - -moz-border-radius: 3px 3px 3px 3px; - border-radius: 3px 3px 3px 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; text-align: left; padding-top: 15px; padding-bottom: 25px; @@ -474,27 +488,23 @@ legend { } .main_content { - 0) { - echo "background-image: url('/themes/enhanced/images/content_background.png');"; - } - } - ?> - background-repeat: repeat-x; - background-attachment: fixed; - padding: 20px; - opacity: 0.9; - filter:alpha(opacity=90); - -moz-opacity:0.9; - -khtml-opacity: 0.9; - opacity: 0.9; - -webkit-border-radius: 3px 3px 3px 3px; - -moz-border-radius: 3px 3px 3px 3px; - border-radius: 3px 3px 3px 3px; + 0 && $_SESSION['theme']['background_images']['var'] == 'true') { ?> + background-color: #FFFFFF; + background-attachment: fixed; + opacity: 0.93; + filter:alpha(opacity=93); + -moz-opacity:0.93; + -khtml-opacity: 0.93; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0px 1px 4px #aaa; + -moz-box-shadow: 0px 1px 4px #aaa; + box-shadow: 0px 1px 4px #aaa; + padding: 20px; + + padding: 10px; + text-align: left; } @@ -509,7 +519,7 @@ legend { /*border-color:#ccc #888 #555 #bbb;*/ white-space:nowrap; margin:0; - padding:3px 3px 3px 3px; + padding: 3px; } #menu h2{ @@ -534,7 +544,7 @@ legend { #menu h2 h2{ /*background:#4e4b56 url(/css/images/expand3.gif) no-repeat 100% 100%;*/ /*text-transform:uppercase*/ - padding:3px 3px 3px 3px; + padding: 3px; } #menu a{ @@ -574,15 +584,18 @@ legend { -webkit-border-radius: 0px 0px 3px 3px; -moz-border-radius: 0px 0px 3px 3px; border-radius: 0px 0px 3px 3px; + -webkit-box-shadow: 0px 2px 3px #aaa; + -moz-box-shadow: 0px 2px 3px #aaa; + box-shadow: 0px 2px 3px #aaa; } #menu a:hover{ width:114px; color:#fd9c03; background:#1F1F1F; - -webkit-border-radius: 3px 3px 3px 3px; - -moz-border-radius: 3px 3px 3px 3px; - border-radius: 3px 3px 3px 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } #menu a:active{ @@ -620,9 +633,9 @@ legend { file and this method */ div#menu h2:hover{ - -webkit-border-radius: 3px 3px 3px 3px; - -moz-border-radius: 3px 3px 3px 3px; - border-radius: 3px 3px 3px 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; /*background:#1F1F1F url(/css/images/expand3.gif) no-repeat -999px -9999px;*/ } @@ -778,9 +791,9 @@ legend { DIV.login_message { border: 1px solid #bae0ba; background-color: #eeffee; - -webkit-border-radius: 3px 3px 3px 3px; - -moz-border-radius: 3px 3px 3px 3px; - border-radius: 3px 3px 3px 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; padding: 20px; } @@ -955,10 +968,44 @@ legend { } ?> + 1000) { break; }; + $x++; + } + } + if (strlen($_SESSION['background_image'])== 0) { + $_SESSION['background_image'] = $v_background_array[array_rand($v_background_array, 1)]; + } + + //show the background + echo "
\n"; + } + ?> +
-
+ - + - - +
@@ -1059,24 +1106,24 @@ legend { if (strlen($_SESSION["username"]) > 0) { ?>
+
- +
-
+

@@ -1087,7 +1134,6 @@ legend {





-
@@ -1097,7 +1143,8 @@ legend { \n"; - echo " fusionpbx.com. Copyright 2008 - ".date("Y").". All rights reserved.\n"; + echo "
\n"; + echo "© Copyright 2008 - ".date("Y")." fusionpbx.com. All rights reserved.\n"; echo "

\n"; } else {