summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/head.inc
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-05-05 16:35:04 -0400
committerStephen Beaver <sbeaver@netgate.com>2016-05-05 16:35:04 -0400
commit7c4d5b9b2262ae51024c8a083516ad010277e888 (patch)
treea8690bfeb518a81aa905f60e49ed9b1f41dcc370 /src/usr/local/www/head.inc
parente3c5006b819063863f44fd2314dd635bd26e8a8c (diff)
downloadpfsense-7c4d5b9b2262ae51024c8a083516ad010277e888.zip
pfsense-7c4d5b9b2262ae51024c8a083516ad010277e888.tar.gz
Revert "Added option to System > General Setup > webConfigurator to change the title of the Help menu in the navbar to either the system hostname or fqdn."
This reverts commit e3c5006b819063863f44fd2314dd635bd26e8a8c.
Diffstat (limited to 'src/usr/local/www/head.inc')
-rw-r--r--src/usr/local/www/head.inc30
1 files changed, 10 insertions, 20 deletions
diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc
index 78a7bb9..cd5257e 100644
--- a/src/usr/local/www/head.inc
+++ b/src/usr/local/www/head.inc
@@ -448,26 +448,16 @@ if (($pagename === "index.php") && ($numColumns > 2)) {
</div>
<div class="collapse navbar-collapse" id="pf-navbar">
<ul class="nav navbar-nav">
- <?php
- if ($config['system']['webgui']['webguihostnamemenu'] == 'hostonly') {
- $help_menu_title = htmlspecialchars($config['system']['hostname']);
- }
- elseif ($config['system']['webgui']['webguihostnamemenu'] == 'fqdn') {
- $help_menu_title = htmlspecialchars($config['system']['hostname'] . "." . $config['system']['domain']);
- }
- else {
- $help_menu_title = 'Help';
- }
- foreach ([
- ['name' => 'System', 'menu' => $system_menu, 'href' => null],
- ['name' => 'Interfaces', 'menu' => $interfaces_menu, 'href' => null],
- ['name' => 'Firewall', 'menu' => $firewall_menu, 'href' => null],
- ['name' => 'Services', 'menu' => $services_menu, 'href' => null],
- ['name' => 'VPN', 'menu' => $vpn_menu, 'href' => null],
- ['name' => 'Status', 'menu' => $status_menu, 'href' => null],
- ['name' => 'Diagnostics', 'menu' => $diagnostics_menu, 'href' => null],
- ['name' => 'Gold', 'menu' => $gold_menu, 'href' => '_blank'],
- ['name' => $help_menu_title, 'menu' => $help_menu, 'href' => '_blank']
+ <?php foreach ([
+ ['name' => 'System', 'menu' => $system_menu, 'href' => null],
+ ['name' => 'Interfaces', 'menu' => $interfaces_menu, 'href' => null],
+ ['name' => 'Firewall', 'menu' => $firewall_menu, 'href' => null],
+ ['name' => 'Services', 'menu' => $services_menu, 'href' => null],
+ ['name' => 'VPN', 'menu' => $vpn_menu, 'href' => null],
+ ['name' => 'Status', 'menu' => $status_menu, 'href' => null],
+ ['name' => 'Diagnostics', 'menu' => $diagnostics_menu, 'href' => null],
+ ['name' => 'Gold', 'menu' => $gold_menu, 'href' => '_blank'],
+ ['name' => 'Help', 'menu' => $help_menu, 'href' => '_blank']
] as $item):
if ($item['name'] == 'Help' && $g['disablehelpmenu']) {
continue;
OpenPOWER on IntegriCloud