From 5557811aeb8de65448ad446705df9531adcd1647 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Mon, 13 Jan 2014 00:38:18 +0000
Subject: [PATCH] fix icon placement in editable device port cells

---
 Netdisco/share/public/css/netdisco.css                   | 9 +++++++--
 .../share/public/javascripts/netdisco_portcontrol.js     | 6 ++++--
 Netdisco/share/views/ajax/device/ports.tt                | 8 ++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Netdisco/share/public/css/netdisco.css b/Netdisco/share/public/css/netdisco.css
index a29e2736..ffc63734 100644
--- a/Netdisco/share/public/css/netdisco.css
+++ b/Netdisco/share/public/css/netdisco.css
@@ -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;
@@ -265,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 {
diff --git a/Netdisco/share/public/javascripts/netdisco_portcontrol.js b/Netdisco/share/public/javascripts/netdisco_portcontrol.js
index dd810a27..9426d46e 100644
--- a/Netdisco/share/public/javascripts/netdisco_portcontrol.js
+++ b/Netdisco/share/public/javascripts/netdisco_portcontrol.js
@@ -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
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index a8451d8d..9276a4a1 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -75,11 +75,11 @@
       [% 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/>
           <a class="nd_this-port-only" href="[% uri_for('/device',