diff --git a/lib/navigation/00.froxlor.main.php b/lib/navigation/00.froxlor.main.php index eefb5d80..53b2f982 100644 --- a/lib/navigation/00.froxlor.main.php +++ b/lib/navigation/00.froxlor.main.php @@ -193,6 +193,11 @@ return array ( 'label' => $lng['admin']['ipsandports']['ipsandports'], 'required_resources' => 'change_serversettings', ), + array ( + 'url' => 'admin_settings.php?page=updatecounters', + 'label' => $lng['admin']['updatecounters'], + 'required_resources' => 'change_serversettings', + ), ), ), 'traffic' => array ( @@ -236,24 +241,6 @@ return array ( 'label' => $lng['admin']['rebuildconf'], '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 ( 'url' => 'admin_autoupdate.php?page=overview', '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 ( 'label' => $lng['admin']['server_php'], 'required_resources' => 'change_serversettings', @@ -299,10 +304,11 @@ return array ( 'misc' => array ( 'label' => $lng['admin']['misc'], 'elements' => array ( - array ( - 'url' => 'admin_templates.php?page=email', - 'label' => $lng['admin']['templates']['email'], - ), + array ( + 'url' => 'admin_settings.php?page=integritycheck', + 'label' => $lng['admin']['integritycheck'], + 'required_resources' => 'change_serversettings', + ), array ( 'url' => 'admin_message.php?page=message', 'label' => $lng['admin']['message'], diff --git a/lng/english.lng.php b/lng/english.lng.php index 796036e5..39e4f2d8 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1986,4 +1986,6 @@ $lng['admin']['vhostconfig']['port'] = 'Will be replaced with the port number of $lng['admin']['vhostconfig']['scheme'] = 'Will be set to http or https 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']['desc'] = 'If deactivated, the standard Vhost location directives, such as
location / { ... }
location @rewrites { ... }
location ~ ^(.+?\.php)(/.*)?$ { ... }
are excluded from the Vhost configuration file.'; -$lng['question']['vhostsetting_reallydelete'] = 'Do you really want to delete the Vhost template?'; \ No newline at end of file +$lng['question']['vhostsetting_reallydelete'] = 'Do you really want to delete the Vhost template?'; + +$lng['admin']['server_templates'] = 'Templates'; diff --git a/lng/german.lng.php b/lng/german.lng.php index c9f06357..c460eafb 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1626,4 +1626,6 @@ $lng['admin']['vhostconfig']['port'] = 'Wird mit dem Port des Vhosts ersetzt.'; $lng['admin']['vhostconfig']['scheme'] = 'Wird mit http bzw. mit https ersetzt, sofern der Vhost SSL/TLS aktiviert hat.'; $lng['admin']['vhostconfig']['vhost_usedefaultlocation']['title'] = 'Standard VHost location-Direktiven verwenden'; $lng['admin']['vhostconfig']['vhost_usedefaultlocation']['desc'] = 'Wenn deaktiviert, werden Standard VHost-Direktiven wie
location / { ... }
location @rewrites { ... }
location ~ ^(.+?\.php)(/.*)?$ { ... }
nicht in die Konfigurationsdatei geschrieben.'; -$lng['question']['vhostsetting_reallydelete'] = 'Wollen Sie diese VHost-Vorlage wirklich löschen?'; \ No newline at end of file +$lng['question']['vhostsetting_reallydelete'] = 'Wollen Sie diese VHost-Vorlage wirklich löschen?'; + +$lng['admin']['server_templates'] = 'Vorlagen';