Change visual of menu and funcionality

This commit is contained in:
m-lopez-f 2015-04-10 13:43:02 +02:00
parent e29497c394
commit a02acad7c4
4 changed files with 39 additions and 31 deletions

View File

@ -216,16 +216,26 @@ $(document).ready( function() {
}, 3500); }, 3500);
}); });
*/ */
handsInMenu = 0;
openTimeMenu = 0;
$('#menu').mouseenter(function() { $('#menu').mouseenter(function() {
$('div#title_menu').show(); $('div#title_menu').show();
handsInMenu = 1;
openTimeMenu = new Date().getTime();
$('#menu').css('width', '130px'); $('#menu').css('width', '130px');
$('li.menu_icon').addClass( " no_hidden_menu" ); $('li.menu_icon').addClass( " no_hidden_menu" );
$('ul.submenu').css('left', '129px'); $('ul.submenu').css('left', '129px');
}).mouseleave(function(){ }).mouseleave(function(){
$('#menu').css('width', '45px'); handsInMenu = 0;
$('li.menu_icon').removeClass( " no_hidden_menu"); setTimeout(function() {
$('ul.submenu').css('left', '44px'); openedMenu = new Date().getTime() - openTimeMenu;
$('div#title_menu').hide(); if(openedMenu > 1000 && handsInMenu == 0) {
$('#menu').css('width', '45px');
$('li.menu_icon').removeClass( " no_hidden_menu");
$('ul.submenu').css('left', '44px');
$('div#title_menu').hide();
}
}, 1500);
}); });
} }
else{ else{

View File

@ -305,13 +305,12 @@ function menu_print_menu (&$menu) {
$link = "index.php?sec=".$subsec2."&sec2=".$key; $link = "index.php?sec=".$subsec2."&sec2=".$key;
//Display if one submenu2 was selected!
if (strpos($key, $sec2) !== false) {
$display = "";
}
$class = "sub_subMenu"; $class = "sub_subMenu";
if ($key == $sec2) {
$class .= " selected";
}
// Define submenu2 class to draw tree image // Define submenu2 class to draw tree image
if($count_sub2 >= count($sub['sub2'])) { if($count_sub2 >= count($sub['sub2'])) {
$sub_tree_class = 'submenu_text submenu2_text_last'; $sub_tree_class = 'submenu_text submenu2_text_last';

View File

@ -32,7 +32,7 @@
margin: 0; margin: 0;
} }
.menu li.selected { .menu li.selected {
background-color: #80BA27 !important; box-shadow: inset 4px 0 #00AF21;
} }
.menu li a { .menu li a {
@ -43,18 +43,14 @@
text-decoration:none; text-decoration:none;
} }
.menu .godmode li {
background-color: #B2B2B2 !important;
}
li:hover ul { display: block; } li:hover ul { display: block; }
.submenu_text{ .submenu_text{
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
padding: 9px; padding: 11px;
margin-left: 0px; margin-left: 0px;
color: #fff; color: #fff;
width: 89%; width: 86%;
} }
.menu li.subselected a{ .menu li.subselected a{
@ -71,8 +67,8 @@ li:hover ul { display: block; }
position: absolute; position: absolute;
z-index: 999; z-index: 999;
left: 44px; left: 44px;
min-height: 30px; min-height: 35px;
height: 30px; height: 35px;
width: 160px; width: 160px;
} }
@ -83,26 +79,26 @@ li:hover ul { display: block; }
} }
.sub_subMenu{ .sub_subMenu{
min-height: 30px !important; min-height: 35px !important;
height: 30px; height: 35px;
width: 160px; width: 160px;
} }
.submenu li a { .submenu li a {
background-color: #222; #background-color: #222;
border-style: none; #border-style: none;
border-color: #666; #border-color: #666;
} }
.submenu2 li a { .submenu2 li a {
background-color: #222; #background-color: #222;
margin-left: 0px; margin-left: 0px;
padding-left: 0px; padding-left: 0px;
display:block; display:block;
} }
.submenu2 li a:hover { .submenu2 li a:hover {
background-color: #111 !important; #background-color: #111 !important;
} }
.menu li img.toggle { .menu li img.toggle {
@ -116,7 +112,7 @@ li:hover ul { display: block; }
z-index: 1; /* Positions it on top of the rest */ z-index: 1; /* Positions it on top of the rest */
} }
.menu li.has_submenu .flecha{ .menu li.has_submenu .flecha{
background: #222 url(../../images/arrow.png) no-repeat 90% 50% !important; background: url(../../images/arrow.png) no-repeat 90% 50% !important;
z-index: 1; /* Positions it on top of the rest */ z-index: 1; /* Positions it on top of the rest */
} }
@ -134,6 +130,7 @@ li:hover ul { display: block; }
.submenu_selected { .submenu_selected {
margin-bottom: 0px !important; margin-bottom: 0px !important;
box-shadow: inset 4px 0 #00AF21 !important;
} }
.menu .menu_icon, .menu li.links { .menu .menu_icon, .menu li.links {
@ -160,6 +157,7 @@ li:hover ul { display: block; }
#icon_oper-events { #icon_oper-events {
background: url(../../images/op_events.png) no-repeat 50% 50%; background: url(../../images/op_events.png) no-repeat 50% 50%;
} }
/* users */ /* users */
#icon_oper-users { #icon_oper-users {
background: url(../../images/op_workspace.png) no-repeat 50% 50%; background: url(../../images/op_workspace.png) no-repeat 50% 50%;

View File

@ -2191,14 +2191,14 @@ td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yel
font-weight: bold; font-weight: bold;
} }
.menu li {
background-color: #fff !important;
}
ul.operation li a:hover { ul.operation li a:hover {
#font-weight: bold; #font-weight: bold;
} }
.menu_icon:hover{
background-color: #585858;
}
/*
ul.operation ul.submenu li a:hover { ul.operation ul.submenu li a:hover {
background: #373737 url('../../images/menu_op_mark.png') repeat-y right; background: #373737 url('../../images/menu_op_mark.png') repeat-y right;
#font-weight: bold; #font-weight: bold;
@ -2237,7 +2237,7 @@ ul.godmode ul.submenu li.selected>a {
ul.godmode ul.submenu li.selected .SubNoLink { ul.godmode ul.submenu li.selected .SubNoLink {
background: url('../../images/menu_gm_mark.png') repeat-y right !important; background: url('../../images/menu_gm_mark.png') repeat-y right !important;
} }
*/
li.links a:hover { li.links a:hover {
#font-weight: bold; #font-weight: bold;
} }
@ -2279,6 +2279,7 @@ li.links a:hover {
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-right-style: solid; border-right-style: solid;
border-right-width: 0px; border-right-width: 0px;
} }
input#text-id_parent.ac_input, input, textarea, select { input#text-id_parent.ac_input, input, textarea, select {