diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2012-12-10 21:32:45 +0100 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2012-12-10 21:32:45 +0100 |
commit | b30a608f3591c6c80587b67714fea6d4040ee5af (patch) | |
tree | a95e2330dd990711c618ade7316290dfd9f124c2 | |
parent | 51966bd497e567bb9154c4fff4ccda918cff95a4 (diff) | |
download | forums-b30a608f3591c6c80587b67714fea6d4040ee5af.tar forums-b30a608f3591c6c80587b67714fea6d4040ee5af.tar.gz forums-b30a608f3591c6c80587b67714fea6d4040ee5af.tar.bz2 forums-b30a608f3591c6c80587b67714fea6d4040ee5af.tar.xz forums-b30a608f3591c6c80587b67714fea6d4040ee5af.zip |
[feature/soft-delete] Remove the "Deleted by" message when restoring a post
PHPBB3-9567
-rw-r--r-- | phpBB/styles/prosilver/template/ajax.js | 9 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 6c68549dd4..999fe29b49 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -26,9 +26,18 @@ phpbb.add_ajax_callback('post_delete', function() { // This callback removes the approve / disapprove div or link. phpbb.add_ajax_callback('post_visibility', function(res) { var remove = (res.visible) ? $(this) : $(this).parents('.post'); + $(remove).css('pointer-events', 'none').fadeOut(function() { $(this).remove(); }); + + if (res.visible) + { + // Remove the "Deleted by" message from the post on restoring. + remove.parents('.post').find('.post_deleted_msg').css('pointer-events', 'none').fadeOut(function() { + $(this).remove(); + }); + } }); // This removes the parent row of the link or form that fired the callback. diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 226b6fde5a..12c9d85d84 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -199,7 +199,7 @@ <!-- IF postrow.S_DISPLAY_NOTICE --><div class="rules">{L_DOWNLOAD_NOTICE}</div><!-- ENDIF --> <!-- IF postrow.DELETED_MESSAGE or postrow.DELETE_REASON --> - <div class="notice">{postrow.DELETED_MESSAGE} + <div class="notice post_deleted_msg">{postrow.DELETED_MESSAGE} <!-- IF postrow.DELETE_REASON --><br /><strong>{L_REASON}:</strong> <em>{postrow.DELETE_REASON}</em><!-- ENDIF --> </div> <!-- ELSEIF postrow.EDITED_MESSAGE or postrow.EDIT_REASON --> |