Fix for other forms

engine/wrapper/resources/scripts/assets.cp.scripts.js

@@ -4,6 +4,9 @@ function GetModalAlertTmpl(title, message, error) {
 
 function ShowSystemMsg(title, message, error) {
 	var modal_alert_place = $('.modal.show .sys-messages');
+	if(!modal_alert_place.length) {
+		modal_alert_place = $('form.alert-here .sys-messages');
+	}
 	if(modal_alert_place.length) {
 		modal_alert_place.html(GetModalAlertTmpl(title, message, error));
 	}
@@ -63,7 +66,7 @@ $(document).ready(function() {
 			}
 
 			// Block send button
-			form.addClass('loading');
+			form.addClass('loading').addClass('alert-here');
 			var button = $(this).find('button[type=submit]');
 			button.addClass('progress-bar-striped').addClass('progress-bar-animated');
 
@@ -79,8 +82,11 @@ $(document).ready(function() {
 			}).fail(function() {
 				AjaxFail();
 			}).always(function() {
-				form.removeClass('loading');
-				button.removeClass('progress-bar-striped').removeClass('progress-bar-animated');
+				// Add delay for one second
+				setTimeout(function() {
+					form.removeClass('loading').removeClass('alert-here');
+					button.removeClass('progress-bar-striped').removeClass('progress-bar-animated');
+				}, 500);
 			});
 
 			e.preventDefault();

engine/wrapper/resources/scripts/assets.cp.scripts.js.go

@@ -1,4 +1,4 @@
 package scripts
 
 // https://jscompress.com/
-var File_assets_cp_scripts_js = []byte(`function GetModalAlertTmpl(a,s,t){return'<div class="alert alert-'+(t?"danger":"success")+' alert-dismissible fade show" role="alert"><strong>'+a+"</strong> "+s+'<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>'}function ShowSystemMsg(a,s,t){var e=$(".modal.show .sys-messages");e.length&&e.html(GetModalAlertTmpl(a,s,t))}function ShowSystemMsgSuccess(a,s){ShowSystemMsg(a,s,!1)}function ShowSystemMsgError(a,s){ShowSystemMsg(a,s,!0)}function AjaxDone(data){try{eval(data)}catch(a){a instanceof SyntaxError&&(console.log(data),ModalShowMsg("JavaScript Eval Error",a.message))}}function AjaxFail(){console.log("Form send fail, page will be reloaded"),window.location.reload(!1)}function ActionUserSettings(){$("form.form-user-settings")[0].reset()}function ActionSingOut(){$.ajax({type:"POST",url:"/cp/",data:{action:"singout"}}).done(function(a){AjaxDone(a)}).fail(function(){AjaxFail()})}$(document).ready(function(){$("form").each(function(){$(this).submit(function(a){var s=$(this);if(s.hasClass("loading"))a.preventDefault();else{s.addClass("loading");var t=$(this).find("button[type=submit]");t.addClass("progress-bar-striped").addClass("progress-bar-animated"),s.find(".sys-messages").html(""),$.ajax({type:"POST",url:s.attr("action"),data:s.serialize()}).done(function(a){AjaxDone(a)}).fail(function(){AjaxFail()}).always(function(){s.removeClass("loading"),t.removeClass("progress-bar-striped").removeClass("progress-bar-animated")}),a.preventDefault()}})})});`)
+var File_assets_cp_scripts_js = []byte(`function GetModalAlertTmpl(a,e,s){return'<div class="alert alert-'+(s?"danger":"success")+' alert-dismissible fade show" role="alert"><strong>'+a+"</strong> "+e+'<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>'}function ShowSystemMsg(a,e,s){var t=$(".modal.show .sys-messages");t.length||(t=$("form.alert-here .sys-messages")),t.length&&t.html(GetModalAlertTmpl(a,e,s))}function ShowSystemMsgSuccess(a,e){ShowSystemMsg(a,e,!1)}function ShowSystemMsgError(a,e){ShowSystemMsg(a,e,!0)}function AjaxDone(data){try{eval(data)}catch(a){a instanceof SyntaxError&&(console.log(data),ModalShowMsg("JavaScript Eval Error",a.message))}}function AjaxFail(){console.log("Form send fail, page will be reloaded"),window.location.reload(!1)}function ActionUserSettings(){$("form.form-user-settings")[0].reset()}function ActionSingOut(){$.ajax({type:"POST",url:"/cp/",data:{action:"singout"}}).done(function(a){AjaxDone(a)}).fail(function(){AjaxFail()})}$(document).ready(function(){$("form").each(function(){$(this).submit(function(a){var e=$(this);if(e.hasClass("loading"))a.preventDefault();else{e.addClass("loading").addClass("alert-here");var s=$(this).find("button[type=submit]");s.addClass("progress-bar-striped").addClass("progress-bar-animated"),e.find(".sys-messages").html(""),$.ajax({type:"POST",url:e.attr("action"),data:e.serialize()}).done(function(a){AjaxDone(a)}).fail(function(){AjaxFail()}).always(function(){setTimeout(function(){e.removeClass("loading").removeClass("alert-here"),s.removeClass("progress-bar-striped").removeClass("progress-bar-animated")},500)}),a.preventDefault()}})})});`)