|
@@ -159,8 +159,8 @@ class MenuManager
|
|
|
print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
|
|
|
foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
|
|
|
{
|
|
|
- print '<ul class="ulmenu" data-role="listview" data-inset="true">';
|
|
|
- print '<li data-role="list-dividerxxx" class="lilevel0">';
|
|
|
+ print '<ul class="ulmenu" data-inset="true">';
|
|
|
+ print '<li class="lilevel0">';
|
|
|
|
|
|
if ($val['enabled'] == 1)
|
|
|
{
|
|
@@ -168,7 +168,14 @@ class MenuManager
|
|
|
$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
|
|
|
$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
|
|
|
|
|
|
- print '<a class="alilevel0" href="#">'.$val['titre'].'</a>'."\n";
|
|
|
+
|
|
|
+ print '<a class="alilevel0" href="#">';
|
|
|
+
|
|
|
+ // Add font-awesome
|
|
|
+ if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
|
|
|
+
|
|
|
+ print $val['titre'];
|
|
|
+ print '</a>'."\n";
|
|
|
// Search submenu fot this mainmenu entry
|
|
|
$tmpmainmenu=$val['mainmenu'];
|
|
|
$tmpleftmenu='all';
|
|
@@ -187,13 +194,13 @@ class MenuManager
|
|
|
|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/index.php') !== false))
|
|
|
{
|
|
|
// We add sub entry
|
|
|
- print str_pad('',1).'<li data-role="list-dividerxxx" class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
|
|
|
+ print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
|
|
|
print '<a href="'.$relurl.'"';
|
|
|
//print ' data-ajax="false"';
|
|
|
print '>';
|
|
|
if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") // No translation
|
|
|
{
|
|
|
- if ($val['mainmenu'] == 'cashdesk') print $langs->trans("Access");
|
|
|
+ if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
|
|
|
else print $langs->trans("Dashboard");
|
|
|
}
|
|
|
else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
|
|
@@ -214,7 +221,7 @@ class MenuManager
|
|
|
$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
|
|
|
//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
|
|
|
if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
|
|
|
- if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-dividerxxx"':'').' class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
|
|
|
+ if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
|
|
|
else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">'; // ui-btn to highlight on clic
|
|
|
if ($relurl2)
|
|
|
{
|