merge branch og-portcontrol

This commit is contained in:
Oliver Gorwits
2012-11-24 23:29:00 +00:00
parent 3724e3ed37
commit 083f3a51ed
31 changed files with 1368 additions and 377 deletions

View File

@@ -1,5 +1,4 @@
<p><em>Port Filter Options</em></p>
<input name="q" value="[% params.q %]" type="hidden"/>
<div class="clearfix">
<a class="field_clear_icon" href="#"
@@ -10,9 +9,11 @@
rel="tooltip" data-placement="left" data-offset="5" title="Filter by Port, Name or VLAN"/>
</div>
<div class="clearfix">
<a href="#" data-toggle="collapse" data-target="#nd_legend">
<label class="nd_collapser">Legend<div class="arrow-down"></div></label></a>
<div id="nd_legend" class="collapse in">
<span data-toggle="collapse" data-target="#nd_legend">
<label class="nd_collapser">Legend
<i class="arrow-up-down icon-chevron-up icon-large"></i>
</label></span>
<div id="nd_legend" class="collapse">
<ul class="inputs-list unstyled">
<li>
<span class="label">S</span>&nbsp; Admin Disabled
@@ -39,16 +40,23 @@
</div>
</div>
<div class="clearfix">
<a href="#" data-toggle="collapse" data-target="#nd_columns">
<label class="nd_collapser">Display Columns<div class="arrow-down"></div></label></a>
<span data-toggle="collapse" data-target="#nd_columns">
<label class="nd_collapser">Display Columns
<i class="arrow-up-down icon-chevron-down icon-large"></i>
</label></span>
<div id="nd_columns" class="collapse in">
<ul class="inputs-list unstyled">
[% FOREACH item IN vars.port_columns %]
[% NEXT IF item.name == 'c_admin' AND NOT vars.user.port_control %]
<li>
<label class="checkbox">
<input type="checkbox" id="[% item.name %]"
name="[% item.name %]"[% ' checked="checked"' IF params.${item.name} %] />
[% item.label %]
[% IF item.name == 'c_admin' %]
<span class="label label-inverse">[% item.label %]</span>
[% ELSE %]
[% item.label %]
[% END %]
</label>
</li>
[% END %]
@@ -56,8 +64,10 @@
</div>
</div>
<div class="clearfix">
<a href="#" data-toggle="collapse" data-target="#nd_portprops">
<label class="nd_collapser">Port Properties<div class="arrow-up"></div></label></a>
<span data-toggle="collapse" data-target="#nd_portprops">
<label class="nd_collapser">Port Properties
<i class="arrow-up-down icon-chevron-up icon-large"></i>
</label></span>
<div id="nd_portprops" class="collapse">
<ul class="inputs-list unstyled">
<li>
@@ -86,8 +96,10 @@
</div>
</div>
<div class="clearfix">
<a href="#" data-toggle="collapse" data-target="#nd_nodeprops">
<label class="nd_collapser">Node Properties<div class="arrow-up"></div></label></a>
<span data-toggle="collapse" data-target="#nd_nodeprops">
<label class="nd_collapser">Node Properties
<i class="arrow-up-down icon-chevron-up icon-large"></i>
</label></span>
<div id="nd_nodeprops" class="collapse">
<ul class="inputs-list unstyled">
[% FOREACH item IN vars.connected_properties %]

View File

@@ -1,47 +1,42 @@
<p><em>Device Search Options</em></p>
<p class="nd_sidebar_title"><em>Device Search Options</em></p>
<input name="q" value="[% params.q %]" type="hidden"/>
<div class="clearfix">
<a data-btn-for="dns" class="field_copy_icon" href="#">
<img src="[% uri_base %]/images/vaga_copy.png"/></a>
<a id="dns_clear_btn" data-btn-for="dns" class="field_clear_icon" href="#">
<i class="icon-trash"></i></a>
<i data-btn-for="dns" class="field_copy_icon icon-copy icon-large"></i>
<i id="dns_clear_btn" data-btn-for="dns"
class="field_clear_icon icon-trash icon-large"></i>
<input class="nd_side_input" placeholder="DNS"
type="text" name="dns" value="[% params.dns %]"
rel="tooltip" data-placement="left" data-offset="5" title="DNS"/>
</div>
<div class="clearfix">
<a data-btn-for="ip" class="field_copy_icon" href="#">
<img src="[% uri_base %]/images/vaga_copy.png"/></a>
<a id="ip_clear_btn" data-btn-for="ip" class="field_clear_icon" href="#">
<i class="icon-trash"></i></a>
<i data-btn-for="ip" class="field_copy_icon icon-copy icon-large"></i>
<i id="ip_clear_btn" data-btn-for="ip"
class="field_clear_icon icon-trash icon-large"></i>
<input class="nd_side_input" placeholder="IP Address"
type="text" name="ip" value="[% params.ip %]"
rel="tooltip" data-placement="left" data-offset="5" title="IP Address"/>
</div>
<div class="clearfix">
<a data-btn-for="name" class="field_copy_icon" href="#">
<img src="[% uri_base %]/images/vaga_copy.png"/></a>
<a id="name_clear_btn" data-btn-for="name" class="field_clear_icon" href="#">
<i class="icon-trash"></i></a>
<i data-btn-for="name" class="field_copy_icon icon-copy icon-large"></i>
<i id="name_clear_btn" data-btn-for="name"
class="field_clear_icon icon-trash icon-large"></i>
<input class="nd_side_input" placeholder="System Name"
type="text" name="name" value="[% params.name %]"
rel="tooltip" data-placement="left" data-offset="5" title="System Name"/>
</div>
<div class="clearfix">
<a data-btn-for="location" class="field_copy_icon" href="#">
<img src="[% uri_base %]/images/vaga_copy.png"/></a>
<a id="location_clear_btn" data-btn-for="location" class="field_clear_icon" href="#">
<i class="icon-trash"></i></a>
<i data-btn-for="location" class="field_copy_icon icon-copy icon-large"></i>
<i id="location_clear_btn" data-btn-for="location"
class="field_clear_icon icon-trash icon-large"></i>
<input class="nd_side_input" placeholder="Location"
type="text" name="location" value="[% params.location %]"
rel="tooltip" data-placement="left" data-offset="5" title="Location"/>
</div>
<div class="clearfix">
<a data-btn-for="description" class="field_copy_icon" href="#">
<img src="[% uri_base %]/images/vaga_copy.png"/></a>
<a id="description_clear_btn" data-btn-for="description" class="field_clear_icon" href="#">
<i class="icon-trash"></i></a>
<i data-btn-for="description" class="field_copy_icon icon-copy icon-large"></i>
<i id="description_clear_btn" data-btn-for="description"
class="field_clear_icon icon-trash icon-large"></i>
<input class="nd_side_input" placeholder="Description"
type="text" name="description" value="[% params.description %]"
rel="tooltip" data-placement="left" data-offset="5" title="Description"/>

View File

@@ -1,5 +1,5 @@
<p><em>Node Search Options</em></p>
<p class="nd_sidebar_title"><em>Node Search Options</em></p>
<input name="q" value="[% params.q %]" type="hidden"/>
<div class="clearfix input-prepend">
<label class="add-on">