Fix responsive

htdocs/core/class/extrafields.class.php

@@ -900,7 +900,7 @@ class ExtraFields
 		{
 			$tmp=explode(',',$size);
 			$newsize=$tmp[0];
-			$out='<input type="text" class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.$value.'"'.($moreparam?$moreparam:'').'>';
+			$out='<input type="text" class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
 		}
 		elseif (preg_match('/varchar/', $type))
 		{
@@ -908,13 +908,20 @@ class ExtraFields
 		}
 		elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
-			$out='<input type="text" class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
+			$out='<input type="text" class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
 		}
 		elseif ($type == 'text')
 		{
-			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
+			{
-			$out=$doleditor->Create(1);
+				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
+				$out=$doleditor->Create(1);
+			}
+			else
+			{
+				$out='<input type="text" class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+			}
 		}
 		elseif ($type == 'boolean')
 		{

htdocs/core/class/menu.class.php

@@ -62,11 +62,12 @@ class Menu
      * @param	string	$id			Id
      * @param	string	$idsel		Id sel
      * @param	string	$classname	Class name
+     * @param	string	$prefix		Prefix to title (image or picto)
      * @return	void
      */
-    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='')
+    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')
     {
-        $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname);
+    	$this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
     }
 
     /**
@@ -84,12 +85,13 @@ class Menu
      * @param	string	$id			Id
      * @param	string	$idsel		Id sel
      * @param	string	$classname	Class name
+     * @param	string	$prefix		Prefix to title (image or picto)
      * @return	void
      */
-    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='')
+    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')
     {
         $array_start = array_slice($this->liste,0,($idafter+1));
-        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname));
+        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
         $array_end   = array_slice($this->liste,($idafter+1));
         $this->liste=array_merge($array_start,$array_new,$array_end);
     }

htdocs/core/get_menudiv.php

@@ -132,6 +132,18 @@ print '
         cursor: pointer;
         display: block;
     }
+    li.lilevel4 a {
+        padding: 0.2em 15px 8px 60px;
+        color: #000;
+        cursor: pointer;
+        display: block;
+    }
+    li.lilevel5 a {
+        padding: 0.2em 15px 8px 60px;
+        color: #000;
+        cursor: pointer;
+        display: block;
+    }
     li.lilevel3:last-child {
         padding-bottom: 10px;
     }

htdocs/core/menus/standard/auguria_menu.php

@@ -190,7 +190,7 @@ class MenuManager
 						print '<a href="'.$relurl.'">';
 					    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");
+        				    if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
         				    else print $langs->trans("Dashboard");
         				}
 						else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");

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

@@ -518,7 +518,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			$langs->load("users");
 
 			// Home - dashboard
