Fix: Si toutes les box ont �t� mise du meme cot� on peut a nouveau en remettre de l'autre cot�.

Qual: Simplification du code de gestion des boxes.

htdocs/includes/boxes/box_factures_fourn.php

@@ -38,6 +38,7 @@ class box_factures_fourn extends ModeleBoxes {
 
 	var $db;
 	var $param;
+	var $textnohtmlencoded=true;
 	
     var $info_box_head = array();
     var $info_box_contents = array();
@@ -50,7 +51,7 @@ class box_factures_fourn extends ModeleBoxes {
         global $langs;
         $langs->load("boxes");
 
-        $this->boxlabel=$langs->trans("BoxLastSupplierBills");
+        $this->boxlabel=$langs->transnoentities("BoxLastSupplierBills");
     }
 
     /**
@@ -65,7 +66,7 @@ class box_factures_fourn extends ModeleBoxes {
         $facturestatic=new FactureFournisseur($db);
 
         $this->info_box_head = array(
-				'text' => $langs->trans("BoxTitleLastSupplierBills",$max),
+				'text' => $langs->transnoentities("BoxTitleLastSupplierBills",$max),
 			);
 
         if ($user->rights->fournisseur->facture->lire)
@@ -89,7 +90,7 @@ class box_factures_fourn extends ModeleBoxes {
 
             if ($result)
             {
-                $num = $db->num_rows();
+                $num = $db->num_rows($result);
 
                 $i = 0;
 
@@ -124,7 +125,7 @@ class box_factures_fourn extends ModeleBoxes {
         }
         else {
             $this->info_box_contents[0][0] = array('align' => 'left',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+            'text' => $langs->transnoentities("ReadPermissionNotAllowed"));
         }
     }
 

htdocs/includes/boxes/modules_boxes.php

@@ -38,7 +38,7 @@ class ModeleBoxes
 
     var $db;
     var $error='';
-	
+	var $textnohtmlencoded=false;
 
 	/*
 	*	\brief		Constructeur
@@ -105,43 +105,55 @@ class ModeleBoxes
 
         $bcx[0] = 'class="box_pair"';
         $bcx[1] = 'class="box_impair"';
-
         $var = true;
+	
+		// Define nbcol and nblines
         $nbcol=0;
 		if (isset($contents[0])) $nbcol=sizeof($contents[0])+1;
         $nblines=sizeof($contents);
 
         print "\n\n<!-- Box start -->\n";
-        print '<table width="100%" class="noborder"';
+		print '<div style="padding-right: 2px; padding-left: 2px; padding-bottom: 4px;" id="boxto_'.$this->box_id.'">'."\n";
-        if (isset($this->box_id)) print ' id="boxobject_'.$this->box_id.'"';
-        print '>';
 
         // Affiche titre de la boite
+		if (! empty($head['text']) || ! empty($head['sublink']))
+		{
+			print '<div id="boxto_'.$this->box_id.'_title">'."\n";
+	        print '<table width="100%" class="noborder">'."\n";
 	        print '<tr class="box_titre">';
 	        print '<td';
 	        if ($nbcol > 0) { print ' colspan="'.$nbcol.'"'; }
 	        print '>';
-
 			if ($conf->use_ajax)
 			{
 				print '<table class="nobordernopadding" width="100%"><tr><td align="left">';
 			}
-        if (isset($head['text'])) print dolibarr_trunc($head['text'],isset($head['limit'])?$head['limit']:$this->MAXLENGTHBOX);
+	        if (! empty($head['text']))
-        if (isset($head['sublink']) && $head['sublink'])
+			{
+				$s=dolibarr_trunc($head['text'],isset($head['limit'])?$head['limit']:$this->MAXLENGTHBOX);
+				if ($this->textnohtmlencoded) print htmlentities($s);
+				else print $s;
+			}
+	        if (! empty($head['sublink']))
 	        {
 	            print ' <a href="'.$head['sublink'].'" target="_new">'.img_picto($head['subtext'],$head['subpicto']).'</a>';
 	        }
 			if ($conf->use_ajax)
 	        {
 	      		print '</td><td class="nocellnopadd" width="14">';
-      		print img_picto($langs->trans("Move"),'uparrow','style="cursor:move;"');
+	      		print img_picto($langs->trans("MoveBox",$this->box_id),'uparrow','style="cursor:move;"');
 				print '</td></tr></table>';
 			}
-
 	        print '</td>';
-        print '</tr>';
+	        print "</tr>\n";
+	        print "</table>\n";
+			print "</div>\n";
+		}
 		
         // Affiche chaque ligne de la boite
+        if ($nblines) 
+		{
+			print '<table width="100%" class="noborder">'."\n";
 	        for ($i=0, $n=$nblines; $i < $n; $i++)
 	        {
 	            if (isset($contents[$i]))
@@ -214,14 +226,17 @@ class ModeleBoxes
 	                    print "</td>";
 	                }
 
-                if (sizeof($contents[$i])) print '</tr>';
+	                if (sizeof($contents[$i])) print "</tr>\n";
 	            }
 	        }
+	        print "</table>\n";
+		}
 
-        print "</table>";
+		// If invisible box with no contents
-
+		if (empty($head['text']) && empty($head['sublink']) && ! $nblines) print "<br><br>\n";
-        print "\n<!-- Box end -->\n\n";
 		
+		print "</div>\n";
+        print "<!-- Box end -->\n\n";
     }
 
 }

htdocs/index.php

@@ -550,7 +550,8 @@ if (sizeof($boxarray))
 	print '<td>'."\n";
 	
 	// Affichage colonne gauche
-	print '<div id="left" style="width: 50%; padding: 0px; margin: 0px; float: left;">'."\n";
+	print "\n<!-- Box container -->\n";
+	print '<div id="left" style="position: absolute; display: block; width: 50%; padding: 0px; margin: 0px; float: left;">'."\n";
 	$ii=0;
 	foreach ($boxarray as $key => $box)
 	{
@@ -558,21 +559,31 @@ if (sizeof($boxarray))
 		if (eregi('^A',$box->box_order)) // colonne A
 		{
 			$ii++;
-			print '<div style="padding-right: 2px; padding-left: 2px; padding-bottom: 4px;" id="boxto_'.$box->box_id.'">';
 			//print 'box_id '.$boxarray[$ii]->box_id.' ';
 		    //print 'box_order '.$boxarray[$ii]->box_order.'<br>';
 		    $boxid_left[$key] = $boxarray[$key]->box_id;
 			// Affichage boite key
 			$box->loadBox();
 			$box->showBox();
+		}
+	}
 
-			print '</div>';
+	// If no box on left, we show add an invisible empty box
+	if (! $ii)
+	{
+		$box->box_id='A';
+		$box->info_box_head=array();
+		$box->info_box_contents=array();
+		$box->showBox();
 	}
-	}
+	
-    print '</div>';
+	print "</div>\n";
+	print "<!-- End box container -->\n";
     print "\n";
   
 	// Affichage colonne droite
+	print "\n<!-- Box container -->\n";
+//	print '<div id="right" style="position: absolute; display: block; width: 50%; padding: 0px; margin: 0px; float: right;">'."\n";
 	print '<div id="right" style="width: 50%; padding: 0px; margin: 0px; float: right;">'."\n";
 	$ii=0;
 	foreach ($boxarray as $key => $box)
@@ -580,18 +591,26 @@ if (sizeof($boxarray))
 		if (eregi('^B',$box->box_order)) // colonne B
 		{
 			$ii++;
-			print '<div style="padding-right: 2px; padding-left: 2px; padding-bottom: 4px;" id="boxto_'.$box->box_id.'">';
 			//print 'box_id '.$boxarray[$ii]->box_id.' ';
 		    //print 'box_order '.$boxarray[$ii]->box_order.'<br>';
 		    $boxid_right[$key] = $boxarray[$key]->box_id;
 			// Affichage boite key
 			$box->loadBox();
 			$box->showBox();
+		}
+	}
 
-			print '</div>';
+	// If no box on left, we show add an invisible empty box
+	if (! $ii)
+	{
+		$box->box_id='B';
+		$box->info_box_head=array();
+		$box->info_box_contents=array();
+		$box->showBox();
 	}
-	}
+	
-  print '</div>';
+    print "</div>\n";
+	print "<!-- End box container -->\n";
     print "\n";
 
 	print "</td></tr>";
@@ -600,6 +619,7 @@ if (sizeof($boxarray))
 
 if ($conf->use_ajax)
 {
+	print "\n";
 	print '<script type="text/javascript" language="javascript">
 	function updateOrder(){
     var left_list = cleanSerialize(Sortable.serialize(\'left\'));

htdocs/langs/en_US/main.lang

@@ -392,6 +392,7 @@ CanBeModifiedIfKo=Can be modified if not valid
 AutomaticCode=Automatic code
 NotManaged=Not managed
 FeatureDisabled=Feature disabled
+MoveBox=Move box %s
 # Week day
 Monday=Monday
 Tuesday=Tuesday

htdocs/langs/fr_FR/main.lang

@@ -393,6 +393,7 @@ CanBeModifiedIfKo=Peut
 AutomaticCode=Création automatique du code
 NotManaged=Non géré
 FeatureDisabled=Fonction désactivée
+MoveBox=Déplacer la boite %s
 # Week day
 Monday=Lundi
 Tuesday=Mardi