From 0878ee3a0f7280cbb4ec6da2448fda2a595fb5eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 13 Apr 2020 17:55:25 +0200
Subject: [PATCH] Look and feel v12

---
 htdocs/core/lib/company.lib.php |  2 +-
 htdocs/societe/notify/card.php  | 10 ++++++----
 htdocs/user/notify/card.php     | 12 +++++++-----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 16d29af4a35..25061e60f9c 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1228,7 +1228,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
             // Edit
             if ($user->rights->societe->contact->creer)
             {
-                print '<a href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';
+                print '<a class="editfielda paddingleft" href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';
                 print img_edit();
                 print '</a>';
             }
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 49cecff76d0..191f9c4bb2c 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -251,11 +251,11 @@ if ($result > 0)
  			$label = ($langs->trans("Notify_".$managedeventfornotification['code']) != "Notify_".$managedeventfornotification['code'] ? $langs->trans("Notify_".$managedeventfornotification['code']) : $managedeventfornotification['label']);
             $actions[$managedeventfornotification['rowid']] = $label;
         }
-        print '<tr class="oddeven"><td class="maxwidthonsmartphone">';
-        print $form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
+        print '<tr class="oddeven nohover"><td class="maxwidthonsmartphone">';
+        print img_picto('', 'contact', '', false, 0, 0, '', 'paddingright').$form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
         print '</td>';
         print '<td class="maxwidthonsmartphone">';
-        print $form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
+        print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
         print '</td>';
         print '<td>';
         $type = array('email'=>$langs->trans("EMail"));
@@ -343,7 +343,7 @@ if ($result > 0)
             print '</td>';
             print '<td>';
             $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print $label;
+            print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
             print '</td>';
             print '<td>';
             if ($obj->type == 'email') print $langs->trans("Email");
@@ -522,6 +522,8 @@ if ($result > 0)
             $i++;
         }
         $db->free($resql);
+    } else {
+    	print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
     }
 
     print '</table>';
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 93263bd92ea..84fbf2793e3 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -222,7 +222,7 @@ if ($result > 0)
  			$label = ($langs->trans("Notify_".$notifiedevent['code']) != "Notify_".$notifiedevent['code'] ? $langs->trans("Notify_".$notifiedevent['code']) : $notifiedevent['label']);
             $actions[$notifiedevent['rowid']] = $label;
         }
-        print '<tr class="oddeven"><td>';
+        print '<tr class="oddeven nohover"><td>';
         print $object->getNomUrl(1);
         if (isValidEmail($object->email))
         {
@@ -235,7 +235,7 @@ if ($result > 0)
         }
         print '</td>';
         print '<td>';
-        print $form->selectarray("actionid", $actions, '', 1);
+        print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1);
         print '</td>';
         print '<td>';
         $type = array('email'=>$langs->trans("EMail"));
@@ -321,7 +321,7 @@ if ($result > 0)
             print '</td>';
             print '<td>';
             $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print $label;
+            print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
             print '</td>';
             print '<td>';
             if ($obj->type == 'email') print $langs->trans("Email");
@@ -332,8 +332,7 @@ if ($result > 0)
             $i++;
         }
         $db->free($resql);
-    }
-
+	}
 
     // List of notifications enabled for fixed email
     /*
@@ -501,6 +500,9 @@ if ($result > 0)
         }
         $db->free($resql);
     }
+    else {
+    	print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+    }
 
     print '</table>';