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

Merge branch 'ent-8112-icono-collapse-recortado' into 'develop' 

Fix issue with collapse icon

Closes pandora_enterprise#8112

See merge request artica/pandorafms!4689
This commit is contained in:
Daniel Rodriguez 2022-03-09 12:50:17 +00:00
parent 09ba16c593 d511d75b8d
commit d73bd92157
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pandora_console/general/main_menu.php
View File

@ -39,7 +39,7 @@ $(document).ready(function(){
var menuType_value = "<?php echo ($_SESSION['menu_type'] ?? ''); ?>"; var menuType_value = "<?php echo ($_SESSION['menu_type'] ?? ''); ?>";
if (menuType_value === '' || menuType_value === 'classic') { if (menuType_value === '' || menuType_value === 'classic') {
$('ul.submenu').css('left', '214px'); $('ul.submenu').css('left', '214px');
} }
else{ else{
$('ul.submenu').css('left', '59px'); $('ul.submenu').css('left', '59px');
@ -107,7 +107,12 @@ echo '</a></div>';
require 'operation/menu.php'; require 'operation/menu.php';
require 'godmode/menu.php'; require 'godmode/menu.php';
echo sprintf('<div id="button_collapse" class="button_%s button_collapse"></div>', $menuTypeClass); html_print_div(
[
'id' => 'button_collapse',
'class' => sprintf('button_collapse button_%s', $menuTypeClass),
]
);
echo '</div>'; echo '</div>';
// Menu_container. // Menu_container.
@ -122,7 +127,7 @@ if (isset($config['fixed_header']) === true) {
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
/* <![CDATA[ */ /* <![CDATA[ */
$('#button_collapse').on('click', function() { $('#button_collapse').on('click', function() {
if($('#menu_full').hasClass('menu_full_classic')){ if($('#menu_full').hasClass('menu_full_classic')){
localStorage.setItem("menuType", "collapsed"); localStorage.setItem("menuType", "collapsed");
@ -155,7 +160,7 @@ $('#button_collapse').on('click', function() {
$('.logo_full').toggle(); $('.logo_full').toggle();
$('.logo_icon').toggle(); $('.logo_icon').toggle();
$('#menu_full').toggleClass('menu_full_classic menu_full_collapsed'); $('#menu_full').toggleClass('menu_full_classic menu_full_collapsed');
$('#button_collapse').toggleClass('button_classic button_collapsed'); $('#button_collapse').toggleClass('button_classic button_collapsed');
$('div#title_menu').toggleClass('title_menu_classic title_menu_collapsed'); $('div#title_menu').toggleClass('title_menu_classic title_menu_collapsed');
$('div#page').toggleClass('page_classic page_collapsed'); $('div#page').toggleClass('page_classic page_collapsed');
@ -389,9 +394,9 @@ $(document).ready(function() {
if( typeof(table_hover) != 'undefined') if( typeof(table_hover) != 'undefined')
$("ul#sub"+table_hover[0].id).hide(); $("ul#sub"+table_hover[0].id).hide();
if( typeof(table_hover2) != 'undefined') if( typeof(table_hover2) != 'undefined')
$("ul#sub"+table_hover2[0].id).hide(); $("ul#sub"+table_hover2[0].id).hide();
}); });
$('div.menu>ul>li>ul>li>ul>li>a').click(function() { $('div.menu>ul>li>ul>li>ul>li>a').click(function() {
openTime = 4000; openTime = 4000;
if( typeof(table_hover) != 'undefined') if( typeof(table_hover) != 'undefined')
@ -399,7 +404,7 @@ $(document).ready(function() {
if( typeof(table_hover2) != 'undefined') if( typeof(table_hover2) != 'undefined')
$("ul#sub"+table_hover2[0].id).hide(); $("ul#sub"+table_hover2[0].id).hide();
}); });
}); });
</script> </script>

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

@ -389,7 +389,7 @@ ul li {
.button_collapse { .button_collapse {
margin-top: auto; margin-top: auto;
height: 38px; min-height: 38px;
background-color: #505050; background-color: #505050;
text-align: center; text-align: center;
color: #fff; color: #fff;
@ -427,7 +427,6 @@ ul li {
} }
.button_classic { .button_classic {
width: 215px;
background-image: url(../../images/button_collapse_menu.png); background-image: url(../../images/button_collapse_menu.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
@ -440,7 +439,7 @@ ul li {
} }
/* Menu height: 601px, 720px, 735px */ /* Menu height: 601px, 720px, 735px */
@media screen and (max-height: 720px) { @media screen and (max-height: 750px) {
.menu li, .menu li,
.menu li a, .menu li a,
.menu li div { .menu li div {
@ -448,7 +447,7 @@ ul li {
} }
} }
@media screen and (max-height: 735px) { @media screen and (max-height: 750px) {
.operation { .operation {
padding-top: 10px; padding-top: 10px;
} }