135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add device/node/vlan/port specific search from Navbar

Browse Source
This commit is contained in:
Oliver Gorwits
2013-12-28 00:08:12 +00:00
parent 0122d5728b
commit 07ec293229
4 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -3,6 +3,7 @@
[NEW FEATURES]
* Add IP Phones discovered through LLDP/CDP report
* Add device/node/vlan/port specific search from Navbar
[ENHANCEMENTS]

18
Netdisco/share/public/css/netdisco.css
View File

@@ -8,15 +8,31 @@ body {
.navbar-inner .container {
background: url(../images/navbar_disco.png) no-repeat;
background-position: 13px 0px;
}
/* magnifying glass icon for search box */
/* used for icons in sidebar search buttons */
.nd_navbar-icon {
vertical-align: sub;
margin-top: 4px;
cursor: pointer;
}
/* careful align of navbar search button and menu */
.nd_navbar-search-group {
margin-top: 0px !important;
}
.nd_navbar-search-icon {
color: #999;
padding-left: 5px;
padding-right: 5px;
}
.nd_navbar-search-caret {
padding-top: 10px !important;
padding-left: 5px !important;
padding-right: 5px !important;
}
/* for the "logged in as..." text */
.nd_navbar-text {
color: #666;

9
Netdisco/share/public/javascripts/netdisco.js
View File

@@ -179,6 +179,15 @@ $(document).ready(function() {
$('#navsearchgo').click(function() {
$('#navsearchgo').parents('form').submit();
});
$('.nd_navsearchgo-specific').click(function(event) {
event.preventDefault();
console.log($(this).data('tab'));
$(this).parents('form').append(
$(document.createElement('input')).attr('type', 'hidden')
.attr('name', 'tab')
.attr('value', $(this).data('tab'))
).submit();
});
// fix green background on search checkboxes
// https://github.com/twitter/bootstrap/issues/742

17
Netdisco/share/views/layouts/main.tt
View File

@@ -87,10 +87,23 @@
<form class="navbar-search pull-left" method="get" action="[% uri_for('/search') %]">
<input placeholder="Find Anything" class="search-query span3"
id="nq" name="q" type="text" autocomplete="off"/>
<span style="font-size: 24px;">
<i id="navsearchgo" class="icon-search nd_navbar-icon"
<div class="btn-group nd_navbar-search-group">
<button class="btn btn-inverse nd_navbar-search-icon">
<span style="font-size: 18px;">
<i id="navsearchgo" class="icon-search"
rel="tooltip" data-placement="bottom" data-offset="5" data-title="New Search" data-container="body"></i>
</span>
</button>
<button class="btn btn-inverse dropdown-toggle nd_navbar-search-caret" data-toggle="dropdown">
<span class="caret" style="border-top-color: #999; border-bottom-color: #999"></span>
</button>
<ul class="dropdown-menu">
<li><a class="nd_navsearchgo-specific" href="" data-tab="device">Search Devices</a></li>
<li><a class="nd_navsearchgo-specific" href="" data-tab="node">Search Nodes</a></li>
<li><a class="nd_navsearchgo-specific" href="" data-tab="vlan">Search VLANs</a></li>
<li><a class="nd_navsearchgo-specific" href="" data-tab="port">Search Ports</a></li>
</ul>
</div>
</form>
[% IF user_has_role('admin') %]
<ul class="nav">