Another step for menu management rewriting

htdocs/core/menus/standard/auguria.lib.php

@@ -326,7 +326,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 				}
 				else if ($showmenu)
 				{
-					print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
+					print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
 			}
 

htdocs/core/menus/standard/auguria_menu.php

@@ -175,8 +175,8 @@ class MenuManager
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
         $this->menu=new Menu();
 
-        if ($mode == 'top')  $res=print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu);
+        if ($mode == 'top')  $res=print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0);
-        if ($mode == 'left') $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu);
+        if ($mode == 'left') $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0);
         if ($mode == 'jmobile')
         {
         	$res=print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1);
@@ -206,7 +206,7 @@ class MenuManager
         			//var_dump($canonrelurl);
         			//var_dump($canonnexturl);
         			print '<ul>';
-        			if ($canonrelurl != $canonnexturl && $val['mainmenu'] != 'home')
+        			if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
         			{
         				// We add sub entry
         				print '<li data-role="list-divider"><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";

htdocs/core/menus/standard/eldy.lib.php

@@ -1242,7 +1242,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				}
 				else if ($showmenu)
 				{
-					print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
+					print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
 			}
 

htdocs/core/menus/standard/eldy_menu.php

@@ -131,8 +131,8 @@ class MenuManager
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
         $this->menu=new Menu();
 
-        if ($mode == 'top')  $res=print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu);
+        if ($mode == 'top')  $res=print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0);
-        if ($mode == 'left') $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu);
+        if ($mode == 'left') $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0);
         if ($mode == 'jmobile')
         {
         	$res=print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1);

htdocs/core/menus/standard/empty.php

