Merge pull request #765 from grandoc/develop

display enhancement and normalize

htdocs/admin/bank.php

@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2009 		Laurent Destailleur            <eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012  Juanjo Menent			       <jmenent@2byte.es>
+ * Copyright (C) 2013       Philippe Grand                 <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,12 +19,12 @@
 
 
 /**
- *      \file       htdocs/compta/bank/admin/bank.php
+ *      \file       htdocs/admin/bank.php
  *		\ingroup    bank
  *		\brief      Page to setup the bank module
  */
 
-require '../../../main.inc.php';
+require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
@@ -87,6 +88,16 @@ $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("Miscellanous");
+$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("Parameters").'</td>';

htdocs/admin/ecm.php

@@ -70,6 +70,17 @@ llxHeader('',$langs->trans("ECMSetup"),$help_url);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 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("Miscellanous");
+$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/mailing.php

@@ -103,6 +103,16 @@ 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("Miscellanous");
+$head[$h][2] = 'general';
+$hselected=$h;
+$h++;
+
+dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
+
 dol_htmloutput_mesg($mesg);
 
 

htdocs/admin/stock.php

@@ -3,6 +3,7 @@
  * Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012      Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2013      Philippe Grand       <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -97,6 +98,16 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 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("Miscellanous");
+$head[$h][2] = 'general';
+$hselected=$h;
+$h++;
+
+dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
+
 $form=new Form($db);
 $var=true;
 print '<table class="noborder" width="100%">';
@@ -124,9 +135,12 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
 print '</form>';
 print "</td>\n";
 print "</tr>\n";
-
+print '<br>';
+print '</table>';
+print '<br>';
 
 // Title rule for stock decrease
+print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print "  <td>".$langs->trans("RuleForStockManagementDecrease")."</td>\n";
 print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
@@ -174,9 +188,11 @@ if (! empty($conf->expedition->enabled))
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 	print "</form>\n</td>\n</tr>\n";
 }
-
+print '</table>';
+print '<br>';
 
 // Title rule for stock increase
+print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print "  <td>".$langs->trans("RuleForStockManagementIncrease")."</td>\n";
 print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";

htdocs/admin/taxes.php

@@ -121,6 +121,17 @@ $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("Miscellanous");
+$head[$h][2] = 'general';
+$hselected=$h;
+$h++;
+
+dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
 
 
 print '<br>';

htdocs/core/modules/modBanque.class.php

@@ -65,7 +65,7 @@ class modBanque extends DolibarrModules
 
         // Config pages
         //-------------
-        $this->config_page_url = array("bank.php@compta/bank");
+        $this->config_page_url = array("bank.php");
 
 		// Dependancies
 		$this->depends = array();