--- a/src/ztfy/myams/resources/js/myams.js	Tue Oct 13 17:38:52 2015 +0200
+++ b/src/ztfy/myams/resources/js/myams.js	Tue Oct 13 17:39:09 2015 +0200
@@ -1029,7 +1029,7 @@
 		 */
 		post: function(method, data, options, callback) {
 			ams.ajax.check($.jsonRpc,
-						   ams.baseURL + 'ext/jquery-jsonrpc' + (ams.devmode ? '.js' : '.min.js'),
+						   ams.baseURL + 'ext/jquery-jsonrpc' + ams.devext + '.js',
 						   function() {
 								var result;
 								if (typeof(options) == 'function') {
@@ -1044,6 +1044,7 @@
 									callback = ams.getFunctionByName(callback);
 								delete options.callback;
 
+								var result;
 								var defaults = {
 									url: ams.jsonrpc.getAddr(options.url),
 									type: 'post',
@@ -1621,13 +1622,18 @@
 				ams.skin.alert(form, 'error', header, errors);
 			} else {
 				$('.state-error', form).removeClass('state-error');
-				header = errors.widgets && (errors.widgets.length > 1) ? ams.i18n.ERRORS_OCCURED : ams.i18n.ERROR_OCCURED;
+				header = errors.error_header ||
+						 (errors.widgets && (errors.widgets.length > 1) ? ams.i18n.ERRORS_OCCURED : ams.i18n.ERROR_OCCURED);
 				var message = new Array();
 				var index;
 				for (index in errors.messages) {
 					if (!$.isNumeric(index))
 						continue;
-					message.push(errors.messages[index].message || errors.messages[index]);
+					if (errors.messages[index].header) {
+						message.push('<strong>' + errors.messages[index].header + '</strong><br />' + errors.messages[index].message);
+					} else {
+						message.push(errors.messages[index].message || errors.messages[index]);
+					}
 				}
 				for (index in errors.widgets) {
 					if (!$.isNumeric(index))
@@ -1652,7 +1658,7 @@
 						$('li.state-error:first a', form).click();
 					}
 				}
-				ams.skin.alert(form, 'error', header, message, errors.error_message);
+				ams.skin.alert(form, errors.error_level || 'error', header, message, errors.error_message);
 			}
 		}
 	};
@@ -2663,7 +2669,7 @@
 								   ams.baseURL + 'ext/jquery-datetimepicker' + ams.devext + '.js',
 								   function(first_load) {
 										if (first_load) {
-											ams.getCSS(ams.baseURL + '../css/ext/jquery-datetimepicker' + (ams.devmode ? '.css' : '.min.css'), 'jquery-datetimepicker');
+											ams.getCSS(ams.baseURL + '../css/ext/jquery-datetimepicker' + ams.devext + '.css', 'jquery-datetimepicker');
 											ams.dialog.registerHideCallback(ams.helpers.datetimepickerDialogHiddenCallback);
 										}
 										datepickers.each(function() {
@@ -2695,7 +2701,7 @@
 								   ams.baseURL + 'ext/jquery-datetimepicker' + ams.devext + '.js',
 								   function(first_load) {
 										if (first_load) {
-											ams.getCSS(ams.baseURL + '../css/ext/jquery-datetimepicker' + (ams.devmode ? '.css' : '.min.css'), 'jquery-datetimepicker');
+											ams.getCSS(ams.baseURL + '../css/ext/jquery-datetimepicker' + ams.devext + '.css', 'jquery-datetimepicker');
 											ams.dialog.registerHideCallback(ams.helpers.datetimepickerDialogHiddenCallback);
 										}
 										datetimepickers.each(function() {
@@ -2727,7 +2733,7 @@
 								   ams.baseURL + 'ext/jquery-datetimepicker' + ams.devext + '.js',
 								   function(first_load) {
 										if (first_load) {
-											ams.getCSS(ams.baseURL + '../css/ext/jquery-datetimepicker' + (ams.devmode ? '.css' : '.min.css'), 'jquery-datetimepicker');
+											ams.getCSS(ams.baseURL + '../css/ext/jquery-datetimepicker' + ams.devext + '.css', 'jquery-datetimepicker');
 											ams.dialog.registerHideCallback(ams.helpers.datetimepickerDialogHiddenCallback);
 										}
 										timepickers.each(function() {
@@ -3822,7 +3828,7 @@
 				cache: false,
 				beforeSend: function() {
 					ams.skin.cleanContainer(container);
-					container.html('<h1><i class="fa fa-cog fa-spin"></i> Loading... </h1>');
+					container.html('<h1 class="loading"><i class="fa fa-cog fa-spin"></i> Loading... </h1>');
 					if (container[0] == $('#content')[0]) {
 						ams.skin._drawBreadCrumb();
 						document.title = $('.breadcrumb LI:last-child').text();
@@ -3838,6 +3844,7 @@
 						var request_data = ams.ajax.getResponse(request);
 						var data_type = request_data.content_type;
 						var result = request_data.data;
+						$('.loading', container).remove();
 						switch (data_type) {
 							case 'json':
 								ams.ajax.handleJSON(result, container);