From e45fa89c44ea75196e65b6914a659ddc501fca95 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 24 Jun 2014 22:42:45 +0100 Subject: [PATCH] css for configuration pane --- .../lib/App/Netdisco/Manual/Configuration.pod | 2 +- Netdisco/share/public/css/netdisco.css | 21 +++++++++++++++++-- .../javascripts/netdisco_portcontrol.js | 2 +- Netdisco/share/views/ajax/device/ports.tt | 4 ++-- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod index 6e137e44..e5be873c 100644 --- a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod +++ b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod @@ -598,7 +598,7 @@ token-ring-default,fddinet-default,trnet-default. On some devices, per-VLAN macsuck will timeout with specific VLAN numbers. You can put those numbers (or their names) into this list to have them skipped. -=head3 C +=head3 C Value: List of "IP:vlan-number" or "IP:vlan-name". Default: Empty List. diff --git a/Netdisco/share/public/css/netdisco.css b/Netdisco/share/public/css/netdisco.css index 8c6edcc1..0960d61a 100644 --- a/Netdisco/share/public/css/netdisco.css +++ b/Netdisco/share/public/css/netdisco.css @@ -176,6 +176,11 @@ div.content > div.tab-content table.nd_floatinghead thead { padding-left: 25px; } +.table .nd_icon-right { + margin-right: 18px; + z-index: 1; +} + /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* styles to position table cell content */ @@ -283,8 +288,8 @@ td > form.nd_inline-form { color: black; } -/* port power control */ -.nd_power-icon { +/* port power control and help icon */ +.nd_pointer-icon { cursor: pointer; } @@ -345,6 +350,18 @@ td > form.nd_inline-form { color: #555; } +.nd_help-left { + float: left; + margin-top: -1px; + margin-left: -24px; + cursor: pointer; + color: #999; +} + +.nd_text-icon-right { + padding-right: 30px !important; +} + /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* styles for sidebar placement and sizing */ diff --git a/Netdisco/share/public/javascripts/netdisco_portcontrol.js b/Netdisco/share/public/javascripts/netdisco_portcontrol.js index e05eca43..add009c8 100644 --- a/Netdisco/share/public/javascripts/netdisco_portcontrol.js +++ b/Netdisco/share/public/javascripts/netdisco_portcontrol.js @@ -118,7 +118,7 @@ $(document).ready(function() { }); // activity for port up/down control, power enable/disable control - $('#ports_pane').on('click', '.icon-hand-up,.icon-hand-down,.nd_power-icon', function() { + $('#ports_pane').on('click', '.icon-hand-up,.icon-hand-down,.nd_pointer-icon', function() { var clicked = this; // create a closure $('#nd_portlog').one('hidden', function() { port_control(clicked); // save diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt index b1cfbbd0..a0221dd3 100644 --- a/Netdisco/share/views/ajax/device/ports.tt +++ b/Netdisco/share/views/ajax/device/ports.tt @@ -204,7 +204,7 @@ data-field="c_power" data-for-device="[% device.ip | html_entity %]" data-for-port="[% row.port | html_entity %]"> - [% ELSE %] @@ -224,7 +224,7 @@ data-field="c_power" data-for-device="[% device.ip | html_entity %]" data-for-port="[% row.port | html_entity %]"> - [% ELSE %]