diff options
author | Chris Buechler <cmb@pfsense.org> | 2014-12-02 21:35:54 -0600 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2014-12-02 21:35:54 -0600 |
commit | a94b1edc7f812eef904da0b196ae1abfe1e9c354 (patch) | |
tree | 45fc43d4fb5479033a79dbe170ff75957358a33d /usr | |
parent | c042bc3b1050e1156fea6494809f433d084f45b1 (diff) | |
parent | 8ce58e05f0c5552b7dbb5925b118b6e29c1994cd (diff) | |
download | pfsense-a94b1edc7f812eef904da0b196ae1abfe1e9c354.zip pfsense-a94b1edc7f812eef904da0b196ae1abfe1e9c354.tar.gz |
Merge pull request #1348 from phil-davis/patch-4
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/head.inc | 6 | ||||
-rw-r--r-- | usr/local/www/system_advanced_admin.php | 17 |
2 files changed, 22 insertions, 1 deletions
diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc index afdee93..2cd7add 100755 --- a/usr/local/www/head.inc +++ b/usr/local/www/head.inc @@ -7,12 +7,16 @@ $g['theme'] = get_current_theme(); $pagetitle = gentitle( $pgtitle ); +if (isset($config['system']['webgui']['pagenamefirst'])) + $tabtitle = $pagetitle . " - " . $config['system']['hostname'] . "." . $config['system']['domain']; +else + $tabtitle = $config['system']['hostname'] . "." . $config['system']['domain'] . " - " . $pagetitle; ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="<?=system_get_language_code();?>" xml:lang="<?=system_get_language_code();?>"> <head> - <title><?php echo($config['system']['hostname'] . "." . $config['system']['domain'] . " - " . $pagetitle); ?></title> + <title><?php echo($tabtitle); ?></title> <meta http-equiv="Content-Type" content="text/html; charset=<?=system_get_language_codeset();?>" /> <link rel="apple-touch-icon" href="/themes/<?php echo $g['theme']; ?>/apple-touch-icon.png"/> <link rel="shortcut icon" href="/themes/<?php echo $g['theme']; ?>/images/icons/favicon.ico"/> diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index 0ef818c..43bc1c7 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -59,6 +59,7 @@ $pconfig['noantilockout'] = isset($config['system']['webgui']['noantilockout']); $pconfig['nodnsrebindcheck'] = isset($config['system']['webgui']['nodnsrebindcheck']); $pconfig['nohttpreferercheck'] = isset($config['system']['webgui']['nohttpreferercheck']); $pconfig['beast_protection'] = isset($config['system']['webgui']['beast_protection']); +$pconfig['pagenamefirst'] = isset($config['system']['webgui']['pagenamefirst']); $pconfig['loginautocomplete'] = isset($config['system']['webgui']['loginautocomplete']); $pconfig['althostnames'] = $config['system']['webgui']['althostnames']; $pconfig['enableserial'] = $config['system']['enableserial']; @@ -175,6 +176,11 @@ if ($_POST) { else unset($config['system']['webgui']['beast_protection']); + if ($_POST['pagenamefirst'] == "yes") + $config['system']['webgui']['pagenamefirst'] = true; + else + unset($config['system']['webgui']['pagenamefirst']); + if ($_POST['loginautocomplete'] == "yes") $config['system']['webgui']['loginautocomplete'] = true; else @@ -498,6 +504,17 @@ function prot_change() { </td> </tr> <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Browser tab text"); ?></td> + <td width="78%" class="vtable"> + <input name="pagenamefirst" type="checkbox" id="pagenamefirst" value="yes" <?php if ($pconfig['pagenamefirst']) echo "checked=\"checked\""; ?> /> + <strong><?=gettext("Display page name first in browser tab"); ?></strong> + <br /> + <?php echo gettext("When this is unchecked, the browser tab shows the host name followed by the current page. "); ?> + <br /> + <?php echo gettext("Check this box to display the current page followed by the host name."); ?> + </td> + </tr> + <tr> <td colspan="2" class="list" height="12"> </td> </tr> <tr> |