Skip to content
Snippets Groups Projects
Commit 20f1bb76 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix memu under disabled entries, when using smartphone

parent b6af1f7e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/core/boxes/box_produits.php
+ 1
− 1
View file @ 20f1bb76
......@@ -113,7 +113,7 @@ class box_produits extends ModeleBoxes
$productstatic->entity = $objp->entity;
$this->info_box_contents[$line][] = array(
'td' => '',
'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
'text' => $productstatic->getNomUrl(1),
'asis' => 1,
);
......
htdocs/core/menus/standard/auguria.lib.php
+ 23
− 14
View file @ 20f1bb76
......@@ -393,14 +393,14 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
// Show menu
if (empty($noout))
{
$alt=0; $altok=0; $blockvmenuopened=false;
$altok=0; $blockvmenuopened=false; $lastlevel0='';
$num=count($menu_array);
for ($i = 0; $i < $num; $i++)
for ($i = 0; $i < $num; $i++) // Loop on each menu entry
{
$showmenu=true;
if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) $showmenu=false;
$alt++;
// Begin of new left menu block
if (empty($menu_array[$i]['level']) && $showmenu)
{
$altok++;
......@@ -420,14 +420,14 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
}
}
// Place tabulation
// Add tabulation
$tabstring='';
$tabul=($menu_array[$i]['level'] - 1);
if ($tabul > 0)
{
for ($j=0; $j < $tabul; $j++)
{
$tabstring.='&nbsp; &nbsp;';
$tabstring.='&nbsp;&nbsp;&nbsp;';
}
}
......@@ -445,26 +445,35 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].' -->'."\n";
// Menu niveau 0
// Menu level 0
if ($menu_array[$i]['level'] == 0)
{
if ($menu_array[$i]['enabled'])
if ($menu_array[$i]['enabled']) // Enabled so visible
{
print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>';
$lastlevel0='enabled';
}
else if ($showmenu)
else if ($showmenu) // Not enabled but visible (so greyed)
{
print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
$lastlevel0='greyed';
}
else
{
$lastlevel0='hidden';
}
if ($showmenu)
{
print '<div class="menu_top"></div>'."\n";
}
}
// Menu niveau > 0
// Menu level > 0
if ($menu_array[$i]['level'] > 0)
{
if ($menu_array[$i]['enabled'])
if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') // Enabled so visible, except if parent was not enabled.
{
print '<div class="menu_contenu">'.$tabstring;
//print $lastlevel0;
if ($menu_array[$i]['url']) print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>';
else print '<span class="vsmenu">';
print $menu_array[$i]['titre'];
......@@ -474,22 +483,22 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
if (! strstr($menu_array[$i]['titre'],'<table')) print '<br>';
print '</div>'."\n";
}
else if ($showmenu)
else if ($showmenu && $lastlevel0 == 'enabled') // Not enabled but visible (so greyed), except if parent was not enabled.
{
print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
}
}
// If next is a new block or if there is nothing after
if (empty($menu_array[$i+1]['level']))
if (empty($menu_array[$i+1]['level'])) // End menu block
{
if ($showmenu)
print '<div class="menu_end"></div>'."\n";
if ($blockvmenuopened) { print "</div>\n"; $blockvmenuopened=false; }
if ($blockvmenuopened) { print '</div>'."\n"; $blockvmenuopened=false; }
}
}
if ($altok) print '<div class="blockvmenuend"></div>';
if ($altok) print '<div class="blockvmenuend"></div>'; // End menu block
}
if (is_array($moredata) && ! empty($moredata['bookmarks']))
......
htdocs/core/menus/standard/eldy.lib.php
+ 23
− 14
View file @ 20f1bb76
......@@ -445,7 +445,7 @@ function print_end_menu_array()
* @param Menu $menu Object Menu to return back list of menu entries
* @param int $noout Disable output (Initialise &$menu only).
* @param string $forcemainmenu 'x'=Force mainmenu to mainmenu='x'
* @param string $forceleftmenu 'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not efined in session.
* @param string $forceleftmenu 'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not defined in session.
* @param array $moredata An array with more data to output
* @return int nb of menu entries
*/
......@@ -1023,7 +1023,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$objp = $db->fetch_object($resql);
$nature='';
// Must match array $sourceList defined into journals_list.php
// Must match array $sourceList defined into journals_list.php
if ($objp->nature == 2) $nature="sells";
if ($objp->nature == 3) $nature="purchases";
if ($objp->nature == 4) $nature="bank";
......@@ -1558,14 +1558,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$invert=empty($conf->global->MAIN_MENU_INVERT)?"":"invert";
if (empty($noout))
{
$alt=0; $altok=0; $blockvmenuopened=false;
$altok=0; $blockvmenuopened=false; $lastlevel0='';
$num=count($menu_array);
for ($i = 0; $i < $num; $i++)
for ($i = 0; $i < $num; $i++) // Loop on each menu entry
{
$showmenu=true;
if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) $showmenu=false;
$alt++;
// Begin of new left menu block
if (empty($menu_array[$i]['level']) && $showmenu)
{
$altok++;
......@@ -1585,7 +1585,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
}
}
// Place tabulation
// Add tabulation
$tabstring='';
$tabul=($menu_array[$i]['level'] - 1);
if ($tabul > 0)
......@@ -1625,26 +1625,35 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].', position='.$menu_array[$i]['position'].' -->'."\n";
// Menu niveau 0
// Menu level 0
if ($menu_array[$i]['level'] == 0)
{
if ($menu_array[$i]['enabled'])
if ($menu_array[$i]['enabled']) // Enabled so visible
{
print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>'."\n";
$lastlevel0='enabled';
}
else if ($showmenu)
else if ($showmenu) // Not enabled but visible (so greyed)
{
print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
$lastlevel0='greyed';
}
else
{
$lastlevel0='hidden';
}
if ($showmenu)
{
print '<div class="menu_top"></div>'."\n";
}
}
// Menu niveau > 0
// Menu level > 0
if ($menu_array[$i]['level'] > 0)
{
if ($menu_array[$i]['enabled'])
if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') // Enabled so visible, except if parent was not enabled.
{
print '<div class="menu_contenu">'.$tabstring;
//print $lastlevel0;
if ($menu_array[$i]['url']) print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>';
else print '<span class="vsmenu">';
print $menu_array[$i]['titre'];
......@@ -1654,14 +1663,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
if (! strstr($menu_array[$i]['titre'],'<table')) print '<br>';
print '</div>'."\n";
}
else if ($showmenu)
else if ($showmenu && $lastlevel0 == 'enabled') // Not enabled but visible (so greyed), except if parent was not enabled.
{
print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
}
}
// If next is a new block or if there is nothing after
if (empty($menu_array[$i+1]['level']))
if (empty($menu_array[$i+1]['level'])) // End menu block
{
if ($showmenu)
print '<div class="menu_end"></div>'."\n";
......@@ -1669,7 +1678,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
}
}
if ($altok) print '<div class="blockvmenuend"></div>';
if ($altok) print '<div class="blockvmenuend"></div>'; // End menu block
}
return count($menu_array);
......
htdocs/core/menus/standard/eldy_menu.php
+ 10
− 10
View file @ 20f1bb76
......@@ -105,7 +105,7 @@ class MenuManager
$menuArbo = new Menubase($this->db,'eldy');
$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
$this->tabMenu=$tabMenu;
//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
}
......@@ -149,13 +149,13 @@ class MenuManager
print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode); // no output
return $this->menu->getNbOfVisibleMenuEntries();
}
if ($mode == 'jmobile')
{
print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode); // Fill this->menu that is empty with top menu
// $this->menu->liste is top menu
//var_dump($this->menu->liste);exit;
//var_dump($this->menu->liste);exit;
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'
{
......@@ -168,12 +168,12 @@ class MenuManager
$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
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
......@@ -184,7 +184,7 @@ class MenuManager
//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
//if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
$canonrelurl=preg_replace('/\?.*$/','',$relurl);
$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
//var_dump($canonrelurl);
......@@ -198,16 +198,16 @@ class MenuManager
print '<a href="'.$relurl.'"';
//print ' data-ajax="false"';
print '>';
if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") // No translation
if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") // No translation
{
if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
else print $langs->trans("Dashboard");
else print $langs->trans("Dashboard");
}
else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
print '</a>';
print '</li>'."\n";
}
foreach($submenu->liste as $key2 => $val2) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu']
{
$showmenu=true;
......
htdocs/public/demo/demo.css
+ 4
− 5
View file @ 20f1bb76
......@@ -32,16 +32,15 @@ a:hover {
background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%);
}
.csscolumns {
margin-left: 8px;
margin-top: 6px;
margin-bottom: 5px;
-webkit-column-count: 4; /* Chrome, Safari, Opera */
-moz-column-count: 4; /* Firefox */
column-count: 3;
-webkit-column-count: 2; /* Chrome, Safari, Opera */
-moz-column-count: 2; /* Firefox */
column-count: 2;
text-align: left;
}
.demomaxoveflow {
max-width: 100px;
max-width: 120px;
overflow: hidden;
text-overflow: ellipsis;
}
......
htdocs/public/demo/index.php
+ 1
− 1
View file @ 20f1bb76
......@@ -328,7 +328,7 @@ foreach ($demoprofiles as $profilearray)
print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 340px;">'."\n";
print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 346px;">'."\n";
print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment