From ecc0b7af1f9f9d0bfda94d6f1620549d898e5f01 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 17 Jan 2016 11:02:59 +0100
Subject: [PATCH] www: unify upper right corner between legacy and mvc

o Help link is in the menu and was already removed from MVC version
o Display user@host.domain in MVC too
o Logout is in the menu too

We might be able to salvage all the space now that the menu is consisten
and transform the top bar into the tile bar instead...

Log links still show, but will be killed as well early in the 16.1
series.
---
 .../mvc/app/controllers/OPNsense/Base/ControllerBase.php    | 5 +++++
 src/opnsense/mvc/app/views/layouts/default.volt             | 6 +-----
 src/www/fbegin.inc                                          | 2 --
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
index 45a37d55c..240139246 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
@@ -229,6 +229,11 @@ class ControllerBase extends ControllerRoot
             $this->view->ui_theme = $cnf->object()->theme;
         }
 
+        // info about the current user and box
+        $this->view->system_hostname = $cnf->object()->system->hostname;
+        $this->view->system_domain = $cnf->object()->system->domain;
+        $this->view->session_username = $_SESSION['Username'];
+
         // append ACL object to view
         $this->view->acl = new \OPNsense\Core\ACL();
     }
diff --git a/src/opnsense/mvc/app/views/layouts/default.volt b/src/opnsense/mvc/app/views/layouts/default.volt
index 72f046c77..5d7f272df 100644
--- a/src/opnsense/mvc/app/views/layouts/default.volt
+++ b/src/opnsense/mvc/app/views/layouts/default.volt
@@ -119,11 +119,7 @@
 
 				<div class="collapse navbar-collapse">
 					<ul class="nav navbar-nav navbar-right">
-						<li id="menu_messages">
-							<a href="#">{{title|default("OPNsense") }}</a>					</li>
-						<li></li><li></li><li></li>
-						<li></li>
-						<li class="active"><a href="/index.php?logout">{{ lang._('Logout') }}</a></li>
+						<li id="menu_messages"><a href="#">{{session_username}}@{{system_hostname}}.{{system_domain}}</a></li>
 					</ul>
 
 				</div>
diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc
index 6e101dcc0..64ccc2a95 100644
--- a/src/www/fbegin.inc
+++ b/src/www/fbegin.inc
@@ -114,8 +114,6 @@ if($need_alert_display == true) {
 							echo '<li>'.get_shortcut_log_link($shortcut_section, false).'</li>';
 						}
 					?>
-					<li><a href="<?= "/help.php?page={$pagename}" ?>" target="_blank" title="<?= gettext('Help for items on this page') ?>"><?= gettext('Help') ?></a></li>
-					<li class="active"><a href="/index.php?logout"><?= gettext('Logout') ?></a></li>
 				</ul>
 
 			</div>