From d5bb208957af1986817def4084529287e9acd184 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2017 02:19:50 +0100
Subject: [PATCH] Clean admin menu entries
---
htdocs/admin/system/about.php | 46 +++------------------
htdocs/admin/system/dolibarr.php | 55 +++++++++++++++++++++----
htdocs/admin/tools/index.php | 4 +-
htdocs/core/menus/init_menu_auguria.sql | 3 +-
htdocs/core/menus/standard/eldy.lib.php | 6 +--
htdocs/langs/en_US/admin.lang | 4 +-
htdocs/support/index.php | 20 ++++-----
7 files changed, 70 insertions(+), 68 deletions(-)
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index e9e2e0f1749..bb6e2372b47 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -63,7 +63,7 @@ if ($action == 'getlastversion')
llxHeader();
-print load_fiche_titre("Dolibarr",'','title_setup');
+print load_fiche_titre($langs->trans("ExternalResources"),'','title_setup');
print '<div style="padding-left: 30px;">'.img_picto_common('', 'dolibarr_box.png','height="120"').'</div>';
@@ -71,45 +71,6 @@ print '<div style="padding-left: 30px;">'.img_picto_common('', 'dolibarr_box.png
print '<div class="fichecenter"><div class="fichehalfleft">';
-print $langs->trans("CurrentVersion").' : <strong>'.DOL_VERSION.'</strong><br>';
-
-if (function_exists('curl_init'))
-{
- $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
-
- if ($action == 'getlastversion')
- {
- if ($sfurl)
- {
- while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
- {
- $title=$sfurl->channel[0]->item[$i]->title;
- if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
- {
- $newversion=$reg[1];
- $newversionarray=explode('.',$newversion);
- $versionarray=explode('.',$version);
- //var_dump($newversionarray);var_dump($versionarray);
- if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion;
- }
- $i++;
- }
-
- // Show version
- print $langs->trans("LastStableVersion").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b><br>';
- }
- else
- {
- print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
- }
- }
- else
- {
- print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a><br>';
- }
-}
-print '<br>';
-
print $langs->trans("DolibarrLicense").' : ';
print '<ul><li>';
print '<a href="http://www.gnu.org/copyleft/gpl.html">GNU-GPL v3+</a></li>';
@@ -201,6 +162,11 @@ $url='https://wiki.dolibarr.org/index.php/Subscribe';
if (preg_match('/^fr_/i',$langs->getDefaultLang())) $url='https://wiki.dolibarr.org/index.php/Adh%C3%A9rer';
if (preg_match('/^es_/i',$langs->getDefaultLang())) $url='https://wiki.dolibarr.org/index.php/Subscribirse';
print '<li><a href="'.$url.'" target="_blank" rel="external">'.$langs->trans("SubscribeToFoundation").'</a></li>';
+print '</ul>';
+
+print $langs->trans("SocialNetworks").':';
+
+print '<ul>';
print '<li><a href="https://facebook.com/dolibarr" target="_blank" rel="external">FaceBook</a></li>';
print '<li><a href="https://twitter.com/dolibarr" target="_blank" rel="external">Twitter</a></li>';
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index d7bd421770c..baabd8f630d 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -52,23 +52,60 @@ print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastUpgrade").'</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionProgram").'</td><td>'.DOL_VERSION;
+print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')</td><td>'.DOL_VERSION;
// If current version differs from last upgrade
if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
{
- // Compare version with last install database version (upgrades never occured)
- if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_INSTALL));
+ // Compare version with last install database version (upgrades never occured)
+ if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_INSTALL));
}
else
{
- // Compare version with last upgrade database version
- if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE));
+ // Compare version with last upgrade database version
+ if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE));
+}
+
+if (function_exists('curl_init'))
+{
+ $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
+ print ' - ';
+ if ($action == 'getlastversion')
+ {
+ if ($sfurl)
+ {
+ while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
+ {
+ $title=$sfurl->channel[0]->item[$i]->title;
+ if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
+ {
+ $newversion=$reg[1];
+ $newversionarray=explode('.',$newversion);
+ $versionarray=explode('.',$version);
+ //var_dump($newversionarray);var_dump($versionarray);
+ if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion;
+ }
+ $i++;
+ }
+
+ // Show version
+ print $langs->trans("LastStableVersion").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b><br>';
+ }
+ else
+ {
+ print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
+ }
+ }
+ else
+ {
+ print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a><br>';
+ }
}
+
print '</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
print '</table>';
print '</div>';
print '<br>';
diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php
index 8da041d05da..6f773c5b35e 100644
--- a/htdocs/admin/tools/index.php
+++ b/htdocs/admin/tools/index.php
@@ -37,8 +37,8 @@ if (! $user->admin)
$form = new Form($db);
-$title=$langs->trans("SystemToolsArea");
-if (GETPOST('leftmenu') == 'admintools') $title=$langs->trans("ModulesSystemTools");
+$title=$langs->trans("AdminTools");
+//if (GETPOST('leftmenu') == 'admintools') $title=$langs->trans("ModulesSystemTools");
llxHeader('', $title);
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 61fc86f72f7..e52583c48f0 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -57,8 +57,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 307__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listevents.php?leftmenu=admintools', 'Audit', 1, 'admin', '', '', 2, 10, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 308__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listsessions.php?leftmenu=admintools', 'Sessions', 1, 'admin', '', '', 2, 11, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 309__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/purge.php?leftmenu=admintools', 'Purge', 1, 'admin', '', '', 2, 12, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 310__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/support/index.php?leftmenu=admintools', 'HelpCenter', 1, 'help', '', '_blank', 2, 13, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 311__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/about.php?leftmenu=admintools', 'About', 1, 'admin', '', '', 2, 14, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 311__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/about.php?leftmenu=admintools', 'ExternalResources', 1, 'admin', '', '', 2, 14, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 320__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/product/admin/product_tools.php?mainmenu=home&leftmenu=admintools', 'ProductVatMassChange', 1, 'products', '', '', 2, 0, __ENTITY__);
-- Home - Menu users and groups
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 47432c979c5..228c6447a22 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -565,21 +565,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$newmenu->add('/admin/system/database.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoDatabase'), 1);
if (function_exists('eaccelerator_info')) $newmenu->add("/admin/tools/eaccelerator.php?mainmenu=home&leftmenu=admintools", $langs->trans("EAccelerator"),1);
//$newmenu->add("/admin/system/perf.php?mainmenu=home&leftmenu=admintools", $langs->trans("InfoPerf"),1);
- $newmenu->add("/admin/tools/purge.php?mainmenu=home&leftmenu=admintools", $langs->trans("Purge"),1);
$newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&leftmenu=admintools", $langs->trans("Backup"),1);
$newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&leftmenu=admintools", $langs->trans("Restore"),1);
$newmenu->add("/admin/tools/update.php?mainmenu=home&leftmenu=admintools", $langs->trans("MenuUpgrade"),1);
+ $newmenu->add("/admin/tools/purge.php?mainmenu=home&leftmenu=admintools", $langs->trans("Purge"),1);
$newmenu->add("/admin/tools/listevents.php?mainmenu=home&leftmenu=admintools", $langs->trans("Audit"),1);
$newmenu->add("/admin/tools/listsessions.php?mainmenu=home&leftmenu=admintools", $langs->trans("Sessions"),1);
- $newmenu->add('/admin/system/about.php?mainmenu=home&leftmenu=admintools', $langs->trans('About'), 1);
+ $newmenu->add('/admin/system/about.php?mainmenu=home&leftmenu=admintools', $langs->trans('ExternalResources'), 1);
if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
{
$langs->load("products");
$newmenu->add("/product/admin/product_tools.php?mainmenu=home&leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
}
-
- $newmenu->add("/support/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("HelpCenter"),1,1,'targethelp');
}
$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users');
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index aeb6e22dce2..4776dffc835 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -224,7 +224,9 @@ OfficialDemo=Dolibarr online demo
OfficialMarketPlace=Official market place for external modules/addons
OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
diff --git a/htdocs/support/index.php b/htdocs/support/index.php
index a895cf5cb1e..0e27107ef54 100644
--- a/htdocs/support/index.php
+++ b/htdocs/support/index.php
@@ -44,7 +44,7 @@ $langs->load("help");
pHeader($langs->trans("DolibarrHelpCenter"), $_SERVER["PHP_SELF"]);
-print $langs->trans("HelpCenterDesc1")."<br>\n";
+print '<br>'.$langs->trans("HelpCenterDesc1")."<br>\n";
print $langs->trans("HelpCenterDesc2")."<br>\n";
print '<br>';
@@ -62,13 +62,13 @@ $style1='color: #333344; font-size: 16px; font-weight: bold';
$style2='color: #5D4455; font-weight: bold;';
print "\n";
-print '<div style="width: 100%"><div class="inline-block">';
+print '<div style="width: 100%; text-align: center"><div class="inline-block">';
print "\n";
// Forum/wiki support
print '<table class="login tablesupport" width="100%">';
print '<tr class="title" valign="top">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
print '<table summary="who"><tr><td>'.img_picto('','who.png','',1).'</td><td>';
@@ -82,7 +82,7 @@ print '</td>';
print '</tr>';
print '<tr>';
-print '<td align="center" valign="top">';
+print '<td align="center" valign="middle">';
print '<table class="nocellnopadd">';
print '<tr><td align="center">';
@@ -112,7 +112,7 @@ print '</div><div class="inline-block">';
// Official support
print '<table class="login" width="100%">';
print '<tr class="title">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
print '<table summary="community"><tr><td>'.img_picto('','internet.png','',1).'</td><td>';
print '<font style="'.$style1.'">'.$langs->trans("OfficialSupport").'</font>';
@@ -124,7 +124,7 @@ print '</td></tr></table>';
print '</td>';
print '</tr><tr>';
-print '<td align="center" valign="top">';
+print '<td align="center" valign="middle">';
print '<table class="nocellnopadd">';
print '<tr><td align="center">';
@@ -148,7 +148,7 @@ print '</div><div class="inline-block">';
// Online support
print '<table class="login" width="100%">';
print '<tr class="title">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
print '<table summary="community"><tr><td>'.img_picto('','internet.png','',1).'</td><td>';
@@ -161,7 +161,7 @@ print '</td></tr></table>';
print '</td>';
print '</tr><tr>';
-print '<td align="center" valign="top">';
+print '<td align="center" valign="middle">';
print '<table class="nocellnopadd">';
print '<tr><td align="center">';
print '<br>'.$langs->trans("ToSeeListOfAvailableRessources").'<br>';
@@ -181,7 +181,7 @@ print '</div><div class="inline-block">';
// EMail support
print '<table class="login tablesupport" width="100%">';
print '<tr class="title" valign="top">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
print '<table summary="mail"><tr><td>'.img_picto('','mail.png','',1).'</td><td>';
@@ -214,7 +214,7 @@ print '</div><div class="inline-block">';
// Other support
print '<table class="login tablesupport" width="100%">';
print '<tr class="title">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
print '<table summary="special"><tr><td>'.img_picto('','pagemaster.png','',1).'</td><td>';
--
GitLab