change upgrade box to swal modal

api/pages/settings-user-manage-users.php

@@ -184,7 +184,7 @@ function get_page_settings_user_manage_users($Organizr)
         <button type="button" class="btn btn-info btn-circle pull-right popup-with-form" href="#new-user-form" data-effect="mfp-3d-unfold"><i class="fa fa-plus"></i> </button>
     </div>
     <div id="jsGrid-Users" class=""></div>
-    <div id="pageDiv">
+    <div id="pageDiv" class="hidden-xs">
 		<div class="item-pager-panel pull-left m-l-10">
 		        <select id="pageLength" class="form-control">
 		            <option>5</option>

js/functions.js

@@ -3637,10 +3637,19 @@ function updateBar(){
                     <div id="update-bar" class="progress-bar progress-bar-primary progress-bar-striped active" style="width: 0%;" role="progressbar">0%</div>
                 </div>
             </div>
+            <h6>If error occurs - Use Esc key to close modal</h6>
         </div>
     </div>
 	`;
 }
+function showUpdateBar(){
+	swal({
+		content: createElementFromHTML(updateBar()),
+		buttons: false,
+		className: 'bg-org',
+		closeOnClickOutside: false,
+	})
+}
 function updateUpdateBar(title,percent,update=false){
 	$('#update-title').text(title);
 	$('#update-bar').text(percent);
@@ -3660,7 +3669,8 @@ function countdown(remaining) {
 }
 function dockerUpdate(){
     if(activeInfo.settings.misc.docker){
-        $(updateBar()).appendTo('.organizr-area');
+	    showUpdateBar();
+        //$(updateBar()).appendTo('.organizr-area');
         updateUpdateBar('Starting Download','20%');
         messageSingle(window.lang.translate('[DO NOT CLOSE WINDOW]'),window.lang.translate('Starting Update Process'),activeInfo.settings.notifications.position,'#FFF','success','60000');
         organizrAPI2('GET','api/v2/update/docker').success(function(data) {
@@ -3674,7 +3684,8 @@ function dockerUpdate(){
 }
 function windowsUpdate(){
     if(activeInfo.serverOS == 'win'){
-        $(updateBar()).appendTo('.organizr-area');
+	    showUpdateBar();
+    	//$(updateBar()).appendTo('.organizr-area');
         updateUpdateBar('Starting Download','20%');
         messageSingle(window.lang.translate('[DO NOT CLOSE WINDOW]'),window.lang.translate('Starting Update Process'),activeInfo.settings.notifications.position,'#FFF','success','60000');
         organizrAPI2('GET','api/v2/update/windows').success(function(data) {
@@ -3697,7 +3708,8 @@ function updateNow(){
         return false;
     }
 	organizrConsole('Update Function','Starting Update Process');
-	$(updateBar()).appendTo('.organizr-area');
+	showUpdateBar();
+	//$(updateBar()).appendTo('.organizr-area');
 	updateUpdateBar('Starting Download','5%');
 	messageSingle(window.lang.translate('[DO NOT CLOSE WINDOW]'),window.lang.translate('Starting Update Process'),activeInfo.settings.notifications.position,'#FFF','success','60000');
 	organizrAPI2('GET','api/v2/update/download/'+ activeInfo.branch).success(function(data) {