From 1aa97d08bae48066db0bcb7057670cebff36de3d Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Tue, 10 Sep 2013 22:15:29 +0100
Subject: [PATCH] apply z-index fix to all modals

---
 Netdisco/share/public/javascripts/netdisco.js       | 9 +++++++++
 Netdisco/share/views/ajax/admintask/pseudodevice.tt | 2 +-
 Netdisco/share/views/ajax/admintask/topology.tt     | 2 +-
 Netdisco/share/views/ajax/admintask/users.tt        | 2 +-
 Netdisco/share/views/ajax/device/details.tt         | 2 +-
 Netdisco/share/views/js/admintask.js                | 1 -
 Netdisco/share/views/js/device.js                   | 9 ---------
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Netdisco/share/public/javascripts/netdisco.js b/Netdisco/share/public/javascripts/netdisco.js
index 5f6eb821..42be2719 100644
--- a/Netdisco/share/public/javascripts/netdisco.js
+++ b/Netdisco/share/public/javascripts/netdisco.js
@@ -235,4 +235,13 @@ $(document).ready(function() {
       to_id.replace(/^#/,"").replace(/_pane$/,"")
     );
   });
+
+  // bootstrap modal mucks about with mouse actions on higher elements
+  // so need to bury and raise it when needed
+  $('.tab-pane').on('show', '.nd_modal', function () {
+    $(this).toggleClass('nd_deep-horizon');
+  });
+  $('.tab-pane').on('hidden', '.nd_modal', function () {
+    $(this).toggleClass('nd_deep-horizon');
+  });
 });
diff --git a/Netdisco/share/views/ajax/admintask/pseudodevice.tt b/Netdisco/share/views/ajax/admintask/pseudodevice.tt
index 0e4ad990..38b63c93 100644
--- a/Netdisco/share/views/ajax/admintask/pseudodevice.tt
+++ b/Netdisco/share/views/ajax/admintask/pseudodevice.tt
@@ -34,7 +34,7 @@
         <button class="btn" data-toggle="modal"
           data-target="#nd_devdel-[% count %]" type="button"><i class="icon-trash text-error"></i></button>
 
-        <div id="nd_devdel-[% count %]" class="nd_modal modal hide fade" tabindex="-1"
+        <div id="nd_devdel-[% count %]" class="nd_modal nd_deep-horizon modal hide fade" tabindex="-1"
           role="dialog" aria-labelledby="nd_devdel-label-[% count %]" aria-hidden="true">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
diff --git a/Netdisco/share/views/ajax/admintask/topology.tt b/Netdisco/share/views/ajax/admintask/topology.tt
index 57d3e45c..22ce1746 100644
--- a/Netdisco/share/views/ajax/admintask/topology.tt
+++ b/Netdisco/share/views/ajax/admintask/topology.tt
@@ -53,7 +53,7 @@
         <button class="btn" data-toggle="modal"
           data-target="#nd_devdel-[% count %]" type="button"><i class="icon-trash text-error"></i></button>
 
-        <div id="nd_devdel-[% count %]" class="nd_modal modal hide fade" tabindex="-1"
+        <div id="nd_devdel-[% count %]" class="nd_modal nd_deep-horizon modal hide fade" tabindex="-1"
           role="dialog" aria-labelledby="nd_devdel-label-[% count %]" aria-hidden="true">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
diff --git a/Netdisco/share/views/ajax/admintask/users.tt b/Netdisco/share/views/ajax/admintask/users.tt
index e122af39..a20588c1 100644
--- a/Netdisco/share/views/ajax/admintask/users.tt
+++ b/Netdisco/share/views/ajax/admintask/users.tt
@@ -52,7 +52,7 @@
         <button class="btn" data-toggle="modal"
           data-target="#nd_devdel-[% count %]" type="button"><i class="icon-trash text-error"></i></button>
 
-        <div id="nd_devdel-[% count %]" class="nd_modal modal hide fade" tabindex="-1"
+        <div id="nd_devdel-[% count %]" class="nd_modal nd_deep-horizon modal hide fade" tabindex="-1"
           role="dialog" aria-labelledby="nd_devdel-label-[% count %]" aria-hidden="true">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
diff --git a/Netdisco/share/views/ajax/device/details.tt b/Netdisco/share/views/ajax/device/details.tt
index be3e0c05..0d52e979 100644
--- a/Netdisco/share/views/ajax/device/details.tt
+++ b/Netdisco/share/views/ajax/device/details.tt
@@ -108,7 +108,7 @@
         <button class="btn btn-danger btn-small pull-right"
           data-toggle="modal" data-target="#nd_devdel" type="button">Delete</button>
 
-        <div id="nd_devdel" class="nd_modal modal hide fade" tabindex="-1"
+        <div id="nd_devdel" class="nd_modal nd_deep-horizon modal hide fade" tabindex="-1"
           role="dialog" aria-labelledby="nd_devdel-label" aria-hidden="true">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
diff --git a/Netdisco/share/views/js/admintask.js b/Netdisco/share/views/js/admintask.js
index 2c4da17a..5ee762ce 100644
--- a/Netdisco/share/views/js/admintask.js
+++ b/Netdisco/share/views/js/admintask.js
@@ -168,5 +168,4 @@
         }
       });
     });
-
   });
diff --git a/Netdisco/share/views/js/device.js b/Netdisco/share/views/js/device.js
index bb46ef13..0900ef8a 100644
--- a/Netdisco/share/views/js/device.js
+++ b/Netdisco/share/views/js/device.js
@@ -119,15 +119,6 @@
       });
     });
 
-    // bootstrap modal mucks about with mouse actions on higher elements
-    // so need to bury and raise it when needed
-    $('#ports_pane').on('show', '.nd_modal', function () {
-      $(this).toggleClass('nd_deep-horizon');
-    });
-    $('#ports_pane').on('hidden', '.nd_modal', function () {
-      $(this).toggleClass('nd_deep-horizon');
-    });
-
     // clear any values in the delete confirm dialog
     $('#details_pane').on('hidden', '.nd_modal', function () {
       $('#nd_devdel-log').val('');