From 7652bd74389f39f6702d121120abe1c6c661fe8e Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sun, 9 Dec 2012 21:34:03 +0000 Subject: [PATCH] port up and down control now updates table details also update tooltip for sidebar pin icon depending on state --- Netdisco/public/css/netdisco.css | 9 ++++-- Netdisco/public/javascripts/netdisco.js | 8 ++++++ .../javascripts/netdisco_portcontrol.js | 28 +++++++++++++------ Netdisco/views/ajax/device/details.tt | 8 +++--- Netdisco/views/ajax/device/ports.tt | 4 +-- Netdisco/views/device.tt | 6 ++-- Netdisco/views/search.tt | 6 ++-- Netdisco/views/sidebar/device/ports.tt | 9 ++++-- Netdisco/views/sidebar/search/device.tt | 16 +++++------ 9 files changed, 60 insertions(+), 34 deletions(-) diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/public/css/netdisco.css index f6d82e21..8af0ac39 100644 --- a/Netdisco/public/css/netdisco.css +++ b/Netdisco/public/css/netdisco.css @@ -268,9 +268,12 @@ form .clearfix.success input { background-color: #A9DBA9; } -/* a little whitespace between legend items */ -.nd_legend li { - line-height: 19px; +/* when we use font-awesome icons, override the size */ +#nd_legend i { + width: 9px; +} +.table-bordered i { + width: 9px; } /* bring sidebar items closer together */ diff --git a/Netdisco/public/javascripts/netdisco.js b/Netdisco/public/javascripts/netdisco.js index ef60a597..c5c5351d 100644 --- a/Netdisco/public/javascripts/netdisco.js +++ b/Netdisco/public/javascripts/netdisco.js @@ -158,7 +158,15 @@ $(document).ready(function() { $('.sidebar_pin').click(function() { $('.sidebar').toggleClass('sidebar_pinned'); $('.sidebar_pin').toggleClass('sidebar_pin_clicked'); + // update tooltip note for current state + if ($('.sidebar_pin').hasClass('sidebar_pin_clicked')) { + $('.sidebar_pin').first().data('tooltip').options.title = 'Unpin Sidebar'; + } + else { + $('.sidebar_pin').first().data('tooltip').options.title = 'Pin Sidebar'; + } }); + // sidebar toggle - trigger in/out on image click() $('#sidebar_toggle_img_in').click(function() { $('.sidebar').toggle(250); diff --git a/Netdisco/public/javascripts/netdisco_portcontrol.js b/Netdisco/public/javascripts/netdisco_portcontrol.js index aa88dfee..145db5fc 100644 --- a/Netdisco/public/javascripts/netdisco_portcontrol.js +++ b/Netdisco/public/javascripts/netdisco_portcontrol.js @@ -6,14 +6,30 @@ function port_control (e) { type: 'POST' ,url: uri_base + '/ajax/portcontrol' ,data: { - device: td.data('for-device') - ,port: td.data('for-port') - ,field: td.data('field') - ,action: td.data('action') + device: td.attr('data-for-device') + ,port: td.attr('data-for-port') + ,field: td.attr('data-field') + ,action: td.attr('data-action') ,value: td.text().trim() } ,success: function() { toastr.info('Submitted change request'); + + // update all the screen furniture for port up/down control + if ($.trim(td.attr('data-action')) == 'down') { + td.prev('td').html('S'); + $(e).toggleClass('icon-hand-down'); + $(e).toggleClass('icon-hand-up'); + $(e).data('tooltip').options.title = 'Click to Enable'; + td.attr('data-action', 'up'); + } + else if ($.trim(td.attr('data-action')) == 'up') { + td.prev('td').html(''); + $(e).toggleClass('icon-hand-up'); + $(e).toggleClass('icon-hand-down'); + $(e).data('tooltip').options.title = 'Click to Disable'; + td.attr('data-action', 'down'); + } } ,error: function() { toastr.error('Failed to submit change request'); @@ -28,16 +44,12 @@ function port_control (e) { $.ajax({ url: uri_base + '/ajax/userlog' ,success: function(data) { - // console.log(data); - for (var i = 0; i < data['error'].length; i++) { toastr.error(data['error'][i], 'Failed Change Request'); } - for (var i = 0; i < data['done'].length; i++) { toastr.success(data['done'][i], 'Successful Change Request'); } - // Schedule next request when the current one's complete setTimeout(worker, 5000); } diff --git a/Netdisco/views/ajax/device/details.tt b/Netdisco/views/ajax/device/details.tt index 57738dda..5fa54ab8 100644 --- a/Netdisco/views/ajax/device/details.tt +++ b/Netdisco/views/ajax/device/details.tt @@ -17,7 +17,7 @@ [% ELSE %] - [% d.location %] [% END %] @@ -40,10 +40,10 @@ Vendor / Model - [% d.vendor %] / - [% d.model %] @@ -51,7 +51,7 @@ OS / Version [% d.os %] / [% d.os_ver %] diff --git a/Netdisco/views/ajax/device/ports.tt b/Netdisco/views/ajax/device/ports.tt index 51071714..a4dd534f 100644 --- a/Netdisco/views/ajax/device/ports.tt +++ b/Netdisco/views/ajax/device/ports.tt @@ -32,13 +32,13 @@ data-field="c_port" data-for-device="[% device %]" data-for-port="[% row.port | html_entity %]"> + data-animation="" data-title="Click to Disable"> [% ELSE %] + data-animation="" data-title="Click to Enable"> [% END %] [% ELSE %] diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt index 50e15796..99f889c2 100644 --- a/Netdisco/views/device.tt +++ b/Netdisco/views/device.tt @@ -1,5 +1,5 @@ + rel="tooltip" data-placement="left" data-offset="5" data-title="Show Sidebar">
+ rel="tooltip" data-placement="left" data-offset="5" data-title="Hide Sidebar"> + rel="tooltip" data-placement="left" data-offset="5" data-title="Unpin Sidebar">
[% FOREACH tab IN vars.tabs %]