From 7a8d28f13596dc229d20da783f841114b74c8a05 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Aug 2013 19:12:26 +0200
Subject: [PATCH] Several fix for last pull request: - A property of an element
 must be shown under another element - Property that may be page content must
 not be output into a list. - Bad W3C (<br> must not be <br />) - Must not use
 picto to edit a property to define a link to a page (replaced with generic
 sheet picto).

---
 htdocs/comm/propal/list.php    | 22 +++++++++-------------
 htdocs/commande/liste.php      | 17 +++++++----------
 htdocs/compta/facture/list.php | 18 ++++++++----------
 3 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index c978e035785..0d2b5e7ada4 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -334,11 +334,17 @@ if ($result)
 		print $objectstatic->getNomUrl(1);
 		print '</td>';
 
-		print '<td width="20" class="nobordernopadding nowrap">';
+		print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
 		if ($objp->fk_statut == 1 && $db->jdate($objp->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
+		if (! empty($objp->note_private))
+		{
+			print ' <span class="note">';
+			print '<a href="'.DOL_URL_ROOT.'/comm/propal/note.php?id='.$objp->propalid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
+			print '</span>';
+		}
 		print '</td>';
 
-		print '<td width="16" align="right" class="nobordernopadding">';
+		print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
 		$filename=dol_sanitizeFileName($objp->ref);
 		$filedir=$conf->propal->dir_output . '/' . dol_sanitizeFileName($objp->ref);
 		$urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->propalid;
@@ -353,23 +359,13 @@ if ($result)
 		$companystatic->client=$objp->client;
 		print '<td>';
 		print $companystatic->getNomUrl(1,'customer');
-		if(!empty($objp->note_private))
-		{
-			print '<br/>';
-			print '<ul>';
-			print '<span class="warning">';
-			print $objp->note_private;
-			 print '<a href="'.DOL_URL_ROOT.'/comm/propal/note.php?action=editnote&id='.$objp->propalid.'">'.img_edit($langs->trans("Editnote")).'</a>';
-			print '</span></ul>';
-			
-		}
 		print '</td>';
 
 		// Town
 		print '<td class="nocellnopadd">';
 		print $objp->town;
 		print '</td>';
-		
+
 		// Customer ref
 		print '<td class="nocellnopadd nowrap">';
 		print $objp->ref_client;
diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php
index aa3628dd2ba..b5175888849 100644
--- a/htdocs/commande/liste.php
+++ b/htdocs/commande/liste.php
@@ -321,8 +321,14 @@ if ($resql)
 		print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$objp->fk_statut));
 		print '</td>';
 
-		print '<td width="20" class="nobordernopadding nowrap">';
+		print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
 		if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && $db->jdate($objp->date_valid) < ($now - $conf->commande->client->warning_delay)) print img_picto($langs->trans("Late"),"warning");
+		if(!empty($objp->note_private))
+		{
+			print ' <span class="note">';
+			print '<a href="'.DOL_URL_ROOT.'/commande/note.php?id='.$objp->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
+			print '</span>';
+		}
 		print '</td>';
 
 		print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
@@ -354,15 +360,6 @@ if ($resql)
 				}
 			}
 		}
-		if(!empty($objp->note_private))
-		{
-			print '<br/>';
-			print '<ul>';
-			print '<span class="warning">';
-			print $objp->note_private;
-			print '<a href="'.DOL_URL_ROOT.'/commande/note.php?action=editnote&id='.$objp->rowid.'">'.img_edit($langs->trans("Editnote")).'</a>';
-			print '</span></ul>';
-		}
 		print '</td>';
 
 		print '<td>'.$objp->ref_client.'</td>';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index c61b5c5ed5b..59c6852480c 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -340,12 +340,18 @@ if ($resql)
             print $objp->increment;
             print '</td>';
 
-            print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
+            print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
+            if (! empty($objp->note_private))
+            {
+				print ' <span class="note">';
+				print '<a href="'.DOL_URL_ROOT.'/compta/facture/note.php?id='.$objp->facid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
+				print '</span>';
+			}
             $filename=dol_sanitizeFileName($objp->facnumber);
             $filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($objp->facnumber);
             $urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->facid;
             print $formfile->getDocumentsLink($facturestatic->element, $filename, $filedir);
-            print '</td>';
+			print '</td>';
             print '</tr>';
             print '</table>';
 
@@ -369,14 +375,6 @@ if ($resql)
             $thirdparty->id=$objp->socid;
             $thirdparty->nom=$objp->nom;
             print $thirdparty->getNomUrl(1,'customer');
-            if(!empty($objp->note_private))
-            {
-				print '<br/>';
-				print '<ul>';
-				print '<span class="warning">'.$objp->note_private;
-				print '<a href="'.DOL_URL_ROOT.'/compta/facture/note.php?action=editnote&id='.$objp->facid.'">'.img_edit($langs->trans("Editnote")).'</a>';
-				print'</span></ul>';
-			}
             print '</td>';
 
             print '<td align="right">'.price($objp->total_ht,0,$langs).'</td>';