Project

General

Profile

« Previous | Next » 

Revision 1d129967

Added by Christopher Fazendin over 9 years ago

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.

View differences:

src/usr/local/www/head.inc
448 448
		</div>
449 449
		<div class="collapse navbar-collapse" id="pf-navbar">
450 450
			<ul class="nav navbar-nav">
451
			<?php foreach ([
452
					['name' => 'System',	  'menu' => $system_menu,	   'href' => null],
453
					['name' => 'Interfaces',  'menu' => $interfaces_menu,  'href' => null],
454
					['name' => 'Firewall',	  'menu' => $firewall_menu,	   'href' => null],
455
					['name' => 'Services',	  'menu' => $services_menu,	   'href' => null],
456
					['name' => 'VPN',		  'menu' => $vpn_menu,		   'href' => null],
457
					['name' => 'Status',	  'menu' => $status_menu,	   'href' => null],
458
					['name' => 'Diagnostics', 'menu' => $diagnostics_menu, 'href' => null],
459
					['name' => 'Gold',		  'menu' => $gold_menu,		   'href' => '_blank'],
460
					['name' => 'Help',		  'menu' => $help_menu,		   'href' => '_blank']
451
			<?php
452
                if ($config['system']['webgui']['webguihostnamemenu'] == 'hostonly') {
453
                    $help_menu_title = htmlspecialchars($config['system']['hostname']);
454
                }
455
                elseif ($config['system']['webgui']['webguihostnamemenu'] == 'fqdn') {
456
                    $help_menu_title = htmlspecialchars($config['system']['hostname'] . "." . $config['system']['domain']);
457
                }
458
                else {
459
                    $help_menu_title = 'Help';
460
                }
461
                foreach ([
462
					['name' => 'System',	     'menu' => $system_menu,	  'href' => null],
463
					['name' => 'Interfaces',     'menu' => $interfaces_menu,  'href' => null],
464
					['name' => 'Firewall',	     'menu' => $firewall_menu,	  'href' => null],
465
					['name' => 'Services',	     'menu' => $services_menu,	  'href' => null],
466
					['name' => 'VPN',		     'menu' => $vpn_menu,		  'href' => null],
467
					['name' => 'Status',	     'menu' => $status_menu,	  'href' => null],
468
					['name' => 'Diagnostics',    'menu' => $diagnostics_menu, 'href' => null],
469
					['name' => 'Gold',		     'menu' => $gold_menu,		  'href' => '_blank'],
470
                    ['name' => $help_menu_title, 'menu' => $help_menu,		  'href' => '_blank']
461 471
				] as $item):
462 472
					if ($item['name'] == 'Help' && $g['disablehelpmenu']) {
463 473
						continue;
src/usr/local/www/system.php
97 97
$pconfig['systemlogsfilterpanel'] = isset($config['system']['webgui']['systemlogsfilterpanel']);
98 98
$pconfig['systemlogsmanagelogpanel'] = isset($config['system']['webgui']['systemlogsmanagelogpanel']);
99 99
$pconfig['statusmonitoringsettingspanel'] = isset($config['system']['webgui']['statusmonitoringsettingspanel']);
100
$pconfig['webguihostnamemenu'] = isset($config['system']['webgui']['webguihostnamemenu']);
100 101
$pconfig['dnslocalhost'] = isset($config['system']['dnslocalhost']);
101 102

  
102 103
if (!$pconfig['timezone']) {
......
157 158
		unset($config['system']['webgui']['webguifixedmenu']);
158 159
	}
159 160

  
161
	if ($_POST['webguihostnamemenu']) {
162
		$config['system']['webgui']['webguihostnamemenu'] = $_POST['webguihostnamemenu'];
163
	} else {
164
		unset($config['system']['webgui']['webguihostnamemenu']);
165
	}
166

  
160 167
	if ($_POST['dashboardcolumns']) {
161 168
		$config['system']['webgui']['dashboardcolumns'] = $_POST['dashboardcolumns'];
162 169
	} else {
......
518 525
	["" => gettext("Scrolls with page"), "fixed" => gettext("Fixed (Remains visible at top of page)")]
519 526
))->setHelp("The fixed option is intended for large screens only.");
520 527

  
528
$section->addInput(new Form_Select(
529
	'webguihostnamemenu',
530
	'Hostname in Menu',
531
	$pconfig['webguihostnamemenu'],
532
	["" => gettext("Default (No hostname)"), "hostonly" => gettext("Hostname only"), "fqdn" => gettext("Fully Qualified Domain Name")]
533
))->setHelp("Replaces the Help menu title in the Navbar with the system hostname or FQDN.");
534

  
521 535
$section->addInput(new Form_Input(
522 536
	'dashboardcolumns',
523 537
	'Dashboard Columns',

Also available in: Unified diff