lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code. Menu must be greyed in get_menudiv

Browse Source
This commit is contained in:
Laurent Destailleur 2021-09-11 15:43:26 +02:00
parent c005a20cc0
commit ce33f39bb0
4 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/get_menudiv.php
View File

@ -110,14 +110,13 @@ print '
} }
a.alilevel0 { a.alilevel0 {
background-image: url(\''.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/next.png\') !important; background-image: url(\''.DOL_URL_ROOT.'/theme/'.urlencode($conf->theme).'/img/next.png\') !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
background-position-x: 10px; background-position-x: 10px;
background-position-y: 16px; background-position-y: 16px;
padding: 1em 15px 1em 40px; padding: 1em 15px 1em 40px;
} }
li.lilevel0 font.vsmenudisabled { li.lilevel0 font.vsmenudisabled {
/* background-image: url(/dolibarr_dev/htdocs/theme/eldy/img/next.png) !important; */
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
background-position-x: 10px; background-position-x: 10px;
background-position-y: 16px; background-position-y: 16px;
@ -178,6 +177,9 @@ print '
white-space: nowrap; white-space: nowrap;
display: block; display: block;
} }
.vsmenudisabled .fa, .vsmenudisabled .fas, .vsmenudisabled .far {
color: #aaa !important;
}
</style> </style>
<script type="text/javascript"> <script type="text/javascript">

13
htdocs/core/menus/standard/eldy.lib.php
View File

@ -2075,8 +2075,10 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url'])); $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));
} }
if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') { // Enabled so visible, except if parent was not enabled. if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') {
print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring; // Enabled so visible, except if parent was not enabled.
print '<div class="menu_contenu'.$cssmenu.'">';
print $tabstring;
if ($shorturlwithoutparam) { if ($shorturlwithoutparam) {
print '<a class="vsmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>'; print '<a class="vsmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
} else { } else {
@ -2093,8 +2095,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
print '<br>'; print '<br>';
} }
print '</div>'."\n"; print '</div>'."\n";
} elseif ($showmenu && $lastlevel0 == 'enabled') { // Not enabled but visible (so greyed), except if parent was not enabled. } elseif ($showmenu && $lastlevel0 == 'enabled') {
print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n"; // Not enabled but visible (so greyed), except if parent was not enabled.
print '<div class="menu_contenu'.$cssmenu.'">';
print $tabstring;
print '<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
} }
} }

15
htdocs/core/menus/standard/eldy_menu.php
View File

@ -206,6 +206,7 @@ class MenuManager
$canonnexturl = preg_replace('/\?.*$/', '', $nexturl); $canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
//var_dump($canonrelurl); //var_dump($canonrelurl);
//var_dump($canonnexturl); //var_dump($canonnexturl);
print '<ul>'."\n"; print '<ul>'."\n";
if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools'))) if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) { || (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) {
@ -225,15 +226,18 @@ class MenuManager
print '</li>'."\n"; print '</li>'."\n";
} }
/*
if ($val['level'] == 0) { if ($val['level'] == 0) {
if ($val['enabled']) { if ($val['enabled']) {
$lastlevel[0] = 'enabled'; $lastlevel[0] = 'enabled';
} elseif ($showmenu) { // Not enabled but visible (so greyed) } elseif ($showmenu) {
// Not enabled but visible (so greyed)
$lastlevel[0] = 'greyed'; $lastlevel[0] = 'greyed';
} else { } else {
$lastlevel[0] = 'hidden'; $lastlevel[0] = 'hidden';
} }
} }
*/
$lastlevel2 = array(); $lastlevel2 = array();
foreach ($submenu->liste as $key2 => $val2) { // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' foreach ($submenu->liste as $key2 => $val2) { // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
@ -313,7 +317,14 @@ class MenuManager
print '</ul>'; print '</ul>';
} }
if ($val['enabled'] == 2) { if ($val['enabled'] == 2) {
print '<font class="vsmenudisabled">'.$val['titre'].'</font>'; print '<font class="vsmenudisabled">';
// Add font-awesome
if ($val['level'] == 0 && !empty($val['prefix'])) {
print $val['prefix'];
}
print $val['titre'];
print '</font>';
} }
print '</li>'; print '</li>';
print '</ul>'."\n"; print '</ul>'."\n";

12
htdocs/core/menus/standard/empty.php
View File

@ -285,13 +285,12 @@ class MenuManager
} }
print $disabled.'">'; // ui-btn to highlight on clic print $disabled.'">'; // ui-btn to highlight on clic
if ($relurl2) { if ($relurl2) {
if ($val2['enabled']) { // Allowed if ($val2['enabled']) {
print '<a href="'.$relurl2.'"'; // Allowed
//print ' data-ajax="false"'; print '<a href="'.$relurl2.'">';
print '>';
$lastlevel2[$val2['level']] = 'enabled'; $lastlevel2[$val2['level']] = 'enabled';
} else // Not allowed but visible (greyed) } else {
{ // Not allowed but visible (greyed)
print '<a href="#" class="vsmenudisabled">'; print '<a href="#" class="vsmenudisabled">';
$lastlevel2[$val2['level']] = 'greyed'; $lastlevel2[$val2['level']] = 'greyed';
} }
@ -310,6 +309,7 @@ class MenuManager
// Allowed // Allowed
print '</a>'; print '</a>';
} else { } else {
// Not allowed
print '</a>'; print '</a>';
} }
} }