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

Merge branch 'master' into em-device-ports-json

Browse Source
This commit is contained in:
Oliver Gorwits
2014-10-11 12:03:36 +01:00
parent 97d1232860 d2dbaf416b
commit df6f2dc3c7
33 changed files with 434 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Netdisco/share/views/ajax/device/details.tt
View File

@@ -80,6 +80,17 @@
[% END %]
</tr>
[% END %]
<tr>
<td>Administration</td>
<td>
<a href="ssh://[% d.ip | html_entity %]" target="_blank">
<span class="label label-info"><i class="icon-keyboard"></i> SSH</span></a>
<a href="telnet://[% d.ip | html_entity %]" target="_blank">
<span class="label label-info"><i class="icon-keyboard"></i> Telnet</span></a>
<a href="https://[% d.ip | html_entity %]/" target="_blank">
<span class="label label-info"><i class="icon-external-link"></i> Web</span></a>
</td>
</tr>
<tr>
<td>Uptime</td>
<td>[% d.uptime_age | html_entity %]</td>

2
Netdisco/share/views/ajax/report/devicebylocation.tt
View File

@@ -48,7 +48,7 @@ $(document).ready(function() {
return '<a href="[% search_device %]&q=' + encodeURIComponent(data) + '&model=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>';
}
}
].
],
[% INCLUDE 'ajax/datatabledefaults.tt' -%]
});