--- a/src/ztfy/myams/resources/js/myams.js Wed Jan 14 15:53:25 2015 +0100
+++ b/src/ztfy/myams/resources/js/myams.js Wed Feb 04 13:59:16 2015 +0100
@@ -752,6 +752,7 @@
case 'error':
ams.form.showErrors(form, result);
break;
+ case 'info':
case 'success':
if (result.close_form != false)
ams.dialog.close(form);
@@ -798,10 +799,15 @@
}
if (result.message) {
var message = result.message;
- if (typeof(message) == 'string')
- ams.skin.alert($(form || '#content'),
- status, '', message);
- else
+ if (typeof(message) == 'string') {
+ if ((status == 'info') || (status == 'success'))
+ ams.skin.smallBox(status,
+ {title: message,
+ icon: 'fa fa-fw fa-info-circle font-xs align-top margin-top-10',
+ timeout: 3000});
+ else
+ ams.skin.alert($(form || '#content'), status, message);
+ } else
ams.skin.alert($(message.target || target || form || '#content'),
message.status || 'success',
message.header,
@@ -1097,12 +1103,17 @@
buttonTarget = button.data('ams-form-submit-target');
}
- var action = form.attr('action').replace(/#/, '');
- if (action.startsWith(window.location.protocol))
- var url = action;
- else
- url = ams.ajax.getAddr() + action;
- url += handler || buttonHandler || data.amsFormHandler || '';
+ var form_handler = handler || buttonHandler || data.amsFormHandler || '';
+ if (form_handler.startsWith(window.location.protocol)) {
+ var url = form_handler;
+ } else {
+ var action = form.attr('action').replace(/#/, '');
+ if (action.startsWith(window.location.protocol))
+ url = action;
+ else
+ url = ams.ajax.getAddr() + action;
+ url += form_handler;
+ }
var target = null;
if (data.amsFormInitSubmitTarget) {
@@ -2771,18 +2782,19 @@
'<h4 class="alert-heading">' +
'<i class="fa fa-fw fa-warning"></i> ' + header +
'</h4>' +
- (subtitle ? ('<p>' + subtitle + '</p>') : '') +
- '<ul>';
+ (subtitle ? ('<p>' + subtitle + '</p>') : '');
if (typeof(message) == 'string')
- content += '<li>' + message + '</li>';
- else {
+ content += '<ul><li>' + message + '</li></ul>';
+ else if (message) {
+ content += '<ul>';
for (var index in message) {
if (!$.isNumeric(index)) // IE check
continue;
content += '<li>' + message[index] + '</li>';
};
+ content += '</ul>';
}
- content += '</ul></div>';
+ content += '</div>';
var alert = $(content).prependTo(parent);
if (parent.exists) {
ams.ajax.check($.scrollTo,