Merge pull request #1466 from marcosgdf/minor

Minor style and translation corrections

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);

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>';

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>';

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>';

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";

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"));
 

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";

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">';

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

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

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

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>';
@@ -167,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();
@@ -245,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";
             }

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>';

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);

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">';

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";

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";

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'].'">';
 

htdocs/admin/stock.php

@@ -101,17 +101,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;

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