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

bug fix for unhidden legend list

Browse Source
This commit is contained in:
Oliver Gorwits
2012-01-21 17:11:45 +00:00
parent 00561ca439
commit 9d70a7cf37
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Netdisco/views/js/device.js
View File

@@ -1,5 +1,5 @@
$(document).ready(function() { $(document).ready(function() {
$('.nd_collapse_columns').collapser({ $('#nd_collapse_columns').collapser({
target: 'next', target: 'next',
effect: 'slide', effect: 'slide',
changeText: true, changeText: true,
@@ -7,7 +7,7 @@
collapseHtml: '<label class="nd_collapser">Display Columns<div class="arrow-down"></div></label>', collapseHtml: '<label class="nd_collapser">Display Columns<div class="arrow-down"></div></label>',
}); });
$('.nd_collapse_portprop').collapser({ $('#nd_collapse_portprop').collapser({
target: 'next', target: 'next',
effect: 'slide', effect: 'slide',
changeText: true, changeText: true,
@@ -15,7 +15,7 @@
collapseHtml: '<label class="nd_collapser">Port Properties<div class="arrow-down"></div></label>', collapseHtml: '<label class="nd_collapser">Port Properties<div class="arrow-down"></div></label>',
}); });
$('.nd_collapse_nodeprop').collapser({ $('#nd_collapse_nodeprop').collapser({
target: 'next', target: 'next',
effect: 'slide', effect: 'slide',
changeText: true, changeText: true,
@@ -23,7 +23,7 @@
collapseHtml: '<label class="nd_collapser">Node Properties<div class="arrow-down"></div></label>', collapseHtml: '<label class="nd_collapser">Node Properties<div class="arrow-down"></div></label>',
}); });
$('.nd_collapse_legend').collapser({ $('#nd_collapse_legend').collapser({
target: 'next', target: 'next',
effect: 'slide', effect: 'slide',
changeText: true, changeText: true,
@@ -89,6 +89,9 @@
$('#[% params.tab %]_form').trigger("submit"); $('#[% params.tab %]_form').trigger("submit");
[% END %] [% END %]
// everything starts hidden and then we show defaults
$('#nd_collapse_legend').click();
// on tab change, hide previous tab's search form and show new tab's // on tab change, hide previous tab's search form and show new tab's
// search form. also trigger to load the content for the newly active tab. // search form. also trigger to load the content for the newly active tab.
$('#search_results').bind('change', function(e) { $('#search_results').bind('change', function(e) {

10
Netdisco/views/sidebar/device/ports.tt
View File

@@ -8,8 +8,8 @@
rel="twipsy" data-placement="right" data-offset="5" title="Filter by Port, Name or VLAN"/> rel="twipsy" data-placement="right" data-offset="5" title="Filter by Port, Name or VLAN"/>
</div> </div>
<div class="clearfix"> <div class="clearfix">
<a href="#" class="nd_collapse_legend"><label>Legend</label></a> <a href="#" id="nd_collapse_legend"><label>Legend</label></a>
<ul class="inputs-list unstyled"> <ul class="inputs-list unstyled nd_collapse_pre_hidden">
<li> <li>
<span class="label">s</span>&nbsp; Admin Disabled <span class="label">s</span>&nbsp; Admin Disabled
</li> </li>
@@ -34,7 +34,7 @@
</ul> </ul>
</div> </div>
<div class="clearfix"> <div class="clearfix">
<a href="#" class="nd_collapse_columns"><label>Display Columns</label></a> <a href="#" id="nd_collapse_columns"><label>Display Columns</label></a>
<div class="input nd_collapse_pre_hidden"> <div class="input nd_collapse_pre_hidden">
<ul class="inputs-list"> <ul class="inputs-list">
[% FOREACH item IN vars.port_columns %] [% FOREACH item IN vars.port_columns %]
@@ -49,7 +49,7 @@
</div> </div>
</div> </div>
<div class="clearfix"> <div class="clearfix">
<a href="#" class="nd_collapse_portprop"><label>Port Properties</label></a> <a href="#" id="nd_collapse_portprop"><label>Port Properties</label></a>
<div class="input nd_collapse_pre_hidden"> <div class="input nd_collapse_pre_hidden">
<ul class="inputs-list"> <ul class="inputs-list">
<li> <li>
@@ -79,7 +79,7 @@
</div> </div>
</div> </div>
<div class="clearfix"> <div class="clearfix">
<a href="#" class="nd_collapse_nodeprop"><label>Node Properties</label></a> <a href="#" id="nd_collapse_nodeprop"><label>Node Properties</label></a>
<div class="input nd_collapse_pre_hidden"> <div class="input nd_collapse_pre_hidden">
<ul class="inputs-list"> <ul class="inputs-list">
[% FOREACH item IN vars.connected_properties %] [% FOREACH item IN vars.connected_properties %]