@@ -60,8 +60,8 @@ class MenuManager
 	/**
 	 *  Show menu
 	 *
-     *	@param	string	$mode		'top' or 'left'
+     *	@param	string	$mode			'top', 'left', 'jmobile'
-	 *  @return	void
+     *  @return	void
 	 */
 	function showmenu($mode)
 	{
@@ -72,23 +72,35 @@ class MenuManager
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
 		$this->menu=new Menu();
 
-		if ($mode == 'top')
+		$res='ErrorBadParameterForMode';
+
+		$noout=0;
+		if ($mode == 'jmobile') $noout=1;
+
+		if ($mode == 'top' || $mode == 'jmobile')
 		{
-			print_start_menu_array_empty();
+			if (empty($noout)) print_start_menu_array_empty();
 
 			// Home
 			$showmode=1;
 			$idsel='home';
 			$classname='class="tmenusel"';
 
-			print_start_menu_entry_empty($idsel, $classname, $showmode);
+			if (empty($noout)) print_start_menu_entry_empty($idsel, $classname, $showmode);
-			print_text_menu_entry_empty($langs->trans("Home"), 1, dol_buildpath('/index.php',1).'?mainmenu=home&leftmenu=', $id, $idsel, $classname, $this->atarget);
+			if (empty($noout)) print_text_menu_entry_empty($langs->trans("Home"), 1, dol_buildpath('/index.php',1).'?mainmenu=home&leftmenu=', $id, $idsel, $classname, $this->atarget);
-			print_end_menu_entry_empty($showmode);
+			if (empty($noout)) print_end_menu_entry_empty($showmode);
+			$this->menu->add(dol_buildpath('/index.php',1), $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '');
 
-			print_end_menu_array_empty();
+			if (empty($noout)) print_end_menu_array_empty();
+
+			if ($mode == 'jmobile')
+			{
+				$this->topmenu=dol_clone($this->menu);
+				unset($this->menu->liste);
+			}
 		}
 
-		if ($mode == 'left')
+		if ($mode == 'left' || $mode == 'jmobile')
 		{
 			// Put here left menu entries
 			// ***** START *****
@@ -113,65 +125,131 @@ class MenuManager
 
 			// do not change code after this
 
-			$alt=0;
+			if (empty($noout))
-			$num=count($this->menu->liste);
-			for ($i = 0; $i < $num; $i++)
 			{
-				$alt++;
+				$alt=0;
-				if (empty($this->menu->liste[$i]['level']))
+				$num=count($this->menu->liste);
+				for ($i = 0; $i < $num; $i++)
 				{
-					if (($alt%2==0))
+					$alt++;
+					if (empty($this->menu->liste[$i]['level']))
 					{
-						print '<div class="blockvmenuimpair">'."\n";
+						if (($alt%2==0))
+						{
+							print '<div class="blockvmenuimpair">'."\n";
+						}
+						else
+						{
+							print '<div class="blockvmenupair">'."\n";
+						}
 					}
-					else
+
+					// Place tabulation
+					$tabstring='';
+					$tabul=($this->menu->liste[$i]['level'] - 1);
+					if ($tabul > 0)
 					{
-						print '<div class="blockvmenupair">'."\n";
+						for ($j=0; $j < $tabul; $j++)
+						{
+							$tabstring.='&nbsp; &nbsp;';
+						}
 					}
-				}
 
-				// Place tabulation
+					if ($this->menu->liste[$i]['level'] == 0) {
-				$tabstring='';
+						if ($this->menu->liste[$i]['enabled'])
-				$tabul=($this->menu->liste[$i]['level'] - 1);
+						{
-				if ($tabul > 0)
+							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'],1).'"'.($this->menu->liste[$i]['target']?' target="'.$this->menu->liste[$i]['target'].'"':'').'>'.$this->menu->liste[$i]['titre'].'</a></div>'."\n";
-				{
+						}
-					for ($j=0; $j < $tabul; $j++)
+						else
+						{
+							print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu->liste[$i]['titre'].'</font></div>'."\n";
+						}
+						print '<div class="menu_top"></div>'."\n";
+					}
+
+					if ($this->menu->liste[$i]['level'] > 0) {
+						print '<div class="menu_contenu">';
+
+						if ($this->menu->liste[$i]['enabled'])
+							print $tabstring.'<a class="vsmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'],1).'">'.$this->menu->liste[$i]['titre'].'</a><br>';
+						else
+							print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$this->menu->liste[$i]['titre'].'</font><br>';
+
+						print '</div>'."\n";
+					}
+
+					// If next is a new block or end
+					if (empty($this->menu->liste[$i+1]['level']))
 					{
-						$tabstring.='&nbsp; &nbsp;';
+						print '<div class="menu_end"></div>'."\n";
+						print "</div>\n";
 					}
 				}
-
+			}
-				if ($this->menu->liste[$i]['level'] == 0) {
+
-					if ($this->menu->liste[$i]['enabled'])
+			if ($mode == 'jmobile')
-					{
+			{
-						print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'],1).'"'.($this->menu->liste[$i]['target']?' target="'.$this->menu->liste[$i]['target'].'"':'').'>'.$this->menu->liste[$i]['titre'].'</a></div>'."\n";
+				$this->leftmenu=dol_clone($this->menu);
-					}
+				unset($this->menu->liste);
-					else
-					{
-						print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu->liste[$i]['titre'].'</font></div>'."\n";
-					}
-					print '<div class="menu_top"></div>'."\n";
-				}
-
-				if ($this->menu->liste[$i]['level'] > 0) {
-					print '<div class="menu_contenu">';
-
-					if ($this->menu->liste[$i]['enabled'])
-						print $tabstring.'<a class="vsmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'],1).'">'.$this->menu->liste[$i]['titre'].'</a><br>';
-					else
-						print $tabstring.'<font class="vsmenudisabled">'.$this->menu->liste[$i]['titre'].'</font><br>';
-
-					print '</div>'."\n";
-				}
-
-				// If next is a new block or end
-				if (empty($this->menu->liste[$i+1]['level']))
-				{
-					print '<div class="menu_end"></div>'."\n";
-					print "</div>\n";
-				}
 			}
 		}
