dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Theme: Header Bar updates.

This commit is contained in:
Nate 2020-05-27 23:02:13 -06:00
parent 6f33204316
commit d05429ad4e
8 changed files with 92 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/default_settings/default_setting_edit.php
View File

@ -628,6 +628,14 @@
echo " <option value='fixed' ".($default_setting_value == "fixed" ? "selected='selected'" : null).">".$text['option-fixed']."</option>\n";
echo " </select>\n";
}
elseif ($category == "theme" && $subcategory == "body_header_brand_type" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='image' ".(($default_setting_value == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
echo " <option value='text' ".(($default_setting_value == "text") ? "selected='selected'" : null).">".$text['label-text']."</option>\n";
echo " <option value='image_text' ".(($default_setting_value == "image_text") ? "selected='selected'" : null).">".$text['label-image_text']."</option>\n";
echo " <option value='none' ".(($default_setting_value == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
echo " </select>\n";
}
elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='listen' ".(($default_setting_value == "listen") ? "selected='selected'" : null).">".$text['option-voicemail_file_listen']."</option>\n";

1
core/default_settings/default_settings.php
View File

@ -324,6 +324,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-'.$row['default_setting_value']];

9
core/domain_settings/domain_setting_edit.php
View File

@ -631,6 +631,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='image' ".(($row['domain_setting_value'] == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
echo " <option value='text' ".(($row['domain_setting_value'] == "text") ? "selected='selected'" : null).">".$text['label-text']."</option>\n";
echo " <option value='image_text' ".(($row['domain_setting_value'] == "image_text") ? "selected='selected'" : null).">".$text['label-image_text']."</option>\n";
echo " <option value='none' ".(($row['domain_setting_value'] == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
echo " </select>\n";
}
@ -685,6 +686,14 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <option value='fixed' ".($row['domain_setting_value'] == "fixed" ? "selected='selected'" : null).">".$text['option-fixed']."</option>\n";
echo " </select>\n";
}
elseif ($category == "theme" && $subcategory == "body_header_brand_type" && $name == "text" ) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='image' ".(($row['domain_setting_value'] == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
echo " <option value='text' ".(($row['domain_setting_value'] == "text") ? "selected='selected'" : null).">".$text['label-text']."</option>\n";
echo " <option value='image_text' ".(($row['domain_setting_value'] == "image_text") ? "selected='selected'" : null).">".$text['label-image_text']."</option>\n";
echo " <option value='none' ".(($row['domain_setting_value'] == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
echo " </select>\n";
}
elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='listen' ".(($row['domain_setting_value'] == "listen") ? "selected='selected'" : null).">".$text['option-voicemail_file_listen']."</option>\n";

1
core/domain_settings/domain_settings.php
View File

@ -284,6 +284,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['domain_setting_value'])];

9
core/user_settings/user_setting_edit.php
View File

@ -605,6 +605,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
echo " <option value='image' ".(($user_setting_value == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
echo " <option value='text' ".(($user_setting_value == "text") ? "selected='selected'" : null).">".$text['label-text']."</option>\n";
echo " <option value='image_text' ".(($user_setting_value == "image_text") ? "selected='selected'" : null).">".$text['label-image_text']."</option>\n";
echo " <option value='none' ".(($user_setting_value == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
echo " </select>\n";
}
@ -647,6 +648,14 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <option value='fixed' ".($user_setting_value == "fixed" ? "selected='selected'" : null).">".$text['option-fixed']."</option>\n";
echo " </select>\n";
}
else if ($user_setting_category == "theme" && $user_setting_subcategory == "body_header_brand_type" && $user_setting_name == "text" ) {
echo " <select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
echo " <option value='image' ".(($user_setting_value == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
echo " <option value='text' ".(($user_setting_value == "text") ? "selected='selected'" : null).">".$text['label-text']."</option>\n";
echo " <option value='image_text' ".(($user_setting_value == "image_text") ? "selected='selected'" : null).">".$text['label-image_text']."</option>\n";
echo " <option value='none' ".(($user_setting_value == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
echo " </select>\n";
}
else {
echo " <input class='formfld' type='text' id='user_setting_value' name='user_setting_value' maxlength='255' value=\"".escape($user_setting_value)."\">\n";
}

1
core/user_settings/user_settings.php
View File

@ -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'])];

20
resources/classes/menu.php
View File

@ -1103,9 +1103,9 @@ if (!class_exists('menu')) {
$html .= "<img id='menu_brand_image_expanded' ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? "style='display: none;'" : null)." src='".escape($menu_brand_image_expanded)."' title=\"".escape($menu_brand_text)."\">";
$html .= "</a>\n";
}
else {
$html .= " <a class='menu_side_item_main menu_side_expand' ".($_SESSION['theme']['menu_side_state']['text'] == 'expanded' ? "style='display: none';" : null)." onclick='menu_side_expand();' title=\"".$this->text['theme-label-expand_menu']."\"><i class='fas fa-bars fa-fw' style='z-index: 99800; padding-left: 1px;'></i></a>";
}
// else {
// $html .= " <a class='menu_side_item_main menu_side_expand' ".($_SESSION['theme']['menu_side_state']['text'] == 'expanded' ? "style='display: none';" : null)." onclick='menu_side_expand();' title=\"".$this->text['theme-label-expand_menu']."\"><i class='fas fa-bars fa-fw' style='z-index: 99800; padding-left: 1px;'></i></a>";
// }
$html .= " </div>\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 .= "<div id='content_container' ".$content_container_onclick.">\n";
$html .= " <div id='content_header'>\n";
$html .= " <div id='body_header'>\n";
//header: left
$html .= "<div class='float-left'>\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 .= " <div id='body_header_brand_text'><a href='".PROJECT_PATH."/'>".$body_header_brand_text."</a></div>\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 .= "<div id='body_header_brand_image'>";
$html .= "<a href='".PROJECT_PATH."/'><img id='body_header_brand_image' src='".escape($body_header_brand_image)."' title=\"".escape($body_header_brand_text)."\"></a>";
$html .= "</div>";
}
if ($_SESSION['theme']['body_header_brand_type']['text'] == 'text' || $_SESSION['theme']['body_header_brand_type']['text'] == 'image_text') {
$html .= "<div id='body_header_brand_text'><a href='".PROJECT_PATH."/'>".$body_header_brand_text."</a></div>";
}
$html .= "</div>\n";
//header: right

81
themes/default/css.php
View File

@ -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: <?php echo ($_SESSION['theme']['body_header_brand_text_color']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_color']['text'] : 'rgba(0,0,0,0.90)'; ?>;
font-size: <?php echo ($_SESSION['theme']['body_header_brand_text_size']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_size']['text'] : '16px'; ?>;
font-weight: 600;
text-decoration: none;
}
div#body_header_brand_text > a:hover {
color: <?php echo ($_SESSION['theme']['body_header_brand_text_color_hover']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_color_hover']['text'] : 'rgba(0,0,0,1.0)'; ?>;
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 *****************************************************************/
<?php if ($_SESSION['theme']['menu_style']['text'] == 'side') { ?>
div#body_header {
padding: 10px 10px 15px 10px;
height: 50px;
<?php echo $_SESSION['theme']['body_header_background_color']['text'] != '' ? 'background-color: '.$_SESSION['theme']['body_header_background_color']['text'].';' : null; ?>
}
<?php } else { ?>
div#body_header {
padding: 10px;
margin-top: 5px;
height: 40px;
}
<?php } ?>
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: <?php echo ($_SESSION['theme']['body_header_brand_text_color']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_color']['text'] : 'rgba(0,0,0,0.90)'; ?>;
font-size: <?php echo ($_SESSION['theme']['body_header_brand_text_size']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_size']['text'] : '16px'; ?>;
font-weight: 600;
text-decoration: none;
}
div#body_header_brand_text > a:hover {
color: <?php echo ($_SESSION['theme']['body_header_brand_text_color_hover']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_color_hover']['text'] : 'rgba(0,0,0,1.0)'; ?>;
text-decoration: none;
}
/* BUTTONS ********************************************************************/
/* buttons */
@ -1218,20 +1251,6 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
}
}
<?php if ($_SESSION['theme']['menu_style']['text'] == 'side') { ?>
div#content_header {
padding: 10px 10px 15px 10px;
height: 50px;
<?php echo $_SESSION['theme']['body_header_background_color']['text'] != '' ? 'background-color: '.$_SESSION['theme']['body_header_background_color']['text'].';' : null; ?>
}
<?php } else { ?>
div#content_header {
padding: 10px;
margin-top: 5px;
height: 40px;
}
<?php } ?>
/* GENERAL ELEMENTS *****************************************************************/
img {