maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

re-arrange menu-entries to be better categorized

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-02-27 20:03:26 +01:00
parent b67749bcdc
commit aa592c7369
3 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
lib/navigation/00.froxlor.main.php
View File

@@ -193,6 +193,11 @@ return array (
'label' => $lng['admin']['ipsandports']['ipsandports'], 'label' => $lng['admin']['ipsandports']['ipsandports'],
'required_resources' => 'change_serversettings', 'required_resources' => 'change_serversettings',
), ),
array (
'url' => 'admin_settings.php?page=updatecounters',
'label' => $lng['admin']['updatecounters'],
'required_resources' => 'change_serversettings',
),
), ),
), ),
'traffic' => array ( 'traffic' => array (
@@ -236,24 +241,6 @@ return array (
'label' => $lng['admin']['rebuildconf'], 'label' => $lng['admin']['rebuildconf'],
'required_resources' => 'change_serversettings', 'required_resources' => 'change_serversettings',
), ),
array (
'url' => 'admin_settings.php?page=updatecounters',
'label' => $lng['admin']['updatecounters'],
'required_resources' => 'change_serversettings',
),
array (
'url' => 'admin_settings.php?page=integritycheck',
'label' => $lng['admin']['integritycheck'],
'required_resources' => 'change_serversettings',
),
array (
'url' => 'admin_vhostsettings.php?page=overview',
'label' => $lng['menue']['vhostsettings']['maintitle'],
'show_element' => (
Settings::Get('system.mod_fcgid') == true ||
Settings::Get('phpfpm.enabled') == true
),
),
array ( array (
'url' => 'admin_autoupdate.php?page=overview', 'url' => 'admin_autoupdate.php?page=overview',
'label' => $lng['admin']['autoupdate'], 'label' => $lng['admin']['autoupdate'],
@@ -261,6 +248,24 @@ return array (
), ),
), ),
), ),
'templates' => array (
'label' => $lng['admin']['server_templates'],
'elements' => array (
array (
'url' => 'admin_vhostsettings.php?page=overview',
'label' => $lng['menue']['vhostsettings']['maintitle'],
'show_element' => (
Settings::Get('system.mod_fcgid') == true ||
Settings::Get('phpfpm.enabled') == true
),
'required_resources' => 'change_serversettings'
),
array (
'url' => 'admin_templates.php?page=email',
'label' => $lng['admin']['templates']['email'],
),
)
),
'server_php' => array ( 'server_php' => array (
'label' => $lng['admin']['server_php'], 'label' => $lng['admin']['server_php'],
'required_resources' => 'change_serversettings', 'required_resources' => 'change_serversettings',
@@ -299,10 +304,11 @@ return array (
'misc' => array ( 'misc' => array (
'label' => $lng['admin']['misc'], 'label' => $lng['admin']['misc'],
'elements' => array ( 'elements' => array (
array ( array (
'url' => 'admin_templates.php?page=email', 'url' => 'admin_settings.php?page=integritycheck',
'label' => $lng['admin']['templates']['email'], 'label' => $lng['admin']['integritycheck'],
), 'required_resources' => 'change_serversettings',
),
array ( array (
'url' => 'admin_message.php?page=message', 'url' => 'admin_message.php?page=message',
'label' => $lng['admin']['message'], 'label' => $lng['admin']['message'],

4
lng/english.lng.php
View File

@@ -1986,4 +1986,6 @@ $lng['admin']['vhostconfig']['port'] = 'Will be replaced with the port number of
$lng['admin']['vhostconfig']['scheme'] = 'Will be set to <strong>http</strong> or <strong>https</strong> in case SSL / TLS is activated for the Vhost.'; $lng['admin']['vhostconfig']['scheme'] = 'Will be set to <strong>http</strong> or <strong>https</strong> in case SSL / TLS is activated for the Vhost.';
$lng['admin']['vhostconfig']['vhost_usedefaultlocation']['title'] = 'Use the standard Vhost location directives'; $lng['admin']['vhostconfig']['vhost_usedefaultlocation']['title'] = 'Use the standard Vhost location directives';
$lng['admin']['vhostconfig']['vhost_usedefaultlocation']['desc'] = 'If deactivated, the standard Vhost location directives, such as <br>location / { ... }<br> location @rewrites { ... }<br> location ~ ^(.+?\.php)(/.*)?$ { ... }<br> are excluded from the Vhost configuration file.'; $lng['admin']['vhostconfig']['vhost_usedefaultlocation']['desc'] = 'If deactivated, the standard Vhost location directives, such as <br>location / { ... }<br> location @rewrites { ... }<br> location ~ ^(.+?\.php)(/.*)?$ { ... }<br> are excluded from the Vhost configuration file.';
$lng['question']['vhostsetting_reallydelete'] = 'Do you really want to delete the Vhost template?'; $lng['question']['vhostsetting_reallydelete'] = 'Do you really want to delete the Vhost template?';
$lng['admin']['server_templates'] = 'Templates';

4
lng/german.lng.php
View File

@@ -1626,4 +1626,6 @@ $lng['admin']['vhostconfig']['port'] = 'Wird mit dem Port des Vhosts ersetzt.';
$lng['admin']['vhostconfig']['scheme'] = 'Wird mit <strong>http</strong> bzw. mit <strong>https</strong> ersetzt, sofern der Vhost SSL/TLS aktiviert hat.'; $lng['admin']['vhostconfig']['scheme'] = 'Wird mit <strong>http</strong> bzw. mit <strong>https</strong> ersetzt, sofern der Vhost SSL/TLS aktiviert hat.';
$lng['admin']['vhostconfig']['vhost_usedefaultlocation']['title'] = 'Standard VHost location-Direktiven verwenden'; $lng['admin']['vhostconfig']['vhost_usedefaultlocation']['title'] = 'Standard VHost location-Direktiven verwenden';
$lng['admin']['vhostconfig']['vhost_usedefaultlocation']['desc'] = 'Wenn deaktiviert, werden Standard VHost-Direktiven wie <br>location / { ... }<br> location @rewrites { ... }<br> location ~ ^(.+?\.php)(/.*)?$ { ... }<br> nicht in die Konfigurationsdatei geschrieben.'; $lng['admin']['vhostconfig']['vhost_usedefaultlocation']['desc'] = 'Wenn deaktiviert, werden Standard VHost-Direktiven wie <br>location / { ... }<br> location @rewrites { ... }<br> location ~ ^(.+?\.php)(/.*)?$ { ... }<br> nicht in die Konfigurationsdatei geschrieben.';
$lng['question']['vhostsetting_reallydelete'] = 'Wollen Sie diese VHost-Vorlage wirklich löschen?'; $lng['question']['vhostsetting_reallydelete'] = 'Wollen Sie diese VHost-Vorlage wirklich löschen?';
$lng['admin']['server_templates'] = 'Vorlagen';