tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 00:34:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-11697-arreglar-menu-sin-click-to-display' into 'develop'

Browse Source 
Draft: Ent 11697 arreglar menu sin click to display

See merge request artica/pandorafms!6230
This commit is contained in:
Rafael Ameijeiras 2023-08-01 12:32:37 +00:00
commit b052711c92
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/general/main_menu.php
View File

@ -185,6 +185,10 @@ echo '</div>';
$(`#sub${this.id}`).hide(); $(`#sub${this.id}`).hide();
}) })
} else if ($('#menu_full').hasClass('menu_full_collapsed')) { } else if ($('#menu_full').hasClass('menu_full_collapsed')) {
$(".arrow_menu_right").each(function() {
$(this).removeClass('arrow_menu_right');
$(this).addClass('arrow_menu_down');
});
localStorage.setItem("menuType", "classic"); localStorage.setItem("menuType", "classic");
$('ul.submenu').css('left', '280px'); $('ul.submenu').css('left', '280px');
var menuType_val = localStorage.getItem("menuType"); var menuType_val = localStorage.getItem("menuType");
@ -273,6 +277,14 @@ echo '</div>';
$('.menu_icon').mouseenter(function() { $('.menu_icon').mouseenter(function() {
var menuType_val = localStorage.getItem("menuType"); var menuType_val = localStorage.getItem("menuType");
if (!click_display && menuType_val === 'collapsed') { if (!click_display && menuType_val === 'collapsed') {
$(".arrow_menu_down").each(function() {
$(this).removeClass('arrow_menu_down');
$(this).addClass('arrow_menu_right');
});
$(".arrow_menu_up").each(function() {
$(this).removeClass('arrow_menu_up');
$(this).addClass('arrow_menu_right');
});
table_hover = $(this); table_hover = $(this);
handsIn = 1; handsIn = 1;
openTime = new Date().getTime(); openTime = new Date().getTime();
@ -305,6 +317,7 @@ echo '</div>';
table_hover2 = $(this); table_hover2 = $(this);
handsIn2 = 1; handsIn2 = 1;
openTime2 = new Date().getTime(); openTime2 = new Date().getTime();
$("#sub" + table_hover2[0].id).attr('style', 'display: none; position: fixed; left: 340px;');
$("#sub" + table_hover2[0].id).show(); $("#sub" + table_hover2[0].id).show();
if (typeof(table_noHover2) != 'undefined') { if (typeof(table_noHover2) != 'undefined') {
if ("ul#sub" + table_hover2[0].id != "ul#sub" + table_noHover2[0].id) { if ("ul#sub" + table_hover2[0].id != "ul#sub" + table_noHover2[0].id) {
@ -315,6 +328,7 @@ echo '</div>';
}).mouseleave(function() { }).mouseleave(function() {
var menuType_val = localStorage.getItem("menuType"); var menuType_val = localStorage.getItem("menuType");
if (!click_display && menuType_val === 'collapsed') { if (!click_display && menuType_val === 'collapsed') {
$("#sub" + $(this)[0].id).attr('style', 'display: none;');
table_noHover2 = table_hover2; table_noHover2 = table_hover2;
handsIn2 = 0; handsIn2 = 0;
setTimeout(function() { setTimeout(function() {

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

@ -630,6 +630,12 @@ ul li {
z-index: 1; z-index: 1;
} }
.arrow_menu_right {
background: url(../../images/menu/arrow_down_grey.svg) no-repeat 50% 100%;
z-index: 1;
transform: rotate(-0.25turn);
}
.span_selected { .span_selected {
color: #1d7874 !important; color: #1d7874 !important;
font-weight: bold !important; font-weight: bold !important;