lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 19:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

www: unify upper right corner between legacy and mvc

Browse Source 
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.
This commit is contained in:
Franco Fichtner 2016-01-17 11:02:59 +01:00
parent dcdcd9a90e
commit ecc0b7af1f
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
View File

@ -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();
}

6
src/opnsense/mvc/app/views/layouts/default.volt
View File

@ -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>

2
src/www/fbegin.inc
View File

@ -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>