nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-17 22:18:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Theme/Menu: Remove fixed menu menu_position setting.

Browse Source
This commit is contained in:
fusionate
2026-01-15 12:50:30 -07:00
parent 04a0d63619
commit d104b6e7dd
10 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/default_settings/default_setting_edit.php
View File

@@ -617,12 +617,6 @@
echo " <option value='side' ".(($default_setting_value == "side") ? "selected='selected'" : null).">".$text['label-side']."</option>\n";
echo " </select>\n";
}
elseif ($category == "theme" && $subcategory == "menu_position" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='top' ".(($default_setting_value == "top") ? "selected='selected'" : null).">".$text['label-top']."</option>\n";
echo " <option value='bottom' ".(($default_setting_value == "bottom") ? "selected='selected'" : null).">".$text['label-bottom']."</option>\n";
echo " </select>\n";
}
elseif ($category == "theme" && $subcategory == "logo_align" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='left' ".(($default_setting_value == "left") ? "selected='selected'" : null).">".$text['label-left']."</option>\n";

1
core/default_settings/default_settings.php
View File

@@ -509,7 +509,6 @@
( $category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) ||
( $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" )
) {

6
core/domain_settings/domain_setting_edit.php
View File

@@ -654,12 +654,6 @@
echo " <option value='side' ".(($row['domain_setting_value'] == "side") ? "selected='selected'" : null).">".$text['label-side']."</option>\n";
echo " </select>\n";
}
elseif ($category == "theme" && $subcategory == "menu_position" && $name == "text" ) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='top' ".(($row['domain_setting_value'] == "top") ? "selected='selected'" : null).">".$text['label-top']."</option>\n";
echo " <option value='bottom' ".(($row['domain_setting_value'] == "bottom") ? "selected='selected'" : null).">".$text['label-bottom']."</option>\n";
echo " </select>\n";
}
elseif ($category == "theme" && $subcategory == "logo_align" && $name == "text" ) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='left' ".(($row['domain_setting_value'] == "left") ? "selected='selected'" : null).">".$text['label-left']."</option>\n";

1
core/domain_settings/domain_settings.php
View File

@@ -308,7 +308,6 @@
( $category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) ||
( $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" )
) {

6
core/user_settings/user_setting_edit.php
View File

@@ -598,12 +598,6 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
echo " <option value='inline' ".(($user_setting_value == "inline") ? "selected='selected'" : null).">".$text['label-inline']."</option>\n";
echo " </select>\n";
}
else if ($user_setting_category == "theme" && $user_setting_subcategory == "menu_position" && $user_setting_name == "text" ) {
echo " <select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
echo " <option value='top' ".(($user_setting_value == "top") ? "selected='selected'" : null).">".$text['label-top']."</option>\n";
echo " <option value='bottom' ".(($user_setting_value == "bottom") ? "selected='selected'" : null).">".$text['label-bottom']."</option>\n";
echo " </select>\n";
}
else if ($user_setting_category == "theme" && $user_setting_subcategory == "logo_align" && $user_setting_name == "text" ) {
echo " <select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
echo " <option value='left' ".(($user_setting_value == "left") ? "selected='selected'" : null).">".$text['label-left']."</option>\n";

1
core/user_settings/user_settings.php
View File

@@ -306,7 +306,6 @@
( $category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) ||
( $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" )
) {

2
resources/classes/menu.php
View File

@@ -1183,7 +1183,7 @@ class menu {
break;
case 'fixed':
default:
$menu_type = 'fixed-' . $this->settings->get('theme', 'menu_position', 'top');
$menu_type = 'fixed-top';
if (!http_user_agent('mobile')) {
$menu_width = $this->settings->get('theme', 'menu_width_fixed', 'calc(90% - 20px)');
}

1
resources/footer.php
View File

@@ -157,7 +157,6 @@
$settings_array['theme']['menu_side_toggle_hover_delay_expand'] = isset($settings_array['theme']['menu_side_toggle_hover_delay_expand']) ? $settings_array['theme']['menu_side_toggle_hover_delay_expand'] : '300';
$settings_array['theme']['menu_side_toggle_hover_delay_contract'] = isset($settings_array['theme']['menu_side_toggle_hover_delay_contract']) ? $settings_array['theme']['menu_side_toggle_hover_delay_contract'] : '1000';
$settings_array['theme']['menu_style'] = !empty($settings_array['theme']['menu_style']) ? $settings_array['theme']['menu_style'] : 'fixed';
$settings_array['theme']['menu_position'] = isset($settings_array['theme']['menu_position']) ? $settings_array['theme']['menu_position'] : 'top';
$settings_array['theme']['footer'] = isset($settings_array['theme']['footer']) ? $settings_array['theme']['footer'] : '&copy; '.$text['theme-label-copyright'].' 2008 - '.date('Y')." <a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a> ".$text['theme-label-all_rights_reserved'];
$settings_array['theme']['menu_side_item_main_sub_icon_contract'] = !empty($settings_array['theme']['menu_side_item_main_sub_icon_contract']) ? explode(' ', $settings_array['theme']['menu_side_item_main_sub_icon_contract'])[1] : null;
$settings_array['theme']['menu_side_item_main_sub_icon_expand'] = !empty($settings_array['theme']['menu_side_item_main_sub_icon_expand']) ? explode(' ', $settings_array['theme']['menu_side_item_main_sub_icon_expand'])[1] : null;

8
themes/default/app_config.php
View File

@@ -656,14 +656,6 @@
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the border color (and opacity) of the main menu.";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "81a1a867-036d-4e9d-a2b8-133f811efb2f";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_position";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "top";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the position of the main menu (Fixed menu only).";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ed3d428b-8507-41ca-8802-2c6a0d3e8138";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_style";

8
themes/default/css.php
View File

@@ -23,7 +23,6 @@ $menu_main_background_color = $settings->get('theme', 'menu_main_background_colo
$menu_main_shadow_color = !empty($settings->get('theme', 'menu_main_shadow_color', '')) ? '0 0 5px '.$settings->get('theme', 'menu_main_shadow_color') : 'none';
$menu_main_border_color = $settings->get('theme', 'menu_main_border_color', 'transparent');
$menu_main_border_size = $settings->get('theme', 'menu_main_border_size', 0);
$menu_position = $settings->get('theme', 'menu_position', 'top');
$menu_style = $settings->get('theme', 'menu_style', 'fixed');
switch ($menu_style) {
case 'inline': $menu_main_border_radius_default = '4px'; break;
@@ -1710,12 +1709,7 @@ else { //default: white
switch ($menu_style) {
case 'inline': $body_top_style = "margin-top: -8px;"; break;
case 'static': $body_top_style = "margin-top: -5px;"; break;
case 'fixed':
switch ($menu_position) {
case 'bottom': $body_top_style = "margin-top: 30px;"; break;
case 'top':
default: $body_top_style = "margin-top: 65px;"; break;
}
case 'fixed': $body_top_style = "margin-top: 65px;"; break;
}
?>