diff --git a/code/Comment/$Comment.skin b/code/Comment/$Comment.skin index f7bbd279..26ce79d9 100644 --- a/code/Comment/$Comment.skin +++ b/code/Comment/$Comment.skin @@ -1,6 +1,6 @@ <% #delete %> <% if <% comment.creator %> is <% membership.user.name %> then '' - else <% if <% comment.related.size %> is null then '' + else <% if <% comment.related.size %> is null then '' else <% comment.skin #deleteOptions %> %> %> <% #deleteOptions %> @@ -22,14 +22,13 @@ $(function() { }); }); -
+
-
-
- - -
-
diff --git a/code/HopObject/$HopObject.skin b/code/HopObject/$HopObject.skin index 1f7ed915..c2e855de 100644 --- a/code/HopObject/$HopObject.skin +++ b/code/HopObject/$HopObject.skin @@ -1,14 +1,18 @@ <% #confirm %> +

<% gettext Warning! %>

+

<% param.text %>

+

+ <% gettext 'Please be aware of the fact that there is no “undo”, so if you click “Proceed” below the changes will be applied irreversibly.' %> +

+

+ <% gettext 'Click “Cancel” now if you are not really sure you want to proceed.' %> +

-

<% gettext Warning! %>

-

<% param.text %>

-

<% gettext 'Please be aware of the fact that there is no “undo”, so if you -click “Proceed” below the changes will be applied irreversibly.' %>

-

<% gettext 'Click “Cancel” now if you are not really sure you want to -proceed.' %>

<% this.skin <% this.type prefix=$ suffix=#delete %> %> -

-<% gettext Cancel %>

+

+ + <% gettext Cancel %> +

<% #notify_create %> diff --git a/code/HopObject/HopObject.js b/code/HopObject/HopObject.js index b5c05fab..b2bc5e79 100644 --- a/code/HopObject/HopObject.js +++ b/code/HopObject/HopObject.js @@ -169,8 +169,7 @@ HopObject.prototype.delete_action = function() { if (req.postParams.proceed) { try { var parent = this._parent; - var url = this.constructor.remove.call(this, req.postParams) || - parent.href(); + var url = this.constructor.remove.call(this, req.postParams) || parent.href(); res.message = gettext('{0} was successfully deleted.', gettext(this._prototype)); res.redirect(User.getLocation() || url); } catch(ex) { diff --git a/code/Site/$Site.skin b/code/Site/$Site.skin index a1efdbde..59c1e770 100644 --- a/code/Site/$Site.skin +++ b/code/Site/$Site.skin @@ -293,7 +293,7 @@ referrers.push(new Antville.Referrer("<% param.referrer %>",
- +
<% gettext Admin %>
@@ -320,7 +320,6 @@ referrers.push(new Antville.Referrer("<% param.referrer %>",
-