lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge menu "System info" with "System tools"

Browse Source
This commit is contained in:
Laurent Destailleur 2012-09-08 00:52:44 +02:00
parent 0dfc9e59fe
commit 265ef489a6
4 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/admin/system/database.php
View File

@ -55,6 +55,13 @@ print '<tr '.$bc[1].'><td width="300">'.$langs->trans("DBStoringCharset").'</td>
print '<tr '.$bc[0].'><td width="300">'.$langs->trans("DBSortingCharset").'</td><td>'.$db->getDefaultCollationDatabase().'</td></tr>'."\n"; print '<tr '.$bc[0].'><td width="300">'.$langs->trans("DBSortingCharset").'</td><td>'.$db->getDefaultCollationDatabase().'</td></tr>'."\n";
print '</table>'; print '</table>';
// Tables
print '<br>';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Tables").'</td></tr>'."\n";
print '<tr '.$bc[0].'><td width="300"><a href="'.DOL_URL_ROOT.'/admin/system/database-tables.php?mainmenu=home">'.$langs->trans("List").'</a></td></tr>'."\n";
print '</table>';
$base=0; $base=0;
$sqls = array(); $sqls = array();
@ -86,7 +93,7 @@ else
print '<br>'; print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td width="300">'.$langs->trans("Parameter").'</td>'; print '<td width="300">'.$langs->trans("Parameters").'</td>';
print '<td>'.$langs->trans("Value").'</td>'; print '<td>'.$langs->trans("Value").'</td>';
print '</tr>'."\n"; print '</tr>'."\n";

31
htdocs/core/menus/standard/eldy.lib.php
View File

@ -685,26 +685,20 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
$newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1); $newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1);
} }
// System info // System tools
$newmenu->add("/admin/system/index.php?mainmenu=home&leftmenu=system", $langs->trans("SystemInfo"), 0, 1, '', $mainmenu, 'system');
if ($leftmenu == 'system')
{
$newmenu->add('/admin/system/dolibarr.php?mainmenu=home', $langs->trans('Dolibarr'), 1);
$newmenu->add('/admin/system/constall.php?mainmenu=home', $langs->trans('AllParameters'), 2);
$newmenu->add('/admin/system/modules.php?mainmenu=home', $langs->trans('Modules'), 2);
$newmenu->add('/admin/triggers.php?mainmenu=home', $langs->trans('Triggers'), 2);
$newmenu->add('/admin/system/about.php?mainmenu=home', $langs->trans('About'), 2);
$newmenu->add('/admin/system/os.php?mainmenu=home', $langs->trans('OS'), 1);
$newmenu->add('/admin/system/web.php?mainmenu=home', $langs->trans('WebServer'), 1);
$newmenu->add('/admin/system/phpinfo.php?mainmenu=home', $langs->trans('PHP'), 1);
//if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1);
$newmenu->add('/admin/system/database.php?mainmenu=home', $langs->trans('Database'), 1);
$newmenu->add('/admin/system/database-tables.php?mainmenu=home', $langs->trans('Tables'), 2);
}
// Admin tools
$newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("SystemTools"), 0, 1, '', $mainmenu, 'admintools'); $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("SystemTools"), 0, 1, '', $mainmenu, 'admintools');
if ($leftmenu=="admintools") if ($leftmenu=="admintools")
{ {
$newmenu->add('/admin/system/dolibarr.php?mainmenu=home', $langs->trans('InfoDolibarr'), 1);
$newmenu->add('/admin/system/constall.php?mainmenu=home', $langs->trans('AllParameters'), 2);
$newmenu->add('/admin/system/modules.php?mainmenu=home', $langs->trans('Modules'), 2);
$newmenu->add('/admin/triggers.php?mainmenu=home', $langs->trans('Triggers'), 2);
$newmenu->add('/admin/system/os.php?mainmenu=home', $langs->trans('InfoOS'), 1);
$newmenu->add('/admin/system/web.php?mainmenu=home', $langs->trans('InfoWebServer'), 1);
$newmenu->add('/admin/system/phpinfo.php?mainmenu=home', $langs->trans('InfoPHP'), 1);
//if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1);
$newmenu->add('/admin/system/database.php?mainmenu=home', $langs->trans('InfoDatabase'), 1);
$newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home", $langs->trans("Backup"),1); $newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home", $langs->trans("Backup"),1);
$newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home", $langs->trans("Restore"),1); $newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home", $langs->trans("Restore"),1);
$newmenu->add("/admin/tools/update.php?mainmenu=home", $langs->trans("MenuUpgrade"),1); $newmenu->add("/admin/tools/update.php?mainmenu=home", $langs->trans("MenuUpgrade"),1);
@ -713,9 +707,10 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
$newmenu->add("/admin/tools/listsessions.php?mainmenu=home", $langs->trans("Sessions"),1); $newmenu->add("/admin/tools/listsessions.php?mainmenu=home", $langs->trans("Sessions"),1);
$newmenu->add("/admin/tools/purge.php?mainmenu=home", $langs->trans("Purge"),1); $newmenu->add("/admin/tools/purge.php?mainmenu=home", $langs->trans("Purge"),1);
$newmenu->add("/support/index.php?mainmenu=home", $langs->trans("HelpCenter"),1,1,'targethelp'); $newmenu->add("/support/index.php?mainmenu=home", $langs->trans("HelpCenter"),1,1,'targethelp');
$newmenu->add('/admin/system/about.php?mainmenu=home', $langs->trans('About'), 1);
} }
// Modules system tools // Modules system tools
if (($conf->global->MAIN_FEATURES_LEVEL >= 1) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
{ {
$langs->load("products"); $langs->load("products");
$newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, 1, '', $mainmenu, 'modulesadmintools'); $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, 1, '', $mainmenu, 'modulesadmintools');

5
htdocs/langs/en_US/admin.lang
View File

@ -814,6 +814,11 @@ SetupDescription5=Other menu entries manage optional parameters.
EventsSetup=Setup for events logs EventsSetup=Setup for events logs
LogEvents=Security audit events LogEvents=Security audit events
Audit=Audit Audit=Audit
InfoDolibarr=Infos Dolibarr
InfoOS=Infos OS
InfoWebServer=Infos web server
InfoDatabase=Infos database
InfoPHP=Infos PHP
ListEvents=Audit events ListEvents=Audit events
ListOfSecurityEvents=List of Dolibarr security events ListOfSecurityEvents=List of Dolibarr security events
SecurityEventsPurged=Security events purged SecurityEventsPurged=Security events purged

5
htdocs/langs/fr_FR/admin.lang
View File

@ -823,6 +823,11 @@ SetupDescription5= Les autres entrées de configuration gèrent des paramètres
EventsSetup= Configuration du traçage des événements EventsSetup= Configuration du traçage des événements
LogEvents= Événements d'audit de sécurité LogEvents= Événements d'audit de sécurité
Audit= Audit Audit= Audit
InfoDolibarr=Infos Dolibarr
InfoOS=Infos OS
InfoWebServer=Infos web server
InfoDatabase=Infos base de donnée
InfoPHP=Infos PHP
ListEvents= Audit événements ListEvents= Audit événements
ListOfSecurityEvents= Liste des événements de sécurité Dolibarr ListOfSecurityEvents= Liste des événements de sécurité Dolibarr
SecurityEventsPurged=Evenement de sécurité purgés SecurityEventsPurged=Evenement de sécurité purgés