From 9c67fba5f44197070a17e5e02da0be4b3c6211fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 8 Jul 2005 19:55:37 +0000
Subject: [PATCH] =?UTF-8?q?S=E9paration=20boite=20A=20propos=20de=20page?=
 =?UTF-8?q?=20Info=20syst=E8me=20Dolibarr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/about.php                          | 14 +-----------
 htdocs/admin/system/index.php             |  1 -
 htdocs/admin/system/pre.inc.php           | 28 +++++++++++------------
 htdocs/includes/menus/barre_left/eldy.php |  3 ++-
 4 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/htdocs/about.php b/htdocs/about.php
index ac684fcd1c0..b7789554343 100644
--- a/htdocs/about.php
+++ b/htdocs/about.php
@@ -38,19 +38,7 @@ print_titre("Dolibarr");
 
 print "<br>\n";
 
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
-print "\n";
-
-print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".DOL_VERSION."</td></tr>\n";
-print "<tr $bc[1]><td width=\"240\">".$langs->trans("Language")." (LC_ALL)</td><td>".setlocale(LC_ALL,0)."</td></tr>\n";
-
-print '</table>';
-print '<br>';
-
-print '<p>';
 print $langs->trans("Dolibarr est publié sous licence GNU/GPL");
-print '</p>';
 
 print '<p>';
 print $langs->trans("Dolibarr est développé par :");
@@ -105,7 +93,7 @@ print '</ul>';
 //}
 
 
-llxFooter();
+llxFooter('$Date$ - $Revision$');
 
 ?>
 
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index 4fc4f970d26..4e42fcfd1cc 100644
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -45,7 +45,6 @@ print "<br>\n";
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\"><td colspan=\"2\">Dolibarr</td></tr>\n";
 print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>" . DOL_VERSION . "</td></tr>\n";
-print "<tr $bc[1]><td width=\"240\">".$langs->trans("Language")." (LC_ALL)</td><td>".setlocale(LC_ALL,0)."</td></tr>\n";
 print '</table>';
 
 print "<br>\n";
diff --git a/htdocs/admin/system/pre.inc.php b/htdocs/admin/system/pre.inc.php
index ebefeec36b9..ed5f8e6c4b9 100644
--- a/htdocs/admin/system/pre.inc.php
+++ b/htdocs/admin/system/pre.inc.php
@@ -42,29 +42,27 @@ function llxHeader($head = "", $urlp = "") {
     
     $menu = new Menu();
     
-    $menu->add("index.php", $langs->trans("Summary"));
+    $menu->add(DOL_URL_ROOT."/admin/system/index.php", $langs->trans("Summary"));
     
-    $menu->add(DOL_URL_ROOT."/about.php", "Dolibarr");
-    $menu->add_submenu("constall.php", $langs->trans("AllParameters"));
+    $menu->add(DOL_URL_ROOT."/admin/system/dolibarr.php", "Dolibarr");
+    $menu->add_submenu(DOL_URL_ROOT."/admin/system/constall.php", $langs->trans("AllParameters"));
+    $menu->add_submenu(DOL_URL_ROOT."/about.php", $langs->trans("About"));
     
-    $menu->add("os.php", $langs->trans("OS"));
+    $menu->add(DOL_URL_ROOT."/admin/system/os.php", $langs->trans("OS"));
     
-    $menu->add("web.php", $langs->trans("WebServer"));
+    $menu->add(DOL_URL_ROOT."/admin/system/web.php", $langs->trans("WebServer"));
     
-    $menu->add("phpinfo.php", $langs->trans("Php"));
+    $menu->add(DOL_URL_ROOT."/admin/system/phpinfo.php", $langs->trans("Php"));
     
-    $menu->add_submenu("phpinfo.php?what=conf", $langs->trans("PhpConf"));
+    $menu->add_submenu(DOL_URL_ROOT."/admin/system/phpinfo.php?what=conf", $langs->trans("PhpConf"));
     
-    $menu->add_submenu("phpinfo.php?what=env", $langs->trans("PhpEnv"));
+    $menu->add_submenu(DOL_URL_ROOT."/admin/system/phpinfo.php?what=env", $langs->trans("PhpEnv"));
     
-    $menu->add_submenu("phpinfo.php?what=modules", $langs->trans("PhpModules"));
+    $menu->add_submenu(DOL_URL_ROOT."/admin/system/phpinfo.php?what=modules", $langs->trans("PhpModules"));
     
-    //    $menu->add("pear.php", $langs->trans("Pear"));
-    //    $menu->add_submenu("pear_packages.php", $langs->trans("PearPackages"));
-    
-    $menu->add("database.php", $langs->trans("Database"));
-    $menu->add_submenu("database-tables.php", $langs->trans("Tables"));
-    $menu->add_submenu("database-tables-contraintes.php", $langs->trans("Constraints"));
+    $menu->add(DOL_URL_ROOT."/admin/system/database.php", $langs->trans("Database"));
+    $menu->add_submenu(DOL_URL_ROOT."/admin/system/database-tables.php", $langs->trans("Tables"));
+    $menu->add_submenu(DOL_URL_ROOT."/admin/system/database-tables-contraintes.php", $langs->trans("Constraints"));
     
     left_menu($menu->liste);
 }
diff --git a/htdocs/includes/menus/barre_left/eldy.php b/htdocs/includes/menus/barre_left/eldy.php
index 342f40afc89..d5cd5b36bcf 100644
--- a/htdocs/includes/menus/barre_left/eldy.php
+++ b/htdocs/includes/menus/barre_left/eldy.php
@@ -130,8 +130,9 @@ class MenuLeft {
                   if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup"));
                   
                   $newmenu->add(DOL_URL_ROOT."/admin/system/index.php?leftmenu=system", $langs->trans("System"));
-                  if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/about.php", "Dolibarr");
+                  if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/dolibarr.php", $langs->trans("Dolibarr"),1);
                   if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/constall.php", $langs->trans("AllParameters"),2);
+                  if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/about.php", $langs->trans("About"),2);
                   if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/os.php", $langs->trans("OS"));
                   if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/web.php", $langs->trans("WebServer"));
                   if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/phpinfo.php", $langs->trans("Php"));