-			$newmenu->add("/index.php?mainmenu=home&leftmenu=home", $langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home');
+			$newmenu->add("/index.php?mainmenu=home&amp;leftmenu=home", $langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', '<i class="fa fa-bar-chart paddingright"></i>');
 
 			// Setup
 			$newmenu->add("/admin/index.php?mainmenu=home&amp;leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup');
@@ -1639,7 +1639,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				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";
+					print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.($menu_array[$i]['prefix']?$menu_array[$i]['prefix']:'').$menu_array[$i]['titre'].'</a></div>'."\n";
 					$lastlevel0='enabled';
 				}
 				else if ($showmenu)                 // Not enabled but visible (so greyed)

htdocs/core/menus/standard/eldy_menu.php

@@ -200,7 +200,7 @@ class MenuManager
         				print '<a href="'.$relurl.'">';
         				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");
+        					if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
         				    else print $langs->trans("Dashboard");
         				}
         				else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");

htdocs/langs/en_US/admin.lang

@@ -1407,7 +1407,7 @@ CompressionOfResources=Compression of HTTP responses
 CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers 
 DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record. 
-DefaultCreateForm=Default values for creation form
+DefaultCreateForm=Default values (on forms to create)
 DefaultSearchFilters=Default search filters
 DefaultSortOrder=Default sort orders
 DefaultFocus=Default focus fields

htdocs/product/stock/massstockmove.php

@@ -342,7 +342,7 @@ print '<input type="hidden" name="token" value="' .$_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="addline">';
 
 
-print '<div class="div-table-responsive-no-max">';
+print '<div class="div-table-responsive-no-min">';
 print '<table class="liste" width="100%">';
 //print '<div class="tagtable centpercent">';
 

htdocs/product/stock/replenish.php

@@ -260,6 +260,7 @@ if ($action == 'order' && isset($_POST['valid']))
 
 $form = new Form($db);
 $formproduct = new FormProduct($db);
+$prod = new Product($db);
 
 $title = $langs->trans('Status');
 
@@ -480,6 +481,7 @@ if ($sref || $snom || $sall || $salert || $draftorder || GETPOST('search', 'alph
 	);
 }
 
+print '<div class="div-table-responsive">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
 print '<table class="liste" width="100%">';
 
 $param = (isset($type)? '&type=' . $type : '');
@@ -535,9 +537,6 @@ print_liste_field_titre('StockToBuy', $_SERVER["PHP_SELF"], '', $param, '', 'ali
 print_liste_field_titre('SupplierRef', $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
 print "</tr>\n";
 
-$prod = new Product($db);
-
-$var = True;
 while ($i < ($limit ? min($num, $limit) : $num))
 {
 	$objp = $db->fetch_object($resql);
@@ -564,7 +563,6 @@ while ($i < ($limit ? min($num, $limit) : $num))
 				if (!empty($objtp->label)) $objp->label = $objtp->label;
 			}
 		}
-		$var =! $var;
 
 		if ($usevirtualstock)
 		{
@@ -665,34 +663,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	$i++;
 }
 print '</table>';
-
+print '</div>';
-
-if ($num > $conf->liste_limit)
-{
-	if ($sref || $snom || $sall || $salert || $draftorder || GETPOST('search', 'alpha'))
-	{
-		$filters = '&sref=' . $sref . '&snom=' . $snom;
-		$filters .= '&sall=' . $sall;
-		$filters .= '&salert=' . $salert;
-		$filters .= '&draftorder=' . $draftorder;
-		$filters .= '&mode=' . $mode;
-		$filters .= '&fk_supplier=' . $fk_supplier;
-		$filters .= '&fk_entrepot=' . $fk_entrepot;
-		print_barre_liste('', $page, 'replenish.php', $filters, $sortfield, $sortorder, '', $num, 0, '');
-	}
-	else
-	{
-		$filters = '&sref=' . $sref . '&snom=' . $snom;
-		$filters .= '&fourn_id=' . $fourn_id;
-		$filters .= (isset($type)? '&type=' . $type : '');
-		$filters .= '&salert=' . $salert;
-		$filters .= '&draftorder=' . $draftorder;
-		$filters .= '&mode=' . $mode;
-		$filters .= '&fk_supplier=' . $fk_supplier;
-		$filters .= '&fk_entrepot=' . $fk_entrepot;
-		print_barre_liste('', $page, 'replenish.php', $filters, $sortfield, $sortorder, '', $num, 0, '');
-	}
-}
 
 $db->free($resql);
 

htdocs/projet/activity/perday.php

@@ -34,13 +34,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 
-$langs->load('projects');
+$langs->loadLangs(array('projects','users','companies'));
-$langs->load('users');
 
 $action=GETPOST('action','aZ09');
-$mode=GETPOST("mode");
+$mode=GETPOST("mode",'alpha');
 $id=GETPOST('id','int');
-$taskid=GETPOST('taskid');
+$taskid=GETPOST('taskid','int');
 
 $mine=0;
 if ($mode == 'mine') $mine=1;

htdocs/projet/activity/perweek.php

@@ -34,13 +34,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 
-$langs->load('projects');
+$langs->loadLangs(array('projects','users','companies'));
-$langs->load('users');
 
 $action=GETPOST('action','aZ09');
-$mode=GETPOST("mode");
+$mode=GETPOST("mode",'alpha');
 $id=GETPOST('id','int');
-$taskid=GETPOST('taskid');
+$taskid=GETPOST('taskid','int');
 
 
 $mine=0;

htdocs/theme/eldy/style.css.php

@@ -4775,9 +4775,19 @@ div.tabsElem a.tab {
 }
 .lilevel3
 {
-	padding-left: 54px;
+	padding-left: 44px;
 	background: #fff ! important;
 }
+.lilevel4
+{
+	padding-left: 66px;
+    background: #fff ! important;
+}
+.lilevel5
+{
+	padding-left: 88px;
+    background: #fff ! important;
+}
 
 
 

htdocs/theme/md/style.css.php

@@ -4780,7 +4780,17 @@ border-top-right-radius: 6px;
 }
 .lilevel3
 {
-	padding-left: 54px;
+	padding-left: 44px;
+    background: #fff ! important;
+}
+.lilevel4
+{
+	padding-left: 66px;
+    background: #fff ! important;
+}
+.lilevel5
+{
+	padding-left: 88px;
     background: #fff ! important;
 }
 

htdocs/variants/list.php

@@ -57,7 +57,9 @@ $variants = $object->fetchAll();
 
 llxHeader('', $title);
 
-print_fiche_titre($title);
+$buttonadd='<a href="create.php" class="butAction">'.$langs->trans('Create').'</a>';
+
+print load_fiche_titre($title, $buttonadd);
 
 $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 ?>
@@ -141,11 +143,6 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 
 	</table>
 
-	<div class="tabsAction">
-		<div class="inline-block divButAction">
-		<a href="create.php" class="butAction"><?php echo $langs->trans('Create') ?></a>
-		</div>
-	</div>
 <?php
 
 llxFooter();