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

refactor search sidebar, add search permalink

Browse Source
This commit is contained in:
Oliver Gorwits
2012-01-07 12:37:09 +00:00
parent 229423996a
commit 7e502a39b8
10 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Netdisco/lib/Netdisco.pm
View File

@@ -18,7 +18,8 @@ get '/' => sub {
}; };
ajax '/ajax/content/search/:thing' => sub { ajax '/ajax/content/search/:thing' => sub {
return '<p>Hello World.</p>'; content_type('text/html');
return '<p>Hello '. param('thing') .'.</p>';
}; };
get '/search' => sub { get '/search' => sub {

8
Netdisco/public/css/style.css
View File

@@ -23,3 +23,11 @@
padding-left: 35px; padding-left: 35px;
cursor: default; cursor: default;
} }
.nd_bookmark {
vertical-align: top;
}
.nd_search {
margin-top: 15px;
}

BIN
Netdisco/public/images/glyphicons_072_bookmark.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 153 B

3
Netdisco/views/inc/js/search.js
View File

@@ -4,6 +4,7 @@
function do_search (event, tab) { function do_search (event, tab) {
var form = '#' + tab + '_form'; var form = '#' + tab + '_form';
var target = '#' + tab + '_pane'; var target = '#' + tab + '_pane';
var mark = '#' + tab + '_bookmark';
// stop form from submitting normally // stop form from submitting normally
event.preventDefault(); event.preventDefault();
@@ -32,6 +33,8 @@
); );
return; return;
} }
// looks good, update the bookmark for this search
$(mark).attr('href', '/search?' + query);
} }
); );
} }

3
Netdisco/views/inc/search/box.tt Normal file
View File

@@ -0,0 +1,3 @@
<div class="clearfix">
<input class="span3" name="q" value="[% params.q %]" type="text"/>
</div>

8
Netdisco/views/inc/search/device.tt
View File

@@ -1,12 +1,8 @@
<div id="device_search" class="tab-pane [% 'active' IF params.tab == 'device' %]"> <div id="device_search" class="tab-pane [% 'active' IF params.tab == 'device' %]">
<form id="device_form" class="nd_sidesearchform form-stacked" method="get" action="/search"> <form id="device_form" class="nd_sidesearchform form-stacked" method="get" action="/search">
<div class="clearfix"> [%+ INCLUDE inc/search/box.tt %]
<input class="span3" name="q" value="[% params.q %]" type="text"/>
</div>
<p><em>Device Search Options</em></p> <p><em>Device Search Options</em></p>
<input name="tab" value="device" type="hidden"/> <input name="tab" value="device" type="hidden"/>
<div class="clearfix"> [%+ INCLUDE inc/search/submit.tt %]
<button id="device_submit" type="submit" class="btn info">Search Again</button>
</div>
</form> </form>
</div> <!-- /tab-pane --> </div> <!-- /tab-pane -->

8
Netdisco/views/inc/search/node.tt
View File

@@ -1,8 +1,6 @@
<div id="node_search" class="tab-pane [% 'active' IF params.tab == 'node' %]"> <div id="node_search" class="tab-pane [% 'active' IF params.tab == 'node' %]">
<form id="node_form" class="nd_sidesearchform form-stacked" method="get" action="/search"> <form id="node_form" class="nd_sidesearchform form-stacked" method="get" action="/search">
<div class="clearfix"> [%+ INCLUDE inc/search/box.tt %]
<input class="span3" name="q" value="[% params.q %]" type="text"/>
</div>
<p><em>Node Search Options</em></p> <p><em>Node Search Options</em></p>
<input name="tab" value="node" type="hidden"/> <input name="tab" value="node" type="hidden"/>
<div class="clearfix input-prepend"> <div class="clearfix input-prepend">
@@ -29,8 +27,6 @@
<span class="nd_searchcheckbox uneditable-input">Archived Data</span> <span class="nd_searchcheckbox uneditable-input">Archived Data</span>
</label> </label>
</div> </div>
<div class="clearfix"> [%+ INCLUDE inc/search/submit.tt %]
<button id="node_submit" type="submit" class="btn info">Search Again</button>
</div>
</form> </form>
</div> <!-- /tab-pane --> </div> <!-- /tab-pane -->

8
Netdisco/views/inc/search/port.tt
View File

@@ -1,11 +1,7 @@
<div id="port_search" class="tab-pane [% 'active' IF params.tab == 'port' %]"> <div id="port_search" class="tab-pane [% 'active' IF params.tab == 'port' %]">
<form id="port_form" class="nd_sidesearchform form-stacked" method="get" action="/search"> <form id="port_form" class="nd_sidesearchform form-stacked" method="get" action="/search">
<div class="clearfix"> [%+ INCLUDE inc/search/box.tt %]
<input class="span3" name="q" value="[% params.q %]" type="text"/>
</div>
<input name="tab" value="vlan" type="hidden"/> <input name="tab" value="vlan" type="hidden"/>
<div class="clearfix"> [%+ INCLUDE inc/search/submit.tt %]
<button id="port_submit" type="submit" class="btn info">Search Again</button>
</div>
</form> </form>
</div> <!-- /tab-pane --> </div> <!-- /tab-pane -->

4
Netdisco/views/inc/search/submit.tt Normal file
View File

@@ -0,0 +1,4 @@
<div class="nd_search clearfix">
<button id="vlan_submit" type="submit" class="btn info">Search Again</button>
<a id="[% tab.id %]_bookmark" href="#"><img class="nd_bookmark" src="/images/glyphicons_072_bookmark.png"></a>
</div>

8
Netdisco/views/inc/search/vlan.tt
View File

@@ -1,11 +1,7 @@
<div id="vlan_search" class="tab-pane [% 'active' IF params.tab == 'vlan' %]"> <div id="vlan_search" class="tab-pane [% 'active' IF params.tab == 'vlan' %]">
<form id="vlan_form" class="nd_sidesearchform form-stacked" method="get" action="/search"> <form id="vlan_form" class="nd_sidesearchform form-stacked" method="get" action="/search">
<div class="clearfix"> [%+ INCLUDE inc/search/box.tt %]
<input class="span3" name="q" value="[% params.q %]" type="text"/>
</div>
<input name="tab" value="vlan" type="hidden"/> <input name="tab" value="vlan" type="hidden"/>
<div class="clearfix"> [%+ INCLUDE inc/search/submit.tt %]
<button id="vlan_submit" type="submit" class="btn info">Search Again</button>
</div>
</form> </form>
</div> <!-- /tab-pane --> </div> <!-- /tab-pane -->