tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

This commit is contained in:
Jose Gonzalez 2023-02-13 14:32:20 +01:00
parent 2f547c620d f5044e5673
commit d29661c87b
5 changed files with 16 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/general/main_menu.php
View File

@ -75,15 +75,15 @@ if ($menuTypeClass === 'collapsed') {
echo '<div id="menu_tabs">';
// Tabs classic.
echo '<ul class="tabs_ul" style="'.$display_classic.'">';
echo '<li id="tab_display" class="tabs_li"><span>'.__('Display').'</span></a></li>';
echo '<li id="tab_display" class="tabs_li"><span>'.__('Operation').'</span></a></li>';
echo '<li id="tab_management" class="tabs_li"><span>'.__('Management').'</span></a></li>';
echo '</ul>';
echo '<div class="div_border_line" style="'.$display_classic.'"><div id="tab_line_1" class="border_line"></div><div id="tab_line_2" class="border_line"></div></div>';
// Tabs collapse.
echo '<div class="tabs_collapsed" style="'.$display_collapsed.'">';
echo '<div class="tabs_collapsed_container">';
echo '<div id="tab_collapsed_display" class="tabs_collapsed_div"><div class="tabs_collapsed_display"></div></div>';
echo '<div id="tab_collapsed_management" class="tabs_collapsed_div"><div class="tabs_collapsed_management"></div></div>';
echo '<div id="tab_collapsed_display" class="tabs_collapsed_div" title="'.__('Operation').'"><div class="tabs_collapsed_display"></div></div>';
echo '<div id="tab_collapsed_management" class="tabs_collapsed_div" title="'.__('Management').'"><div class="tabs_collapsed_management"></div></div>';
echo '</div></div>';
echo '</div>';
@ -435,7 +435,7 @@ echo '</div>';
*/
function menu_calculate_top(index, item_height) {
const result = index * item_height;
return 135 + result;
return 140 + result;
}
});
</script>

2
pandora_console/include/functions_menu.php
View File

@ -416,7 +416,7 @@ function menu_print_menu(&$menu)
$div = '<div class="icon_'.$id.' w100p"></div><span class="w55p" style="display: none">'.$main['text'].'</span><div class="arrow_menu_down w30p" style="display: none"></div>';
} else {
if ($id === 'about') {
$div = '<div class="icon_'.$id.' w15p"></div><span class="w55p">'.$main['text'].'</span><div class="w30p"></div>';
$div = '<div class="icon_'.$id.' w15p"></div><span class="w55p">'.$main['text'].'</span>';
} else {
$div = '<div class="icon_'.$id.' w15p"></div><span class="w55p">'.$main['text'].'</span><div class="arrow_menu_down w30p"></div>';
}

86
pandora_console/include/styles/menu.css
View File

@ -331,6 +331,10 @@
background: url(../../images/menu/gm_library.menu_gray.png) no-repeat 50% 50%;
}
.icon_about {
background: url(../../images/menu/about.menu_gray.png) no-repeat 50% 50%;
}
#menu_container {
z-index: 3;
position: absolute;
@ -432,86 +436,6 @@ ul li {
padding-top: 2em !important;
}
/* Menu icons active */
.selected.icon_oper-networkconsole {
background: url(../../images/menu/op_network.menu_white.png) no-repeat 50% 50%;
}
.selected.icon_oper-agents {
background: url(../../images/menu/op_monitoring.menu_white.png) no-repeat 50%
50%;
}
.selected.icon_oper-events {
background: url(../../images/menu/op_events.menu_white.png) no-repeat 50% 50%;
}
.selected.icon_oper-users {
background: url(../../images/menu/op_workspace.menu_white.png) no-repeat 50%
50%;
}
.selected.icon_oper-reporting {
background: url(../../images/menu/op_reporting.menu_white.png) no-repeat 50%
50%;
}
.selected.icon_oper-extensions {
background: url(../../images/menu/extensions.menu_white.png) no-repeat 50% 50%;
}
.selected.icon_god-discovery {
background: url(../../images/menu/gm_discovery.menu_white.png) no-repeat 50%
50%;
}
.selected.icon_god-resources {
background: url(../../images/menu/gm_resources.menu_white.png) no-repeat 50%
50%;
}
.selected.icon_god-configuration {
background: url(../../images/menu/gm_configuration.menu_white.png) no-repeat
50% 50%;
}
.selected.icon_god-alerts {
background: url(../../images/menu/gm_alerts.menu_white.png) no-repeat 50% 50%;
}
.selected.icon_god-users {
background: url(../../images/menu/gm_users.menu_white.png) no-repeat 50% 50%;
}
.selected.icon_god-servers {
background: url(../../images/menu/gm_servers.menu_white.png) no-repeat 50% 50%;
}
.selected.icon_god-setup {
background: url(../../images/menu/gm_setup.menu_white.png) no-repeat 50% 50%;
}
.selected.icon_god-events {
background: url(../../images/menu/gm_events.menu_white.png) no-repeat 50% 50%;
}
.selected.icon_god-extensions {
background: url(../../images/menu/builder.menu_white.png) no-repeat 50% 50%;
}
.selected.icon_god-links {
background: url(../../images/menu/links.menu_white.png) no-repeat 50% 50%;
}
.selected.icon_god-um_messages {
background: url(../../images/menu/um_messages.menu_white.png) no-repeat 50%
50%;
}
.selected.icon_god-module_library {
background: url(../../images/menu/gm_library.menu_white.png) no-repeat 50% 50%;
}
#menu_full {
height: 100%;
display: flex;
@ -690,7 +614,7 @@ ul li {
}
.tabs_collapsed {
height: 48px;
height: 53px;
display: flex;
justify-content: center;
align-items: center;

2
pandora_console/include/styles/pandora.css
View File

@ -1740,7 +1740,7 @@ div.title_line {
display: flex;
align-items: flex-end;
justify-content: space-between;
border-bottom: 4px solid #c1ccdc;
border-bottom: 1px solid #c1ccdc;
/* width: calc(100% + 3em); */
width: -webkit-fill-available;
width: -moz-fill-available;

8
pandora_console/operation/menu.php
View File

@ -594,10 +594,12 @@ $menu_operation['workspace']['id'] = 'oper-users';
// ANY user can view him/herself !
// Users.
$query_paramameters_user = '&edit_user=1&pure=0&id_user='.$config['id_user'];
$sub = [];
$sub['operation/users/user_edit']['text'] = __('Edit my user');
$sub['operation/users/user_edit']['id'] = 'Edit_my_user';
$sub['operation/users/user_edit']['refr'] = 0;
$sub['godmode/users/configure_user'.$query_paramameters_user]['text'] = __('Edit my user');
$sub['godmode/users/configure_user'.$query_paramameters_user]['id'] = 'Edit_my_user';
$sub['godmode/users/configure_user'.$query_paramameters_user]['refr'] = 0;
// Users.
$sub['operation/users/user_edit_notifications']['text'] = __('Configure user notifications');