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

cosmetic fixes

Browse Source
This commit is contained in:
Oliver Gorwits
2014-08-18 19:08:14 +01:00
parent f62646bbe4
commit 64f779e569
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Netdisco/share/views/ajax/device/ports.tt
View File

@@ -373,7 +373,7 @@ $(document).ready(function() {
if (row.manual_topo) { if (row.manual_topo) {
cell_str = cell_str + ' text-warning'; cell_str = cell_str + ' text-warning';
} }
cell_str = cell_str + '"></i>'; cell_str = cell_str + '"></i>&nbsp;';
if (row.remote_type && row.remote_type.match(/ip.phone/i)) { if (row.remote_type && row.remote_type.match(/ip.phone/i)) {
cell_str = cell_str + '<i class="icon-phone"></i>&nbsp;'; cell_str = cell_str + '<i class="icon-phone"></i>&nbsp;';
} }
@@ -447,7 +447,9 @@ $(document).ready(function() {
} }
if (row.nodes[index].active === 0) { if (row.nodes[index].active === 0) {
[% IF params.n_archived %] [% IF params.n_archived %]
if (index > 0 && row.nodes[index - 1].active) {
cell_str = cell_str + '<br/>'; cell_str = cell_str + '<br/>';
}
cell_str = cell_str + '<i class="icon-book"></i>&nbsp; '; cell_str = cell_str + '<i class="icon-book"></i>&nbsp; ';
[% ELSE %] [% ELSE %]
continue; continue;
@@ -466,6 +468,15 @@ $(document).ready(function() {
var fmac = formatMacAddress(row.nodes[index].mac, macfmt); var fmac = formatMacAddress(row.nodes[index].mac, macfmt);
cell_str = cell_str + encodeURIComponent(fmac) + '">'; cell_str = cell_str + encodeURIComponent(fmac) + '">';
cell_str = cell_str + he.encode(fmac) + '</a>'; cell_str = cell_str + he.encode(fmac) + '</a>';
[% IF params.n_vendor %]
if (row.nodes[index].abbrev) {
cell_str = cell_str + ' (';
cell_str = cell_str + '<a href="[%+ uri_for('/report/nodevendor') %]?vendor=';
cell_str = cell_str + encodeURIComponent(row.nodes[index].abbrev) + '">';
cell_str = cell_str + he.encode(row.nodes[index].abbrev || '') + '</a>';
cell_str = cell_str + ')';
}
[% END %]
if (row.nodes[index].vlans.length > 0) { if (row.nodes[index].vlans.length > 0) {
var vl = row.nodes[index].vlans ? row.nodes[index].vlans.join(", ") : ""; var vl = row.nodes[index].vlans ? row.nodes[index].vlans.join(", ") : "";
cell_str = cell_str + ' (on vlan '; cell_str = cell_str + ' (on vlan ';
@@ -483,21 +494,12 @@ $(document).ready(function() {
cell_str = cell_str + ')'; cell_str = cell_str + ')';
} }
[% END %] [% END %]
[% IF params.n_vendor %]
if (row.nodes[index].abbrev) {
cell_str = cell_str + '(Vendor: ';
cell_str = cell_str + '<a href="[%+ uri_for('/report/nodevendor') %]?vendor=';
cell_str = cell_str + encodeURIComponent(row.nodes[index].abbrev) + '">';
cell_str = cell_str + he.encode(row.nodes[index].abbrev || '') + '</a>';
cell_str = cell_str + ')';
}
[% END %]
[% IF params.n_age %] [% IF params.n_age %]
cell_str = cell_str + ' ( '; cell_str = cell_str + ' (';
var now = moment(); var now = moment();
var t_last = moment(row.nodes[index].time_last); var t_last = moment(row.nodes[index].time_last);
cell_str = cell_str + t_last.from(now); cell_str = cell_str + t_last.from(now);
cell_str = cell_str + ' )'; cell_str = cell_str + ')';
[% END %] [% END %]
[% IF params.n_ip %] [% IF params.n_ip %]
if (row.nodes[index].ip && row.nodes[index].ip.length > 0) { if (row.nodes[index].ip && row.nodes[index].ip.length > 0) {