From 096a446b7fcfe221613b0f350d8fa60eceb240db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 11:15:15 +0100
Subject: [PATCH 01/18] Changed style of contract creation form to the 3.5
 style

---
 htdocs/contrat/fiche.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 59a23bebd91..59ed152de77 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -767,7 +767,7 @@ $objectlignestatic=new ContratLigne($db);
  *********************************************************************/
 if ($action == 'create')
 {
-    dol_fiche_head('', '', $langs->trans("AddContract"), 0, 'contract');
+	print_fiche_titre($langs->trans('AddContract'));
 
     dol_htmloutput_errors($mesg,'');
 

From 371f0cbb8ec433939b157ddce0fd2cf36d50140a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 11:15:35 +0100
Subject: [PATCH 02/18] Fixed module name in contract admin setup page

---
 htdocs/admin/contract.php                     | 2 +-
 htdocs/contrat/admin/contract_extrafields.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index b059fa34bec..00f6c7af825 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -204,7 +204,7 @@ print "<br>";
 
 $head=contract_admin_prepare_head();
 
-dol_fiche_head($head, 'contract', $langs->trans("ModuleSetup"));
+dol_fiche_head($head, 'contract', $langs->trans("Contracts"), 0, 'contract');
 
 /*
  * Contracts Numbering model
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index c50872beee4..e6fa44e5594 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -72,7 +72,7 @@ print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'setup');
 print '<br>';
 $head=contract_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("ModuleSetup"), 0, 'contrat');
+dol_fiche_head($head, 'attributes', $langs->trans("Contracts"), 0, 'contract');
 
 
 print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";

From 0a603777ae74395a097e5cb0fbf66951e10cd0a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 11:27:06 +0100
Subject: [PATCH 03/18] Added missing spacing

---
 htdocs/compta/facture/admin/facture_cust_extrafields.php    | 2 +-
 htdocs/compta/facture/admin/facturedet_cust_extrafields.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
index 0efcb94d079..1056d3148c6 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php
@@ -75,7 +75,7 @@ $head = invoice_admin_prepare_head(null);
 dol_fiche_head($head, 'attributes', $langs->trans("Invoices"), 0, 'invoice');
 
 
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
+print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br><br>'."\n";
 
 // Load attribute_label
 $extrafields->fetch_name_optionals_label($elementtype);
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
index a0c560d52cb..5365cf2bee9 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
@@ -76,7 +76,7 @@ $head = invoice_admin_prepare_head(null);
 dol_fiche_head($head, 'attributeslines', $langs->trans("Invoices"), 0, 'invoice');
 
 
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
+print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br><br>'."\n";
 
 // Load attribute_label
 $extrafields->fetch_name_optionals_label($elementtype);

From f9a451dbb9de09214fbf3cb94361b6c9e1a47183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 11:27:25 +0100
Subject: [PATCH 04/18] Corrected intervention translation in module
 configuration page

---
 htdocs/fichinter/admin/fichinter_extrafields.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index 06fefb32fbe..04c05093d5b 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 $langs->load("companies");
 $langs->load("admin");
 $langs->load("members");
+$langs->load('interventions');
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
@@ -64,6 +65,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
 
 llxHeader();
 
+$textobject=$langs->transnoentitiesnoconv("Interventions");
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup');

From 54b9f72977ceae776acaf210afebc7f04e1d6399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 11:31:37 +0100
Subject: [PATCH 05/18] Unified module name in members admin page and added
 spacing before submit button

---
 htdocs/adherents/admin/adherent.php | 2 +-
 htdocs/adherents/admin/public.php   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 6534ac09ac3..f285d9a8a3a 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -115,7 +115,7 @@ print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
+dol_fiche_head($head, 'general', $langs->trans("Members"), 0, 'user');
 
 
 dol_htmloutput_mesg($mesg);
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 1bb11d41c40..9a1fceb9b4e 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -84,7 +84,7 @@ print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'public', $langs->trans("Member"), 0, 'user');
+dol_fiche_head($head, 'public', $langs->trans("Members"), 0, 'user');
 
 dol_htmloutput_mesg($mesg);
 
@@ -206,7 +206,7 @@ if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
 print '</table>';
 
 print '<center>';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<br><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print '</center>';
 
 print '</form>';

From 64e76852c5c2dd9d1e5d78607acbaa55a4018a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 11:37:42 +0100
Subject: [PATCH 06/18] Corrected projects admin page translation

---
 htdocs/projet/admin/project.php                  | 6 +++---
 htdocs/projet/admin/project_extrafields.php      | 5 ++---
 htdocs/projet/admin/project_task_extrafields.php | 7 ++-----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index c50ddd1a290..7a4233754b9 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -288,7 +288,7 @@ print_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'setup');
 
 $head=project_admin_prepare_head();
 
-dol_fiche_head($head, 'project', $langs->trans("Project"), 0, 'project');
+dol_fiche_head($head, 'project', $langs->trans("Projects"), 0, 'project');
 
 /*
  * Projects Numbering model
@@ -403,7 +403,7 @@ print '<td width="100">'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td>'.$langs->trans("Example").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
-print '<td align="center" width="80">'.$langs->trans("Infos").'</td>';
+print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
 print "</tr>\n";
 
 clearstatcache();
@@ -671,7 +671,7 @@ print '  <td width="100">'.$langs->trans("Name")."</td>\n";
 print "  <td>".$langs->trans("Description")."</td>\n";
 print '<td align="center" width="60">'.$langs->trans("Activated")."</td>\n";
 print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
-print '<td align="center" width="80">'.$langs->trans("Infos").'</td>';
+print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
 print "</tr>\n";
 
 clearstatcache();
diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php
index 6b26e8bc8f5..9ed4381103a 100644
--- a/htdocs/projet/admin/project_extrafields.php
+++ b/htdocs/projet/admin/project_extrafields.php
@@ -59,8 +59,6 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
-$textobject=$langs->transnoentitiesnoconv("Project");
-
 llxHeader("",$langs->trans("ProjectsSetup"));
 
 
@@ -70,8 +68,9 @@ print_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'setup');
 
 $head = project_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Project"), 0, 'project');
+dol_fiche_head($head, 'attributes', $langs->trans("Projects"), 0, 'project');
 
+$textobject=$langs->transnoentitiesnoconv("Project");
 
 print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
 print '<br>';
diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php
index 0ab60425a19..9d85781084a 100644
--- a/htdocs/projet/admin/project_task_extrafields.php
+++ b/htdocs/projet/admin/project_task_extrafields.php
@@ -59,19 +59,16 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
-$textobject=$langs->transnoentitiesnoconv("Project");
-
 llxHeader("",$langs->trans("ProjectsSetup"));
 
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'setup');
 
-
 $head = project_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_task', $langs->trans("Project"), 0, 'project');
-
+dol_fiche_head($head, 'attributes_task', $langs->trans("Projects"), 0, 'project');
+$textobject=$langs->transnoentitiesnoconv("Project");
 
 print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
 print '<br>';

From 96143ff4a7510c6ef9f33da162e1cd5502fe64c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 11:41:19 +0100
Subject: [PATCH 07/18] Added missing translation keys

---
 htdocs/langs/en_US/other.lang | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index f8f8a5fd87b..33626a001f5 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -22,6 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit withdrawal
 Notify_WITHDRAW_EMIT=Perform withdrawal
 Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 Notify_COMPANY_CREATE=Third party created
+Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_ORDER_SENTBYMAIL=Envío pedido por e-mail
 Notify_BILL_PAYED=Customer invoice payed
@@ -40,6 +41,7 @@ Notify_MEMBER_VALIDATE=Member validated
 Notify_MEMBER_SUBSCRIPTION=Member subscribed
 Notify_MEMBER_RESILIATE=Member resiliated
 Notify_MEMBER_DELETE=Member deleted
+Notify_PROJECT_CREATE=Project creation
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size

From 1d357ec2f9952e9f16f3ee495fa1abd33f1fa71f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 11:53:22 +0100
Subject: [PATCH 08/18] Removed odd tabs from some modules

---
 htdocs/admin/bank.php                      |  9 ---------
 htdocs/admin/compta.php                    | 10 ----------
 htdocs/admin/dons.php                      | 12 ------------
 htdocs/admin/ecm.php                       | 10 ----------
 htdocs/admin/mailing.php                   | 10 ----------
 htdocs/admin/prelevement.php               | 10 ----------
 htdocs/admin/stock.php                     | 11 -----------
 htdocs/admin/taxes.php                     | 12 ------------
 htdocs/externalsite/admin/externalsite.php | 10 ----------
 htdocs/paybox/admin/paybox.php             | 10 ----------
 10 files changed, 104 deletions(-)

diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 0fcf52b888a..34b7ece1cf2 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -88,15 +88,6 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup');
 print '<br>';
 
-$h = 0;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/bank.php";
-$head[$h][1] = $langs->trans("Miscellaneous");
-$head[$h][2] = 'general';
-$hselected=$h;
-$h++;
-
-dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index a2abb070c3a..1e5828f55e2 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -104,16 +104,6 @@ print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'setup');
 
 print '<br>';
 
-$h = 0;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/compta.php";
-$head[$h][1] = $langs->trans("Accountancy");
-$head[$h][2] = 'Compta';
-$hselected=$h;
-$h++;
-
-dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
-
 print '<table class="noborder" width="100%">';
 
 // Cas du parametre COMPTA_MODE
diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php
index bb54f0ead67..c350cea531b 100644
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.php
@@ -120,18 +120,6 @@ llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'setup');
-print '<br>';
-
-$h = 0;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/dons.php";
-$head[$h][1] = $langs->trans("Donations");
-$head[$h][2] = 'Donation';
-$hselected=$h;
-$h++;
-
-dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
-
 
 // Document templates
 print '<br>';
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index 68782a2620d..50ad5ce13e8 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -72,16 +72,6 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("ECMSetup"),$linkback,'setup');
 print '<br>';
 
-$h = 0;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/ecm.php";
-$head[$h][1] = $langs->trans("Miscellaneous");
-$head[$h][2] = 'general';
-$hselected=$h;
-$h++;
-
-dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
-
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Description").'</td>';
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 3c9c2f5ad93..43fd62028fd 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -80,16 +80,6 @@ llxHeader('',$langs->trans("MailingSetup"));
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("MailingSetup"),$linkback,'setup');
 
-$h = 0;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/mailing.php";
-$head[$h][1] = $langs->trans("Miscellaneous");
-$head[$h][2] = 'general';
-$hselected=$h;
-$h++;
-
-dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
-
 if (! empty($conf->use_javascript_ajax))
 {
 	print "\n".'<script type="text/javascript">';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index c2d2aa69d61..d0c0b2fb3a5 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -119,16 +119,6 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'setup');
 print '<br>';
 
-$h = 0;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/prelevement.php";
-$head[$h][1] = $langs->trans("Withdrawals");
-$head[$h][2] = 'Withdrawal';
-$hselected=$h;
-$h++;
-
-dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
-
 print '<form method="post" action="prelevement.php?action=set">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 067da1dd91e..99402ebf2d3 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -103,17 +103,6 @@ llxHeader('',$langs->trans("StockSetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("StockSetup"),$linkback,'setup');
-print '<br>';
-
-$h = 0;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/stock.php";
-$head[$h][1] = $langs->trans("Miscellaneous");
-$head[$h][2] = 'general';
-$hselected=$h;
-$h++;
-
-dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
 
 $form=new Form($db);
 $var=true;
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 92e047b4a08..5e9ee49b532 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -121,18 +121,6 @@ $form=new Form($db);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans('TaxSetup'),$linkback,'setup');
-print '<br>';
-
-$h = 0;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/taxes.php";
-$head[$h][1] = $langs->trans("Miscellaneous");
-$head[$h][2] = 'general';
-$hselected=$h;
-$h++;
-
-dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
-
 
 print '<br>';
 if (empty($mysoc->tva_assuj))
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index ba63a5389e4..45d1ae0fb2d 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -79,16 +79,6 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("ExternalSiteSetup"),$linkback,'setup');
 print '<br>';
 
-$h = 0;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/externalsite.php";
-$head[$h][1] = $langs->trans("Miscellaneous");
-$head[$h][2] = 'externalsite';
-$hselected=$h;
-$h++;
-
-dol_fiche_head($head, $hselected, $langs->trans("Module100Name"));
-
 print $langs->trans("Module100Desc")."<br>\n";
 print '<br>';
 
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 0871aaf71e0..7fec29bc73d 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -93,16 +93,6 @@ llxHeader();
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("PayBoxSetup"),$linkback,'setup');
 
-$h = 0;
-$head = array();
-
-$head[$h][0] = DOL_URL_ROOT."/paybox/admin/paybox.php";
-$head[$h][1] = $langs->trans("Account");
-$head[$h][2] = 'payboxaccount';
-$h++;
-
-dol_fiche_head($head, 'payboxaccount', '');
-
 print $langs->trans("PayBoxDesc")."<br>\n";
 
 print '<br>';

From 960bea2d39b49fe228804c6114ff973ac70880b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 12:02:44 +0100
Subject: [PATCH 09/18] Corrected admin page style of some modules

---
 htdocs/ftp/admin/ftpclient.php | 15 ++++++---------
 htdocs/paybox/admin/paybox.php |  9 +++------
 htdocs/paypal/admin/paypal.php |  6 +++---
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index e84ba17eedb..dd229ba6200 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -155,7 +155,7 @@ else
 	print '<form name="ftpconfig" action="ftpclient.php" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-	print '<table class="nobordernopadding" width="100%">';
+	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td colspan="2">'.$langs->trans("NewFTPClient").'</td>';
 	print '<td>'.$langs->trans("Example").'</td>';
@@ -199,15 +199,12 @@ else
 	print '<td>'.$langs->trans("No").'</td>';
 	print '</tr>';
 	
-	?>
-	<tr><td colspan="3" align="center">
-	<input type="submit" class="button" value="<?php echo $langs->trans("Add") ?>">
+	print '</table>';
+	
+	?><br><center><input type="submit" class="button" value="<?php echo $langs->trans("Add") ?>"></center>
 	<input type="hidden" name="action" value="add">
 	<input type="hidden" name="numero_entry" value="<?php echo ($lastftpentry+1) ?>">
-	</td>
-	</tr>
 	<?php
-	print '</table>';
 	print '</form>';
 	?>
 
@@ -215,7 +212,7 @@ else
 
 	<?php
 
-	print '<table class="nobordernopadding" width="100%">'."\n";
+	print '<table class="noborder" width="100%">'."\n";
 
 	$sql ="select name, value, note from ".MAIN_DB_PREFIX."const";
 	$sql.=" WHERE name like 'FTP_SERVER_%'";
@@ -277,7 +274,7 @@ else
 
 			$var=!$var;
 			print "<tr ".$bc[$var].">";
-			print "<td width=\"100\">".$langs->trans("Passive")."</td>";
+			print "<td width=\"100\">".$langs->trans("FTPPassiveMode")."</td>";
 			print '<td>'.$form->selectyesno('FTP_PASSIVE_'.$idrss, @constant("FTP_PASSIVE_" . $idrss), 1).'</td>';
 			print "</tr>";
 
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 7fec29bc73d..20e0c2ebaee 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -102,7 +102,7 @@ print '<input type="hidden" name="action" value="setvalue">';
 
 $var=true;
 
-print '<table class="nobordernopadding" width="100%">';
+print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("AccountParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
@@ -195,10 +195,7 @@ print '<input size="32" type="email" name="PAYBOX_PAYONLINE_SENDEMAIL" value="'.
 print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com';
 print '</td></tr>';
 
-print '<tr><td colspan="2" align="center"><br><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>';
-print '</table></form>';
-
-dol_fiche_end();
+print '</table><br><center><input type="submit" class="button" value="'.$langs->trans("Modify").'"></center></form>';
 
 print '<br><br>';
 
@@ -233,6 +230,6 @@ print info_admin($langs->trans("YouCanAddTagOnUrl"));
 dol_htmloutput_mesg($mesg);
 
 $db->close();
-
+dol_fiche_end();
 llxFooter();
 ?>
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 322030e6e36..89664230492 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -116,7 +116,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
 
-print '<table class="nobordernopadding" width="100%">';
+print '<table class="noborder" width="100%">';
 
 $var=true;
 print '<tr class="liste_titre">';
@@ -230,10 +230,10 @@ print $langs->trans("SecurityTokenIsUnique").'</td><td>';
 print $form->selectyesno("PAYPAL_SECURITY_TOKEN_UNIQUE",(empty($conf->global->PAYPAL_SECURITY_TOKEN)?0:$conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE),1);
 print '</td></tr>';
 
-print '<tr><td colspan="2" align="center"><br><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>';
-
 print '</table>';
 
+print '<br><center><input type="submit" class="button" value="'.$langs->trans("Modify").'"></center>';
+
 print '</form>';
 
 dol_fiche_end();

From 8bc273298ee081d8a2d16eb020607d794aa12392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 12:38:11 +0100
Subject: [PATCH 10/18] Corrected proposals extrafield admin page translation

---
 htdocs/comm/admin/propaldet_extrafields.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index f4a5226e1f0..4b2d7dd7a80 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -37,7 +37,7 @@ if (!$user->admin)
 
 $langs->load("admin");
 $langs->load("other");
-$langs->load("orders");
+$langs->load("propal");
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
@@ -73,11 +73,10 @@ llxHeader('',$langs->trans("PropalSetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("PropalSetup"),$linkback,'setup');
-print "<br>\n";
 
 $head = propal_admin_prepare_head(null);
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("ModuleSetup"), 0, 'order');
+dol_fiche_head($head, 'attributeslines', $langs->trans("Proposals"), 0, 'propal');
 
 
 print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";

From 6419cadde1fb3f665b2915fe98a9596b2638d872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 12:46:12 +0100
Subject: [PATCH 11/18] Corrected Contract extrafield admin page

---
 htdocs/contrat/admin/contract_extrafields.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index e6fa44e5594..e5e8e9ead03 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -74,6 +74,7 @@ $head=contract_admin_prepare_head();
 
 dol_fiche_head($head, 'attributes', $langs->trans("Contracts"), 0, 'contract');
 
+$textobject = $langs->transnoentitiesnoconv('Contracts');
 
 print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
 print '<br>';

From 31afd56897fb1861e6912df7d20de701c3bb0fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 12:46:54 +0100
Subject: [PATCH 12/18] Changed supplier module configuration page

---
 htdocs/admin/supplier_invoice.php            | 2 +-
 htdocs/admin/supplier_order.php              | 2 +-
 htdocs/admin/supplierinvoice_extrafields.php | 6 +++---
 htdocs/admin/supplierorder_extrafields.php   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 5800ccc3a9b..e792c446d7c 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -200,7 +200,7 @@ print "<br>";
 
 $head = supplierorder_admin_prepare_head(null);
 
-dol_fiche_head($head, 'invoice', $langs->trans("ModuleSetup"));
+dol_fiche_head($head, 'invoice', $langs->trans("Suppliers"), 0, 'company');
 
 
 // Supplier invoice numbering module
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 07d7d731652..a98e62499b0 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -200,7 +200,7 @@ print "<br>";
 
 $head = supplierorder_admin_prepare_head(null);
 
-dol_fiche_head($head, 'order', $langs->trans("ModuleSetup"));
+dol_fiche_head($head, 'order', $langs->trans("Suppliers"), 0, 'company');
 
 
 // Supplier order numbering module
diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php
index fdf9e95af56..e8cff702467 100644
--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@@ -37,7 +37,7 @@ if (!$user->admin)
 
 $langs->load("admin");
 $langs->load("other");
-$langs->load("orders");
+$langs->load("bills");
 $langs->load("suppliers");
 
 $extrafields = new ExtraFields($db);
@@ -67,7 +67,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
-$textobject=$langs->transnoentitiesnoconv("SuppliersInvoices");
+$textobject=$langs->transnoentitiesnoconv("BillsSuppliers");
 
 llxHeader('',$langs->trans("SuppliersSetup"));
 
@@ -77,7 +77,7 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head(null);
 
-dol_fiche_head($head, 'supplierinvoice', $langs->trans("ModuleSetup"), 0, 'invoice');
+dol_fiche_head($head, 'supplierinvoice', $langs->trans("Suppliers"), 0, 'company');
 
 
 print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
index fea9656f146..0dc27149006 100644
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@@ -75,7 +75,7 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head(null);
 
-dol_fiche_head($head, 'supplierorder', $langs->trans("ModuleSetup"), 0, 'order');
+dol_fiche_head($head, 'supplierorder', $langs->trans("Suppliers"), 0, 'company');
 
 
 print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";

From 0f0228ca5a629959c7ff6e36606f7f085eae36a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 12:47:08 +0100
Subject: [PATCH 13/18] Changed order module configuration page

---
 htdocs/admin/commande.php             | 2 +-
 htdocs/admin/order_extrafields.php    | 2 +-
 htdocs/admin/orderdet_extrafields.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index e24800d18f2..6736f9d2279 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -218,7 +218,7 @@ print '<br>';
 
 $head = order_admin_prepare_head(null);
 
-dol_fiche_head($head, 'general', $langs->trans("ModuleSetup"), 0, 'order');
+dol_fiche_head($head, 'general', $langs->trans("Orders"), 0, 'order');
 
 /*
  * Orders Numbering model
diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
index 88e3705c4e7..7317d078626 100644
--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@@ -75,7 +75,7 @@ print "<br>\n";
 
 $head = order_admin_prepare_head(null);
 
-dol_fiche_head($head, 'attributes', $langs->trans("ModuleSetup"), 0, 'order');
+dol_fiche_head($head, 'attributes', $langs->trans("Orders"), 0, 'order');
 
 
 print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
index 23e6166d1a4..a78ee9ea761 100644
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@@ -76,7 +76,7 @@ print "<br>\n";
 
 $head = order_admin_prepare_head(null);
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("ModuleSetup"), 0, 'order');
+dol_fiche_head($head, 'attributeslines', $langs->trans("Orders"), 0, 'order');
 
 
 print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";

From 42622fc7c48aa8722f10aaf12dba03603a246f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 12:51:37 +0100
Subject: [PATCH 14/18] Changed agenda module configuration page

---
 htdocs/admin/agenda.php             | 2 +-
 htdocs/admin/agenda_extrafields.php | 2 +-
 htdocs/admin/agenda_extsites.php    | 2 +-
 htdocs/admin/agenda_other.php       | 2 +-
 htdocs/admin/agenda_xcal.php        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 76541401924..178d37c333e 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -137,7 +137,7 @@ print "<br>\n";
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'autoactions', $langs->trans("Agenda"));
+dol_fiche_head($head, 'autoactions', $langs->trans("Agenda"), 0, 'action');
 
 print $langs->trans("AgendaAutoActionDesc")."<br>\n";
 print $langs->trans("OnlyActiveElementsAreShown").'<br>';
diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php
index 64f793cc761..d66ebb76b9c 100644
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -74,7 +74,7 @@ print "<br>\n";
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Agenda"));
+dol_fiche_head($head, 'attributes', $langs->trans("Agenda"), 0, 'action');
 
 print $langs->trans("DefineHereComplementaryAttributes", $langs->transnoentitiesnoconv("Agenda")).'<br>'."\n";
 print '<br>';
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 4bb3cb8c4f3..9a3a95f924c 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -125,7 +125,7 @@ print '<br>';
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'extsites', $langs->trans("Agenda"));
+dol_fiche_head($head, 'extsites', $langs->trans("Agenda"), 0, 'action');
 
 print $langs->trans("AgendaExtSitesDesc")."<br>\n";
 print "<br>\n";
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 8476a1508cd..c54d571086a 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -84,7 +84,7 @@ print "<br>\n";
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'other', $langs->trans("Agenda"));
+dol_fiche_head($head, 'other', $langs->trans("Agenda"), 0, 'action');
 
 print_titre($langs->trans("OtherOptions"));
 
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 135429e15d3..8805ca381ad 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -79,7 +79,7 @@ print '<br>';
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'xcal', $langs->trans("Agenda"));
+dol_fiche_head($head, 'xcal', $langs->trans("Agenda"), 0, 'action');
 
 print $langs->trans("AgendaSetupOtherDesc")."<br>\n";
 print "<br>\n";

From 08465c0e400ab10730ebfc72609f02ced360d8b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 13:04:02 +0100
Subject: [PATCH 15/18] Adapted bookmark module admin page to 3.5 style

---
 htdocs/bookmarks/admin/bookmark.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index 56e30c15ad5..1f33f487f82 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -70,7 +70,7 @@ print '<input type="hidden" name="action" value="setvalue">';
 
 $var=true;
 
-print '<table summary="bookmarklist" class="notopnoleftnoright" width="100%">';
+print '<table summary="bookmarklist" class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
@@ -80,9 +80,7 @@ print '<tr '.$bc[$var].'><td>';
 print $langs->trans("NbOfBoomarkToShow").'</td><td>';
 print '<input size="3" type="text" name="BOOKMARKS_SHOW_IN_MENU" value="'.$conf->global->BOOKMARKS_SHOW_IN_MENU.'">';
 print '</td></tr>';
-
-print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>';
-print '</table></form>';
+print '</table><br /><center><input type="submit" class="button" value="'.$langs->trans("Modify").'"></center></form>';
 
 dol_htmloutput_mesg($mesg);
 

From b80c93d277c4bb906b2a4d5e0c83e8418c5f9c3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 13:15:14 +0100
Subject: [PATCH 16/18] Added missing info tooltip for project document models

---
 htdocs/projet/admin/project.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 7a4233754b9..0183f08af52 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -534,6 +534,7 @@ print "  <td>".$langs->trans("Description")."</td>\n";
 print '<td align="center" width="60">'.$langs->trans("Activated")."</td>\n";
 print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
 print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
 print "</tr>\n";
 
 clearstatcache();
@@ -605,9 +606,16 @@ foreach ($dirmodels as $reldir)
 							// Info
 							$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
 							$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
-							$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+							if ($module->type == 'pdf')
+							{
+								$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+							}
 							$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 							$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+							
+							print '<td align="center">';
+							print $form->textwithpicto('',$htmltooltip,1,0);
+							print '</td>';
 
 							// Preview
 							print '<td align="center">';
@@ -672,6 +680,7 @@ print "  <td>".$langs->trans("Description")."</td>\n";
 print '<td align="center" width="60">'.$langs->trans("Activated")."</td>\n";
 print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
 print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
 print "</tr>\n";
 
 clearstatcache();
@@ -743,9 +752,16 @@ foreach ($dirmodels as $reldir)
 							// Info
 							$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
 							$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
-							$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+							if ($module->type == 'pdf')
+							{
+								$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+							}
 							$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 							$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+							
+							print '<td align="center">';
+							print $form->textwithpicto('',$htmltooltip,1,0);
+							print '</td>';
 
 							// Preview
 							print '<td align="center">';

From cc95163064084712e48ede759339df75b6eb2284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 13:20:32 +0100
Subject: [PATCH 17/18] Added missing preview column for donations module

---
 htdocs/admin/dons.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php
index c350cea531b..c6e42a0f12d 100644
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.php
@@ -155,6 +155,7 @@ print '<td>'.$langs->trans("Description").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
 print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
 print "</tr>\n";
 
 clearstatcache();
@@ -233,10 +234,14 @@ if (is_resource($handle))
                 $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
                 $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
                 $htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
-                $text='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'" target="specimen">'.img_object($langs->trans("Preview"),'generic').'</a>';
                 print '<td align="center">';
-                print $form->textwithpicto(' &nbsp; '.$text,$htmltooltip,-1,0);
+                print $form->textwithpicto('',$htmltooltip,-1,0);
                 print '</td>';
+				
+				// Preview
+				print '<td align="center">';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'" target="specimen">'.img_object($langs->trans("Preview"),'generic').'</a>';
+				print '</td>';
 
                 print "</tr>\n";
             }

From 735d30a7d3ce635713150425a83ed41027f75a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 11 Mar 2014 13:20:52 +0100
Subject: [PATCH 18/18] Corrected features supported tooltip style in livraison
 tab

---
 htdocs/admin/livraison.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 56602508777..750bc5ebbb4 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -412,7 +412,7 @@ foreach ($dirmodels as $reldir)
                     // Info
                     $htmltooltip =    ''.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
                     $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-                    $htmltooltip.='<br><br>'.$langs->trans("FeaturesSupported").':';
+                    $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").'</u>:';
                     $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
                     print '<td align="center">';
                     print $form->textwithpicto('',$htmltooltip,1,0);