+
+		if ($mode == 'jmobile')
+		{
+			foreach($this->topmenu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+			{
+				print '<ul data-role="listview" data-inset="true">';
+				print '<li data-role="list-divider">';
+				if ($val['enabled'] == 1)
+				{
+					$relurl=dol_buildpath($val['url'],1);
+					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
+					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
+
+					print '<a href="#">'.$val['titre'].'</a>'."\n";
+					// Search submenu fot this entry
+					$tmpmainmenu=$val['mainmenu'];
+					$tmpleftmenu='all';
+					//$submenu=new Menu();
+					//$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
+					//$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
+					$submenu=$this->leftmenu;
+
+					$canonrelurl=preg_replace('/\?.*$/','',$relurl);
+					$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
+					//var_dump($canonrelurl);
+					//var_dump($canonnexturl);
+					print '<ul>';
+        			if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
+					{
+						// We add sub entry
+						print '<li data-role="list-divider"><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";
+					}
+					foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+					{
+						$relurl2=dol_buildpath($val2['url'],1);
+						$relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2);
+						$relurl2=preg_replace('/__USERID__/',$user->id,$relurl2);
+						//var_dump($val2);
+						print '<li'.($val2['level']==0?' data-role="list-divider"':'').'><a href="'.$relurl2.'">'.$val2['titre'].'</a></li>'."\n";
+					}
+					//var_dump($submenu);
+					print '</ul>';
+				}
+				if ($val['enabled'] == 2)
+				{
+					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+				}
+				print '</li>';
+				print '</ul>'."\n";
+
+				break;	// Only first menu entry (so home)
+			}
+		}
+
+		unset($this->menu);
+
+		return $res;
 	}
 }
 

htdocs/cron/list.php

@@ -105,17 +105,18 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
 /*
  * View
  */
-if (!empty($status)) {
+
-	$pagetitle=$langs->trans("CronListActive");
+$form = new Form($db);
-}else {
+
-	$pagetitle=$langs->trans("CronListInactive");
+if (!empty($status))  $pagetitle=$langs->trans("CronListActive");
-}
+else $pagetitle=$langs->trans("CronListInactive");
 
 llxHeader('',$pagetitle);
 
+print_fiche_titre($pagetitle,'','setup');
+
+print $langs->trans('CronInfo');
 
