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

Merge branch 'og-agg' of ssh://olly_g@git.code.sf.net/p/netdisco/netdisco-ng into og-agg

Browse Source
This commit is contained in:
Oliver Gorwits
2014-01-13 09:03:02 +00:00
parent 6620a03686 5557811aeb
commit 9fe92fb5e8
4 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Netdisco/share/public/css/netdisco.css
View File

@@ -158,9 +158,14 @@ div.content > div.tab-content table.nd_floatinghead thead {
/* nudge cell content to the right when port_control controls are enabled */
.nd_editable-cell > .nd_this-port-only {
margin-left: 18px;
margin-right: 18px;
}
.nd_editable-cell > .nd_port-only-first {
margin-left: 9px;
}
.nd_editable-cell > .nd_editable-cell-content {
margin-left: 18px;
margin-right: 18px;
}
.table .nd_nudge-for-icon {
padding-left: 25px;
@@ -177,6 +182,10 @@ div.content > div.tab-content table.nd_floatinghead thead {
text-align: center;
}
td.nd_devport-icon i {
line-height: 18px;
}
/* undo nd_center-cell when in a modial dialog (which lives in table cell) */
.table .nd_center-cell .modal-body {
text-align: left;
@@ -261,7 +270,7 @@ td > form.nd_inline-form {
cursor: pointer;
color: black;
float: left;
display: none;
visibility: hidden;
margin-top: 3px;
}
.nd_log-icon:hover, .nd_log-icon:focus {

6
Netdisco/share/public/javascripts/netdisco_portcontrol.js
View File

@@ -92,14 +92,16 @@ $(document).ready(function() {
// toggle visibility of port up/down and edit controls
$('.tab-content').on('mouseenter', '.nd_editable-cell', function() {
$(this).children('.nd_hand-icon,.nd_log-icon').show();
$(this).children('.nd_hand-icon').show();
$(this).children('.nd_log-icon').css('visibility', 'visible');
if (! $(this).is(':focus')) {
$(this).children('.nd_edit-icon').show(); // ports
$(this).siblings('td').find('.nd_device-details-edit').show(); // details
}
});
$('.tab-content').on('mouseleave', '.nd_editable-cell', function() {
$(this).children('.nd_hand-icon,.nd_log-icon').hide();
$(this).children('.nd_hand-icon').hide();
$(this).children('.nd_log-icon').css('visibility', 'hidden');
if (! $(this).is(':focus')) {
$(this).children('.nd_edit-icon').hide(); // ports
$(this).siblings('td').find('.nd_device-details-edit').hide(); // details

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

@@ -17,7 +17,7 @@
</tbody>
[% FOREACH row IN results %]
<tr>
<td class="nd_center-cell">
<td class="nd_center-cell nd_devport-icon">
[% IF row.up_admin != 'up' %]
<i class="icon-remove"></i>
[% ELSIF row.stp == 'blocking' %]
@@ -29,6 +29,15 @@
[% ELSE %]
<i class="icon-angle-up text-success"></i>
[% END %]
[% IF row.slave_of %]<br/>
[% IF row.get_column('agg_master_up_admin') != 'up' %]
<small><i class="icon-group muted"></i></small>
[% ELSIF row.get_column('agg_master_up') == 'up' %]
<small><i class="icon-group text-success"></i></small>
[% ELSE %]
<small><i class="icon-group text-error"></i></small>
[% END %]
[% END %]
</td>
[% FOREACH config IN settings._extra_device_port_cols %]
@@ -66,20 +75,13 @@
[% ELSE %]
<td nowrap>
[% END %]
[% IF row.is_master %]
<small><i class="icon-group muted"></i></small>
[% END %]
<a class="nd_this-port-only" href="[% uri_for('/device',
<a class="nd_this-port-only nd_port-only-first" href="[% uri_for('/device',
self_options) %]&q=[% params.q | uri %]&f=[% row.port | uri %]&prefer=port">
[% IF row.is_master %]
<small><i class="icon-group muted"></i></small>&nbsp;
[% END %]
[% row.port | html_entity %]</a>
[% IF row.slave_of %]<br/>
[% IF row.get_column('agg_master_up_admin') != 'up' %]
<small><i class="icon-group muted"></i></small>
[% ELSIF row.get_column('agg_master_up') == 'up' %]
<small><i class="icon-group text-success"></i></small>
[% ELSE %]
<small><i class="icon-group text-error"></i></small>
[% END %]
<a class="nd_this-port-only" href="[% uri_for('/device',
self_options) %]&q=[% params.q | uri %]&f=[% row.slave_of | uri %]&prefer=port">
[% row.slave_of | html_entity %]</a>

2
Netdisco/share/views/sidebar/device/ports.tt
View File

@@ -43,7 +43,7 @@
<li><i class="icon-li icon-phone"></i>&nbsp; IP Phone</li>
<li><i class="icon-li icon-signal"></i>&nbsp; Wireless Client</li>
<li><i class="icon-li icon-book"></i>&nbsp; Archived Data</li>
<li><i class="icon-li icon-group"></i>&nbsp; Aggregate Master</li>
<li><i class="icon-li icon-group"></i>&nbsp; Link Aggregate</li>
[% IF user_has_role('port_control') %]
<li><i class="icon-li icon-refresh icon-spin"></i>&nbsp; Click "Update View"</li>
[% END %]