diff --git a/app/scripts/resources/scripts/app/voicemail/index.lua b/app/scripts/resources/scripts/app/voicemail/index.lua index e970ab6ad4..28cb97acf0 100644 --- a/app/scripts/resources/scripts/app/voicemail/index.lua +++ b/app/scripts/resources/scripts/app/voicemail/index.lua @@ -352,7 +352,7 @@ local sql = [[SELECT * FROM v_voicemails WHERE domain_uuid = :domain_uuid AND voicemail_id = :voicemail_id]] - local params = {domain_uuid = domain_uuid, voicemail_id = id}; + local params = {domain_uuid = domain_uuid, voicemail_id = voicemail_id}; if (debug["sql"]) then freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n"); end diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index 23e14ec725..3e9d154d64 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -628,6 +628,14 @@ echo " \n"; echo " \n"; } + elseif ($category == "theme" && $subcategory == "body_header_brand_type" && $name == "text" ) { + echo " \n"; + } elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) { echo " \n"; echo " \n"; echo " \n"; + echo " \n"; echo " \n"; echo " \n"; } @@ -685,6 +686,14 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; echo " \n"; } + elseif ($category == "theme" && $subcategory == "body_header_brand_type" && $name == "text" ) { + echo " \n"; + } elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) { echo " \n"; echo " \n"; echo " \n"; + echo " \n"; echo " \n"; echo " \n"; } @@ -647,6 +648,14 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; echo " \n"; } + else if ($user_setting_category == "theme" && $user_setting_subcategory == "body_header_brand_type" && $user_setting_name == "text" ) { + echo " \n"; + } else { echo " \n"; } diff --git a/core/user_settings/user_settings.php b/core/user_settings/user_settings.php index d3f1b998c6..371f187078 100644 --- a/core/user_settings/user_settings.php +++ b/core/user_settings/user_settings.php @@ -272,6 +272,7 @@ ( $category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) || ( $category == "theme" && $subcategory == "menu_style" && $name == "text" ) || ( $category == "theme" && $subcategory == "menu_position" && $name == "text" ) || + ( $category == "theme" && $subcategory == "body_header_brand_type" && $name == "text" ) || ( $category == "theme" && $subcategory == "logo_align" && $name == "text" ) ) { echo " ".$text['label-'.escape($row['user_setting_value'])]; diff --git a/resources/classes/menu.php b/resources/classes/menu.php index 8d2bb39a78..95a275d263 100644 --- a/resources/classes/menu.php +++ b/resources/classes/menu.php @@ -1103,9 +1103,9 @@ if (!class_exists('menu')) { $html .= ""; $html .= "\n"; } - else { - $html .= " text['theme-label-expand_menu']."\">"; - } +// else { +// $html .= " text['theme-label-expand_menu']."\">"; +// } $html .= " \n"; //main menu items if (is_array($menu_array) && sizeof($menu_array) != 0) { @@ -1138,13 +1138,19 @@ if (!class_exists('menu')) { $content_container_onclick = "onclick=\"clearTimeout(menu_side_contract_timer); if ($(window).width() >= 576) { menu_side_contract(); }\""; } $html .= "
\n"; - $html .= "
\n"; + $html .= "
\n"; //header: left $html .= "
\n"; $html .= button::create(['type'=>'button','id'=>'menu_side_state_hidden_button','title'=>$this->text['theme-label-expand_menu'],'icon'=>'bars','class'=>'default '.($_SESSION['theme']['menu_side_state']['text'] != 'hidden' ? 'hide-sm-up ' : null).'float-left','onclick'=>'menu_side_expand();']); - if ($_SESSION['theme']['menu_brand_type']['text'] == 'text' || $_SESSION['theme']['menu_brand_type']['text'] == 'image_text') { - $body_header_brand_text = $_SESSION['theme']['body_header_brand_text']['text'] != '' ? escape($_SESSION['theme']['body_header_brand_text']['text']) : "FusionPBX"; - $html .= "
".$body_header_brand_text."
\n"; + $body_header_brand_text = $_SESSION['theme']['body_header_brand_text']['text'] != '' ? escape($_SESSION['theme']['body_header_brand_text']['text']) : "FusionPBX"; + if ($_SESSION['theme']['body_header_brand_type']['text'] == 'image' || $_SESSION['theme']['body_header_brand_type']['text'] == 'image_text') { + $body_header_brand_image = $_SESSION['theme']['body_header_brand_image']['text'] != '' ? $_SESSION['theme']['body_header_brand_image']['text'] : PROJECT_PATH."/themes/default/images/logo_side_expanded.png"; + $html .= "
"; + $html .= ""; + $html .= "
"; + } + if ($_SESSION['theme']['body_header_brand_type']['text'] == 'text' || $_SESSION['theme']['body_header_brand_type']['text'] == 'image_text') { + $html .= "
".$body_header_brand_text."
"; } $html .= "
\n"; //header: right diff --git a/resources/templates/provision/yealink/t53w/y000000000095.cfg b/resources/templates/provision/yealink/t53w/y000000000095.cfg index 1558e43067..006102cb87 100644 --- a/resources/templates/provision/yealink/t53w/y000000000095.cfg +++ b/resources/templates/provision/yealink/t53w/y000000000095.cfg @@ -350,20 +350,25 @@ wui.quick_login = ####################################################################################### static.phone_setting.reserve_certs_enable = features.relog_offtime = -static.security.default_ssl_method = +static.security.default_ssl_method = {$yealink_security_default_ssl_method} static.security.cn_validation = static.security.dev_cert = static.security.ca_cert = + static.security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if} -security.tls_cipher_list = + +security.tls_cipher_list = {$yealink_security_tls_cipher_list} + {if isset($user_name) } static.security.user_name.user = {$user_name} static.security.user_password = {$user_name}:{$user_password} {/if} + {if isset($admin_name) } static.security.user_name.admin = {$admin_name} static.security.user_password = {$admin_name}:{$admin_password} {/if} + {if isset($var_name) } static.security.user_name.var = {$var_name} static.security.user_password = {$var_name}:{$var_password} diff --git a/resources/templates/provision/yealink/t54w/y000000000096.cfg b/resources/templates/provision/yealink/t54w/y000000000096.cfg index 54a76bb6c9..a2f08557f7 100644 --- a/resources/templates/provision/yealink/t54w/y000000000096.cfg +++ b/resources/templates/provision/yealink/t54w/y000000000096.cfg @@ -350,20 +350,25 @@ wui.quick_login = ####################################################################################### static.phone_setting.reserve_certs_enable = features.relog_offtime = -static.security.default_ssl_method = +static.security.default_ssl_method = {$yealink_security_default_ssl_method} static.security.cn_validation = static.security.dev_cert = static.security.ca_cert = + static.security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if} -security.tls_cipher_list = + +security.tls_cipher_list = {$yealink_security_tls_cipher_list} + {if isset($user_name) } static.security.user_name.user = {$user_name} static.security.user_password = {$user_name}:{$user_password} {/if} + {if isset($admin_name) } static.security.user_name.admin = {$admin_name} static.security.user_password = {$admin_name}:{$admin_password} {/if} + {if isset($var_name) } static.security.user_name.var = {$var_name} static.security.user_password = {$var_name}:{$var_password} diff --git a/resources/templates/provision/yealink/t57w/y000000000097.cfg b/resources/templates/provision/yealink/t57w/y000000000097.cfg index d2c186568d..fd897f07bb 100644 --- a/resources/templates/provision/yealink/t57w/y000000000097.cfg +++ b/resources/templates/provision/yealink/t57w/y000000000097.cfg @@ -350,20 +350,25 @@ wui.quick_login = ####################################################################################### static.phone_setting.reserve_certs_enable = features.relog_offtime = -static.security.default_ssl_method = +static.security.default_ssl_method = {$yealink_security_default_ssl_method} static.security.cn_validation = static.security.dev_cert = static.security.ca_cert = + static.security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if} -security.tls_cipher_list = + +security.tls_cipher_list = {$yealink_security_tls_cipher_list} + {if isset($user_name) } static.security.user_name.user = {$user_name} static.security.user_password = {$user_name}:{$user_password} {/if} + {if isset($admin_name) } static.security.user_name.admin = {$admin_name} static.security.user_password = {$admin_name}:{$admin_password} {/if} + {if isset($var_name) } static.security.user_name.var = {$var_name} static.security.user_password = {$var_name}:{$var_password} diff --git a/themes/default/app_config.php b/themes/default/app_config.php index 84878c2409..51447d9e1b 100644 --- a/themes/default/app_config.php +++ b/themes/default/app_config.php @@ -367,6 +367,38 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set whether to cache the theme in the session."; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4e0309da-4adb-4a05-a321-d0ec6546dceb"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_selector_background_color"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#fff"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background color of the domain selector pane."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "cd62c333-4f4e-4462-b61c-1baf5fa524cb"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_selector_list_background_color"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#fff"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the list background color of the domain selector pane."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6a3db80c-5f21-4475-94ae-deac72a28225"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_selector_list_border_color"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#a4aebf"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the list border color of the domain selector pane."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6170ed6b-cb3e-4e66-831b-5498186b2ca8"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_selector_list_divider_color"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#c5d1e5"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the list item divider color of the domain selector pane."; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5a401784-b930-46e7-8fb0-6fa0b5a8806e"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_selector_shadow_color"; diff --git a/themes/default/css.php b/themes/default/css.php index 43409f9a4f..d9ddad58e9 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -529,23 +529,6 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); text-decoration: none; } - div#body_header_brand_text { - display: inline-block; - margin: 3px 0 0 10px; - } - - div#body_header_brand_text > a { - color: ; - font-size: ; - font-weight: 600; - text-decoration: none; - } - - div#body_header_brand_text > a:hover { - color: ; - text-decoration: none; - } - /* menu side control container */ div#menu_side_control_container { position: -webkit-sticky; @@ -672,6 +655,56 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); } } +/* BODY/HEADER BAR *****************************************************************/ + + + div#body_header { + padding: 10px 10px 15px 10px; + height: 50px; + + } + + div#body_header { + padding: 10px; + margin-top: 5px; + height: 40px; + } + + + div#body_header_brand_image { + display: inline-block; + margin-left: 10px; + } + + div#body_header_brand_image > a:hover { + text-decoration: none; + } + + img#body_header_brand_image { + border: none; + margin-top: -4px; + height: auto; + max-width: 145px; + max-height: 35px; + } + + div#body_header_brand_text { + display: inline-block; + margin: 3px 0 0 10px; + } + + div#body_header_brand_text > a { + color: ; + font-size: ; + font-weight: 600; + text-decoration: none; + } + + div#body_header_brand_text > a:hover { + color: ; + text-decoration: none; + } + /* BUTTONS ********************************************************************/ /* buttons */ @@ -1033,7 +1066,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); font-family: arial, san-serif; font-size: 10pt; overflow: hidden; - background-color: #fff; + background: ; -webkit-box-shadow: ; -moz-box-shadow: ; box-shadow: ; @@ -1053,13 +1086,13 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); width: 300px; height: 100%; padding: 1px; - background-color: #fff; - border: 1px solid #a4aebf; + background: ; + border: 1px solid ; } div.domains_list_item, div.domains_list_item_active, div.domains_list_item_inactive { text-align: left; - border-bottom: 1px solid #c5d1e5; + border-bottom: 1px solid ; padding: 5px 8px 8px 8px; overflow: hidden; white-space: nowrap; @@ -1218,20 +1251,6 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); } } - - div#content_header { - padding: 10px 10px 15px 10px; - height: 50px; - - } - - div#content_header { - padding: 10px; - margin-top: 5px; - height: 40px; - } - - /* GENERAL ELEMENTS *****************************************************************/ img {