From baed101ef15f393b274a2cc73c6ceae86f76a6e1 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <Jonny.Wong.16@gmail.com>
Date: Fri, 13 May 2016 22:05:54 -0700
Subject: [PATCH] Fix all confirm modal dialogues

---
 data/interfaces/default/edit_user.html       | 20 ++++++++++----------
 data/interfaces/default/history.html         |  6 +++---
 data/interfaces/default/info.html            |  6 +++---
 data/interfaces/default/libraries.html       |  6 +++---
 data/interfaces/default/library.html         |  6 +++---
 data/interfaces/default/update_metadata.html |  6 +++---
 data/interfaces/default/user.html            |  6 +++---
 data/interfaces/default/users.html           |  6 +++---
 8 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/data/interfaces/default/edit_user.html b/data/interfaces/default/edit_user.html
index 1ba3f645..d912a788 100644
--- a/data/interfaces/default/edit_user.html
+++ b/data/interfaces/default/edit_user.html
@@ -90,7 +90,7 @@ DOCUMENTATION :: END
         </div>
     </div>
 </div>
-<div id="confirm-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+<div id="confirm-modal-purge" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-purge">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
@@ -145,8 +145,8 @@ DOCUMENTATION :: END
     });
 
     $("#delete-all-history").on('click', function() {
-        $('#confirm-modal').modal();
-        $('#confirm-modal').one('click', '#confirm-purge', function () {
+        $('#confirm-modal-purge').modal();
+        $('#confirm-modal-purge').one('click', '#confirm-purge', function () {
             $.ajax({
                 url: 'delete_all_user_history',
                 data: { user_id: '${data["user_id"]}' },
@@ -160,28 +160,28 @@ DOCUMENTATION :: END
     });
         
     $(document).ready(function() {
-        // Move #confirm-modal to parent container
-        if(!($('#edit-user-modal').next().is('#confirm-modal'))) {
-            $('#confirm-modal').appendTo($('#edit-user-modal').parent());
+        // Move #confirm-modal-purge to parent container
+        if (!($('#edit-user-modal').next().is('#confirm-modal-purge'))) {
+            $('#confirm-modal-purge').appendTo($('#edit-user-modal').parent());
         }
-        $('#edit-user-modal > #confirm-modal').remove();
+        $('#edit-user-modal > #confirm-modal-purge').remove();
 
         $('#edit-user-modal').css('z-index', '1050');
         $('.modal-backdrop').not('.modal-backdrop-stack').css('z-index', '1049');
         $('.modal-backdrop').not('.modal-backdrop-stack').addClass('modal-backdrop-stack');
 
-        $('#confirm-modal').on('show.bs.modal', function () {
+        $('#confirm-modal-purge').on('show.bs.modal', function () {
             // Fix position to match parent modal
             var currentPadding = parseInt($('body').css('padding-right'));
             $(this).children('.modal-dialog').css('left', -currentPadding/2);
             $('#edit-user-modal').css('overflow-y', 'hidden');
         });
-        $('#confirm-modal').on('shown.bs.modal', function () {
+        $('#confirm-modal-purge').on('shown.bs.modal', function () {
             $(this).css('z-index', '1060');
             $('.modal-backdrop').not('.modal-backdrop-stack').css('z-index', '1059');
             $('.modal-backdrop').not('.modal-backdrop-stack').addClass('modal-backdrop-stack'); 
         });
-        $('#confirm-modal').on('hidden.bs.modal', function() {
+        $('#confirm-modal-purge').on('hidden.bs.modal', function () {
             $('body').addClass('modal-open');
             $('#edit-user-modal').css('overflow-y', 'auto');
         });
diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html
index 1ba96806..bcc9898f 100644
--- a/data/interfaces/default/history.html
+++ b/data/interfaces/default/history.html
@@ -73,7 +73,7 @@
         </div>
         <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
         </div>
-        <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+        <div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
@@ -164,8 +164,8 @@
             if ($(this).hasClass('active')) {
                 if (history_to_delete.length > 0) {
                     $('#deleteCount').text(history_to_delete.length);
-                    $('#confirm-modal').modal();
-                    $('#confirm-modal').one('click', '#confirm-delete', function () {
+                    $('#confirm-modal-delete').modal();
+                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
                         for (var i = 0; i < history_to_delete.length; i++) {
                             $.ajax({
                                 url: 'delete_history_rows',
diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index 1829e246..1a682595 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -397,7 +397,7 @@ DOCUMENTATION :: END
                     </div>
                     <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
                     </div>
-                    <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+                    <div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
                         <div class="modal-dialog">
                             <div class="modal-content">
                                 <div class="modal-header">
@@ -498,8 +498,8 @@ DOCUMENTATION :: END
             if ($(this).hasClass('active')) {
                 if (history_to_delete.length > 0) {
                     $('#deleteCount').text(history_to_delete.length);
-                    $('#confirm-modal').modal();
-                    $('#confirm-modal').one('click', '#confirm-delete', function () {
+                    $('#confirm-modal-delete').modal();
+                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
                         for (var i = 0; i < history_to_delete.length; i++) {
                             $.ajax({
                                 url: 'delete_history_rows',
diff --git a/data/interfaces/default/libraries.html b/data/interfaces/default/libraries.html
index c11cdb24..741b5f5f 100644
--- a/data/interfaces/default/libraries.html
+++ b/data/interfaces/default/libraries.html
@@ -64,7 +64,7 @@
             <tbody>
             </tbody>
         </table>
-        <div class="modal fade" id="confirm-delete-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-delete-modal">
+        <div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
@@ -143,8 +143,8 @@
                         }
                     }
 
-                    $('#confirm-delete-modal').modal();
-                    $('#confirm-delete-modal').one('click', '#confirm-delete', function () {
+                    $('#confirm-modal-delete').modal();
+                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
                         for (var i = 0; i < libraries_to_delete.length; i++) {
                             $.ajax({
                                 url: 'delete_library',
diff --git a/data/interfaces/default/library.html b/data/interfaces/default/library.html
index 282d838f..c65bef4e 100644
--- a/data/interfaces/default/library.html
+++ b/data/interfaces/default/library.html
@@ -285,7 +285,7 @@ DOCUMENTATION :: END
                     </div>
                     <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
                     </div>
-                    <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+                    <div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
                         <div class="modal-dialog">
                             <div class="modal-content">
                                 <div class="modal-header">
@@ -459,8 +459,8 @@ DOCUMENTATION :: END
             if ($(this).hasClass('active')) {
                 if (history_to_delete.length > 0) {
                     $('#deleteCount').text(history_to_delete.length);
-                    $('#confirm-modal').modal();
-                    $('#confirm-modal').one('click', '#confirm-delete', function () {
+                    $('#confirm-modal-delete').modal();
+                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
                         for (var i = 0; i < history_to_delete.length; i++) {
                             $.ajax({
                                 url: 'delete_history_rows',
diff --git a/data/interfaces/default/update_metadata.html b/data/interfaces/default/update_metadata.html
index 0cd4954f..bf851e71 100644
--- a/data/interfaces/default/update_metadata.html
+++ b/data/interfaces/default/update_metadata.html
@@ -98,7 +98,7 @@ DOCUMENTATION :: END
                     <div class='table-card-back'>
                         <div id="search-results-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading search results...</div>
                     </div>
-                    <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+                    <div class="modal fade" id="confirm-modal-update" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-update">
                         <div class="modal-dialog">
                             <div class="modal-content">
                                 <div class="modal-header">
@@ -195,8 +195,8 @@ DOCUMENTATION :: END
 
         $('#new_title').html($(this).find('.item-children-instance-text-wrapper').html());
 
-        $('#confirm-modal').modal();
-        $('#confirm-modal').one('click', '#confirm-update', function () {
+        $('#confirm-modal-update').modal();
+        $('#confirm-modal-update').one('click', '#confirm-update', function () {
             $(this).prop('disabled', true);
             var msg = '<i class="fa fa-refresh fa-spin"></i>&nbspUpdating database...'
             showMsg(msg, false, false, 0)
diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html
index 97479b14..dc5a12c5 100644
--- a/data/interfaces/default/user.html
+++ b/data/interfaces/default/user.html
@@ -310,7 +310,7 @@ DOCUMENTATION :: END
                     </div>
                     <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
                     </div>
-                    <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+                    <div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
                         <div class="modal-dialog">
                             <div class="modal-content">
                                 <div class="modal-header">
@@ -507,8 +507,8 @@ DOCUMENTATION :: END
             if ($(this).hasClass('active')) {
                 if (history_to_delete.length > 0) {
                     $('#deleteCount').text(history_to_delete.length);
-                    $('#confirm-modal').modal();
-                    $('#confirm-modal').one('click', '#confirm-delete', function () {
+                    $('#confirm-modal-delete').modal();
+                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
                         for (var i = 0; i < history_to_delete.length; i++) {
                             $.ajax({
                                 url: 'delete_history_rows',
diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html
index f8ad0f90..3b8a64f6 100644
--- a/data/interfaces/default/users.html
+++ b/data/interfaces/default/users.html
@@ -50,7 +50,7 @@
         </div>
         <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
         </div>
-        <div class="modal fade" id="confirm-delete-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-delete-modal">
+        <div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
@@ -129,8 +129,8 @@
                         }
                     }
 
-                    $('#confirm-delete-modal').modal();
-                    $('#confirm-delete-modal').one('click', '#confirm-delete', function () {
+                    $('#confirm-modal-delete').modal();
+                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
                         for (var i = 0; i < users_to_delete.length; i++) {
                             $.ajax({
                                 url: 'delete_user',