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

new bs2 label naming

Browse Source
This commit is contained in:
Oliver Gorwits
2012-03-03 20:46:52 +00:00
parent 484b851449
commit 6efdfc8300
8 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Netdisco/public/css/netdisco.css
View File

@@ -91,7 +91,7 @@ body {
float: right;
}
/* draw little up arrow to the right of a label for collapsed list */
/* draw little up arrow to the left of a label for collapsed list */
.cell-arrow-up {
float: left;
margin-top: 5px;
@@ -101,7 +101,7 @@ body {
border-bottom: 8px solid #F89406;
}
/* draw little down arrow to the right of a label for collapsed list */
/* draw little down arrow to the left of a label for collapsed list */
.cell-arrow-down {
float: left;
margin-top: 5px;
@@ -151,7 +151,7 @@ body {
/* nudge the port name/vlan filter over a little */
.nd_port_query {
margin-left: -2px !important;
width: 141px; /* FIXME width and placing */
}
/* little sweep brush inside of port filter input field */
@@ -255,4 +255,9 @@ form .clearfix.success input {
padding-top: 4px !important;
}
/* a little whitespace between legend items */
.nd_legend > li {
line-height: 19px;
}
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */

14
Netdisco/views/ajax/device/ports.tt
View File

@@ -13,13 +13,13 @@
<tr>
<td>
[% IF row.up_admin == 'down' %]
<span class="label">s</span>
<span class="label">S</span>
[% ELSIF row.stp == 'blocking' %]
<span class="label notice">b</span>
<span class="label label-info">B</span>
[% ELSIF params.free OR row.is_free %]
<span class="label success">f</span>
<span class="label label-success">F</span>
[% ELSIF row.up_admin == 'up' AND row.up == 'down' %]
<span class="label warning">d</span>
<span class="label label-warning">D</span>
[% END %]
</td>
[% IF params.c_port %]
@@ -86,7 +86,7 @@
[% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip %]
([% row.remote_port | html_entity %])</a>
[% ELSE %]
<span class="label important">n</span>
<span class="label label-important">N</span>
<a href="[% uri_for('/search') %]?tab=node&q=[% row.remote_ip | uri %]">
[% row.remote_ip %] (port: [% row.remote_port %]
id: [% (row.remote_type _ ' / ') IF row.remote_type %][% row.remote_id %])</a>
@@ -94,12 +94,12 @@
[% END %]
[% FOREACH node IN row.$nodes %]
[% '<br/>' IF row.remote_ip OR NOT loop.first %]
[% '<span class="label warning">a</span> &nbsp;' IF NOT node.active %]
[% '<span class="label label-warning">A</span> &nbsp;' IF NOT node.active %]
<a href="[% uri_for('/search') %]?tab=node&q=[% node.mac | uri %]">[% node.mac %]</a>
[% ' (' _ node.time_last_age _ ')' IF params.n_age %]
[% IF params.n_ip %]
[% FOREACH ip IN node.ips %]
<br/>&nbsp; [% '<span class="label warning">a</span> &nbsp;' IF NOT ip.active %]
<br/>&nbsp; [% '<span class="label label-warning">A</span> &nbsp;' IF NOT ip.active %]
[% SET dns = ip.dns %]
[% IF dns %]
<a href="[% uri_for('/search') %]?tab=node&q=[% ip.ip | uri %]">[% dns %] ([% ip.ip %])</a>

6
Netdisco/views/ajax/search/node_by_ip.tt
View File

@@ -24,7 +24,7 @@
<td>IP &rarr; MAC</td>
<td><a href="[% uri_for('/search') %]?[% vars.query_defaults.node %]&q=[% row.ip | uri %]">[% row.ip %]</a>
[% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %]
[% ' <span class="label warning">a</span>' IF NOT row.active %]
[% ' <span class="label label-warning">A</span>' IF NOT row.active %]
</td>
[% IF params.stamps %]
<td>[% row.time_first_stamp %]</td>
@@ -40,7 +40,7 @@
<td>Switch Port</td>
<td><a href="[% uri_for('/device') %]?tab=ports&q=[% node.switch | url %]&f=[% node.port | url %]">[% node.switch %] [ [% node.port %] ]</a>
[% ' (' _ node.device.dns.remove(settings.domain_suffix) _ ')' IF node.device.dns %]
[% ' <span class="label warning">a</span>' IF NOT node.active %]
[% ' <span class="label label-warning">A</span>' IF NOT node.active %]
</td>
[% IF params.stamps %]
<td>[% node.time_first_stamp %]</td>
@@ -57,7 +57,7 @@
<td>MAC &rarr; IP</td>
<td><a href="[% uri_for('/search') %]?[% vars.query_defaults.node %]&q=[% nodeip.ip | uri %]">[% nodeip.ip %]</a>
[% ' (' _ nodeip.dns.remove(settings.domain_suffix) _ ')' IF nodeip.dns %]
[% ' <span class="label warning">a</span>' IF NOT nodeip.active %]
[% ' <span class="label label-warning">A</span>' IF NOT nodeip.active %]
</td>
[% IF params.stamps %]
<td>[% nodeip.time_first_stamp %]</td>

4
Netdisco/views/ajax/search/node_by_mac.tt
View File

@@ -37,7 +37,7 @@
<td>MAC &rarr; IP</td>
<td><a href="[% uri_for('/search') %]?[% vars.query_defaults.node %]&q=[% row.ip | uri %]">[% row.ip %]</a>
[% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %]
[% ' <span class="label warning">a</span>' IF NOT row.active %]
[% ' <span class="label label-warning">A</span>' IF NOT row.active %]
</td>
[% IF params.stamps %]
<td>[% row.time_first_stamp %]</td>
@@ -68,7 +68,7 @@
<td>Switch Port</td>
<td><a href="[% uri_for('/device') %]?tab=ports&q=[% node.switch | url %]&f=[% node.port | url %]">[% node.switch %] [ [% node.port %] ]</a>
[% ' (' _ node.device.dns.remove(settings.domain_suffix) _ ')' IF node.device.dns %]
[% ' <span class="label warning">a</span>' IF NOT node.active %]
[% ' <span class="label label-warning">A</span>' IF NOT node.active %]
</td>
[% IF params.stamps %]
<td>[% node.time_first_stamp %]</td>

2
Netdisco/views/index.tt
View File

@@ -45,7 +45,7 @@
<div class="form-horizontal">
<input placeholder="Username" class="span2" name="username" type="text"/>
<input placeholder="Password" class="span2" name="password" type="password"/>
<button type="submit" class="btn info">Log In</button>
<button type="submit" class="btn btn-info">Log In</button>
</div>
[% IF vars.requested_path %]
<input type="hidden" name="path" value="[% vars.requested_path %]"/>

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

@@ -5,45 +5,46 @@
<a class="field_clear_icon" href="#"
rel="tooltip" data-placement="top" data-offset="3" title="Show all Ports">
<img src="[% uri_base %]/images/tango_sweep.png"/></a>
<input class="nd_port_query span3" placeholder="Port, Name or VLAN"
<input class="nd_port_query" placeholder="Port, Name or VLAN"
name="f" value="[% params.f %]" type="text"
rel="tooltip" data-placement="left" data-offset="5" title="Filter by Port, Name or VLAN"/>
</div>
<div class="clearfix">
<a href="#" id="nd_collapse_legend"><label>Legend</label></a>
<ul class="inputs-list unstyled nd_collapse_pre_hidden">
<ul class="inputs-list unstyled nd_legend nd_collapse_pre_hidden">
<li>
<span class="label">s</span>&nbsp; Admin Disabled
<span class="label">S</span>&nbsp; Admin Disabled
</li>
<li>
<span class="label warning">d</span>&nbsp; Link Down
<span class="label label-warning">D</span>&nbsp; Link Down
</li>
<li>
<span class="label success">f</span>&nbsp; Port Free (Down)
<span class="label label-success">F</span>&nbsp; Port Free (Down)
</li>
<li>
<span class="label notice">b</span>&nbsp; Blocking
<span class="label label-info">B</span>&nbsp; Blocking
</li>
<li>
<span class="label">p</span>&nbsp; IP Phone
<span class="label">P</span>&nbsp; IP Phone
</li>
<li>
<span class="label important">n</span>&nbsp; Neighbor Inacessible
<span class="label label-important">N</span>&nbsp; Neighbor Inacessible
</li>
<li>
<span class="label warning">a</span>&nbsp; Archived Data
<span class="label label-warning">A</span>&nbsp; Archived Data
</li>
</ul>
</div>
<div class="clearfix">
<a href="#" id="nd_collapse_columns"><label>Display Columns</label></a>
<div class="input nd_collapse_pre_hidden">
<ul class="inputs-list">
<div class="nd_collapse_pre_hidden">
<ul class="inputs-list unstyled">
[% FOREACH item IN vars.port_columns %]
<li>
<label>
<input type="checkbox" id="[% item.name %]" name="[% item.name %]"[% ' checked="checked"' IF params.${item.name} %] />
<span>[% item.label %]</span>
<label class="checkbox">
<input type="checkbox" id="[% item.name %]"
name="[% item.name %]"[% ' checked="checked"' IF params.${item.name} %] />
[% item.label %]
</label>
</li>
[% END %]
@@ -52,17 +53,19 @@
</div>
<div class="clearfix">
<a href="#" id="nd_collapse_portprop"><label>Port Properties</label></a>
<div class="input nd_collapse_pre_hidden">
<ul class="inputs-list">
<div class="nd_collapse_pre_hidden">
<ul class="inputs-list unstyled">
<li>
<label>
<input type="checkbox" id="free" name="free"[% ' checked="checked"' IF params.free %]/>
<span>Only Show Free Ports</span>
<label class="checkbox">
<input type="checkbox" id="free"
name="free"[% ' checked="checked"' IF params.free %]/>
Only Show Free Ports
</label>
</li>
<p></p>
<li>
<span rel="tooltip" data-placement="left" data-offset="5" title="Free if Down for this period of time">
<span rel="tooltip" data-placement="left"
data-offset="5" title="Free if Down for this period of time">
<select class="nd_days_select" name="age_num"/>
[% SET count = 1 %]
[% WHILE count < 32 %]
@@ -82,17 +85,18 @@
</div>
<div class="clearfix">
<a href="#" id="nd_collapse_nodeprop"><label>Node Properties</label></a>
<div class="input nd_collapse_pre_hidden">
<ul class="inputs-list">
<div class="nd_collapse_pre_hidden">
<ul class="inputs-list unstyled">
[% FOREACH item IN vars.connected_properties %]
<li>
<label>
<input type="checkbox" id="[% item.name %]" name="[% item.name %]"[% ' checked="checked"' IF params.${item.name} %] />
<span>[% item.label %]</span>
<label class="checkbox">
<input type="checkbox" id="[% item.name %]"
name="[% item.name %]"[% ' checked="checked"' IF params.${item.name} %] />
[% item.label %]
</label>
</li>
[% END %]
</ul>
</div>
</div>
<button id="[% tab.id %]_submit" type="submit" class="btn info span3">Update View</button>
<button id="[% tab.id %]_submit" type="submit" class="btn btn-info">Update View</button>

2
Netdisco/views/sidebar/search/device.tt
View File

@@ -61,4 +61,4 @@
<span class="nd_searchcheckbox uneditable-input">Match All Options</span>
</label>
</div>
<button id="[% tab.id %]_submit" type="submit" class="btn info span3">Search Again</button>
<button id="[% tab.id %]_submit" type="submit" class="btn btn-info span3">Search Again</button>

5
Netdisco/views/sidebar/search/node.tt
View File

@@ -22,7 +22,8 @@
<input type="checkbox" id="archived" name="archived"[% ' checked="checked"' IF params.archived %]/>
</label>
<label for="archived">
<span class="nd_searchcheckbox uneditable-input">Archived Data <span class="nd_legendlabel label warning">a</span></span>
<span class="nd_searchcheckbox uneditable-input">Archived Data <span class="nd_legendlabel
label label-warning">A</span></span>
</label>
</div>
[% IF vars.node_ip_has_dns_col %]
@@ -35,4 +36,4 @@
</label>
</div>
[% END %]
<button id="[% tab.id %]_submit" type="submit" class="btn info span3">Search Again</button>
<button id="[% tab.id %]_submit" type="submit" class="btn btn-info span3">Search Again</button>