Skip to content

O
OpnSense
Commit 3d45ed87 authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

search: some more tweaks 

o Translate menu returned from API (glitchy, but why?)
o Fix styling in chrome by realigning the grouing
o Remove the button, enter is quicker
o Search indicator to the left
o Hide more menu entries
o Space around separator
parent 78148368
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 12 deletions
src/opnsense/mvc/app/controllers/OPNsense/Core/Api/MenuController.php
View file @ 3d45ed87
......@@ -181,13 +181,13 @@ class MenuController extends ApiControllerBase
{
foreach ($menu_items as $menu_item) {
if (!isset($menu_item->breadcrumb)) {
$menu_item->breadcrumb = $menu_item->VisibleName;
$menu_item->breadcrumb = gettext($menu_item->VisibleName);
$menu_item->depth = 1;
}
if ($menu_item->isVisible) {
if (count($menu_item->Children) > 0) {
foreach ($menu_item->Children as &$submenu) {
$submenu->breadcrumb = $menu_item->breadcrumb . "/" . $submenu->VisibleName;
$submenu->breadcrumb = $menu_item->breadcrumb . ' / ' . gettext($submenu->VisibleName);
$submenu->depth = $menu_item->depth + 1;
}
$this->extractMenuLeaves($menu_item->Children, $items);
......
src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
View file @ 3d45ed87
......@@ -145,7 +145,7 @@
<All order="100" url="/firewall_aliases.php?tab=all">
<Edit url="/firewall_aliases_edit.php?tab=all" visibility="hidden"/>
<NoneEdit url="/firewall_aliases_edit.php?id=*" visibility="hidden"/>
<None url="/firewall_aliases.php"/>
<None url="/firewall_aliases.php" visibility="hidden"/>
</All>
<IPs order="200" url="/firewall_aliases.php?tab=ip">
<Edit url="/firewall_aliases_edit.php?tab=ip" visibility="hidden"/>
......@@ -160,7 +160,7 @@
</Aliases>
<Rules order="20" url="/firewall_rules.php" cssClass="fa fa-check fa-fw">
<RulesEdit url="/firewall_rules_edit.php*" visibility="hidden"/>
<Floating url="/firewall_rules.php?if=FloatingRules"/>
<Floating url="/firewall_rules.php?if=FloatingRules" visibility="hidden"/>
<Interface url="/firewall_rules.php?if=*" visibility="hidden"/>
</Rules>
<NAT order="30" cssClass="fa fa-exchange fa-fw">
......
src/opnsense/mvc/app/views/layouts/default.volt
View file @ 3d45ed87
......@@ -165,10 +165,8 @@
<li>
<form class="navbar-form" role="search">
<div class="input-group">
<input type="text" style="width: 250px;" class="form-control" tabindex="1" placeholder="{{ lang._('Search') }}" data-provide="typeahead" id="menu_search_box">
<div class="input-group-btn">
<button class="btn btn-default" type="button"><i class="glyphicon glyphicon-search"></i></button>
</div>
<div class="input-group-addon"><i class="fa fa-search"></i></div>
<input type="text" style="width: 250px;" class="form-control" tabindex="1" data-provide="typeahead" id="menu_search_box">
</div>
</form>
</li>
......
src/www/fbegin.inc
View file @ 3d45ed87
......@@ -114,10 +114,8 @@ if($need_alert_display == true) {
<li>
<form class="navbar-form" role="search">
<div class="input-group">
<input type="text" style="width: 250px;" class="form-control" tabindex="1" placeholder="<?= htmlspecialchars(gettext('Search')) ?>" data-provide="typeahead" id="menu_search_box">
<div class="input-group-btn">
<button class="btn btn-default" type="button"><i class="glyphicon glyphicon-search"></i></button>
</div>
<div class="input-group-addon"><i class="fa fa-search"></i></div>
<input type="text" style="width: 250px;" class="form-control" tabindex="1" data-provide="typeahead" id="menu_search_box">
</div>
</form>
</li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023