-// Form object for popup
-$form = new Form($db);
 
 if ($action == 'delete')
 {
@@ -129,10 +130,6 @@ if ($action == 'execute'){
 }
 
 
-print_fiche_titre($pagetitle,'','setup');
-
-print $langs->trans('CronInfo');
-
 // liste des jobs creer
 $object = new Cronjob($db);
 $result=$object->fetch_all($sortorder, $sortfield, $limit, $offset, $status, $filter);
@@ -141,13 +138,11 @@ if ($result < 0) {
 }
 
 
-print "<p><h2>";
+print "<br><br>";
-print $langs->trans('CronWaitingJobs');
-print "</h2></p>";
 
 if (count($object->lines)>0) {
 
-	print '<table width="100%" cellspacing="0" cellpadding="4" class="border">';
+	print '<table class="noborder">';
 	print '<tr class="liste_titre">';
 	$arg_url='&page='.$page.'&status='.$status.'&search_label='.$search_label;
 	print_liste_field_titre($langs->trans("CronLabel"),$_SERVEUR['PHP_SELF'],"t.label","",$arg_url,'',$sortfield,$sortorder);

htdocs/main.inc.php

@@ -1294,7 +1294,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 
     if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print '<div class="ui-layout-north"> <!-- Begin top layout -->'."\n";
 
-    if (empty($_SESSION['dol_hide_topmenu']))
+    if (empty($_SESSION['dol_hide_topmenu']) && ! GETPOST('dol_hide_topmenu'))
     {
 	    print '<div id="tmenu_tooltip" class="tmenu">'."\n";
 
@@ -1425,7 +1425,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
     // Instantiate hooks of thirdparty module
     $hookmanager->initHooks(array('searchform','leftblock'));
 
-    if (empty($_SESSION['dol_hide_leftmenu']))
+    if (empty($_SESSION['dol_hide_leftmenu']) && ! GETPOST('dol_hide_leftmenu'))
     {
 	    if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "\n".'<div class="ui-layout-west"> <!-- Begin left layout -->'."\n";
 	    else print '<td class="vmenu" valign="top">';

htdocs/theme/auguria/style.css.php

@@ -594,9 +594,10 @@ a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { font-size:<?php p
 font.vmenudisabled  { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #D0D0D0; margin: 1px 1px 1px 5px; }
 a.vmenu:hover { color: #CCDDEE; }
 
-a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 5px; }
+a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; }
-font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #93a5aa; margin: 1px 1px 1px 5px; }
+font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #93a5aa; }
 a.vsmenu:hover { color: #556677; }
+font.vsmenudisabledmargin { margin: 1px 1px 1px 5px; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; }
 

htdocs/theme/bureau2crea/style.css.php

@@ -645,7 +645,8 @@ a.vsmenu:link       { font-size:11px; text-align:left; font-weight: normal; colo
 a.vsmenu:visited    { font-size:11px; text-align:left; font-weight: normal; color: #202020; margin: 1px 1px 1px 4px; }
 a.vsmenu:active     { font-size:11px; text-align:left; font-weight: normal; color: RGB(94,148,181); margin: 1px 1px 1px 4px; }
 a.vsmenu:hover      { font-size:11px; text-align:left; font-weight: normal; color: #7F0A29; margin: 1px 1px 1px 4px; }
-font.vsmenudisabled { font-size:11px; text-align:left; font-weight: normal; color: #202020; margin: 1px 1px 1px 4px; }
+font.vsmenudisabled { font-size:11px; text-align:left; font-weight: normal; color: #202020; }
+font.vsmenudisabledmargin { margin: 1px 1px 1px 4px; }
 
 a.help:link         { font-size: 10px; font-weight: bold; background: #FFFFFF; border: 1px solid #8CACBB; color: #68ACCF; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; }
 a.help:visited      { font-size: 10px; font-weight: bold; background: #FFFFFF; border: 1px solid #8CACBB; color: #68ACCF; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; }

htdocs/theme/cameleo/style.css.php

@@ -657,7 +657,8 @@ a.vsmenu:link       { font-size:11px; text-align:left; font-weight: normal; colo
 a.vsmenu:visited    { font-size:11px; text-align:left; font-weight: normal; color: #202020; margin: 1px 1px 1px 4px; }
 a.vsmenu:active     { font-size:11px; text-align:left; font-weight: normal; color: RGB(94,148,181); margin: 1px 1px 1px 4px; }
 a.vsmenu:hover      { font-size:11px; text-align:left; font-weight: normal; color: #7F0A29; margin: 1px 1px 1px 4px; }
-font.vsmenudisabled { font-size:11px; text-align:left; font-weight: normal; color: #202020; margin: 1px 1px 1px 4px; }
+font.vsmenudisabled { font-size:11px; text-align:left; font-weight: normal; color: #202020; }
+font.vsmenudisabledmargin { margin: 1px 1px 1px 4px; }
 
 a.help:link         { font-size: 10px; font-weight: bold; background: #FFFFFF; border: 1px solid #8CACBB; color: #68ACCF; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; }
 a.help:visited      { font-size: 10px; font-weight: bold; background: #FFFFFF; border: 1px solid #8CACBB; color: #68ACCF; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; }

htdocs/theme/eldy/style.css.php

@@ -356,7 +356,7 @@ td.showDragHandle {
 /* ============================================================================== */
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->browser->phone) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?'20':'24')); ?>px;
+	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?(empty($conf->browser->phone)?'20':'4'):'24')); ?>px;
 	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->browser->phone)?'12':'6')); ?>px;
 }
 
@@ -839,9 +839,10 @@ a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { font-size:<?php p
 font.vmenudisabled  { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #93a5aa; }
 a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextmain; ?>; }
 
-a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; padding: 1px 1px 1px 8px; }
+a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; }
-font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #93a5aa; margin: 1px 1px 1px 8px; }
+font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #93a5aa; }
 a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextmain; ?>; }
+font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; }
 
@@ -2522,8 +2523,9 @@ div.dolEventError h1, div.dolEventError h2 {
 /* ============================================================================== */
 
 .ui-body-c .ui-link {
-	color: #111 !important;
+	color: #FFF !important;
 }
+/*
 .ui-li-divider {
 	background: #eee !important;
 }
@@ -2546,7 +2548,7 @@ div.dolEventError h1, div.dolEventError h2 {
 	color: #444 !important;
 	text-shadow: 0 1px 1px #fff !important;
 }
-
+*/
 
 <?php
 if (is_object($db)) $db->close();