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

apply z-index fix to all modals

Browse Source
This commit is contained in:
Oliver Gorwits
2013-09-10 22:15:29 +01:00
parent 3334095c19
commit 1aa97d08ba
7 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Netdisco/share/public/javascripts/netdisco.js
View File

@@ -235,4 +235,13 @@ $(document).ready(function() {
to_id.replace(/^#/,"").replace(/_pane$/,"") 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');
});
}); });

2
Netdisco/share/views/ajax/admintask/pseudodevice.tt
View File

@@ -34,7 +34,7 @@
<button class="btn" data-toggle="modal" <button class="btn" data-toggle="modal"
data-target="#nd_devdel-[% count %]" type="button"><i class="icon-trash text-error"></i></button> 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"> role="dialog" aria-labelledby="nd_devdel-label-[% count %]" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>

2
Netdisco/share/views/ajax/admintask/topology.tt
View File

@@ -53,7 +53,7 @@
<button class="btn" data-toggle="modal" <button class="btn" data-toggle="modal"
data-target="#nd_devdel-[% count %]" type="button"><i class="icon-trash text-error"></i></button> 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"> role="dialog" aria-labelledby="nd_devdel-label-[% count %]" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>

2
Netdisco/share/views/ajax/admintask/users.tt
View File

@@ -52,7 +52,7 @@
<button class="btn" data-toggle="modal" <button class="btn" data-toggle="modal"
data-target="#nd_devdel-[% count %]" type="button"><i class="icon-trash text-error"></i></button> 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"> role="dialog" aria-labelledby="nd_devdel-label-[% count %]" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>

2
Netdisco/share/views/ajax/device/details.tt
View File

@@ -108,7 +108,7 @@
<button class="btn btn-danger btn-small pull-right" <button class="btn btn-danger btn-small pull-right"
data-toggle="modal" data-target="#nd_devdel" type="button">Delete</button> 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"> role="dialog" aria-labelledby="nd_devdel-label" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>

1
Netdisco/share/views/js/admintask.js
View File

@@ -168,5 +168,4 @@
} }
}); });
}); });
}); });

9
Netdisco/share/views/js/device.js
View File

@@ -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 // clear any values in the delete confirm dialog
$('#details_pane').on('hidden', '.nd_modal', function () { $('#details_pane').on('hidden', '.nd_modal', function () {
$('#nd_devdel-log').val(''); $('#nd_devdel-log').val('');