makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/9657] Remove softdelete reason field when permanent delete is selected

Browse source 
PHPBB3-9657
This commit is contained in:
Joas Schilling 2013-03-11 23:08:40 +01:00
parent b727e1eeda
commit 4e9cf27394
4 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/assets/javascript/core.js
View file

@ -317,6 +317,18 @@ phpbb.ajaxify = function(options) {
}); });
} }
}, false); }, false);
// Add the click function to the code we just laoded.
// Should be removed and replace with a call to .on()
// when jQuery is updated to 1.7.x or higher
// $(document).on('click', '#delete_permanent', function () {});
$('#delete_permanent').click(function () {
if ($(this).attr('checked')) {
$('#delete_reason').hide();
} else {
$('#delete_reason').show();
}
});
} }
} }

4
phpBB/language/en/posting.php
View file

@ -83,8 +83,8 @@ $lang = array_merge($lang, array(
'DELETE_POST_PERMANENTLY' => 'Permanently delete this post so it can not be recovered', 'DELETE_POST_PERMANENTLY' => 'Permanently delete this post so it can not be recovered',
'DELETE_POSTS_CONFIRM' => 'Are you sure you want to delete these posts?', 'DELETE_POSTS_CONFIRM' => 'Are you sure you want to delete these posts?',
'DELETE_POSTS_PERMANENTLY_CONFIRM' => 'Are you sure you want to <strong>permanently</strong> delete these posts?', 'DELETE_POSTS_PERMANENTLY_CONFIRM' => 'Are you sure you want to <strong>permanently</strong> delete these posts?',
'DELETE_REASON' => 'Delete reason', 'DELETE_REASON' => 'Soft delete reason',
'DELETE_REASON_EXPLAIN' => 'The reason is only used when the post is not deleted permanently.', 'DELETE_REASON_EXPLAIN' => 'The reason is only shown to moderators when post is soft deleted.',
'DELETE_POST_WARN' => 'Deleted this post', 'DELETE_POST_WARN' => 'Deleted this post',
'DELETE_TOPIC_CONFIRM' => 'Are you sure you want to delete this topic?', 'DELETE_TOPIC_CONFIRM' => 'Are you sure you want to delete this topic?',
'DELETE_TOPIC_PERMANENTLY' => 'Permanently delete this topic so it can not be recovered', 'DELETE_TOPIC_PERMANENTLY' => 'Permanently delete this topic so it can not be recovered',

8
phpBB/styles/prosilver/template/ajax.js
View file

@ -230,6 +230,14 @@ $('#quick-mod-select').change(function () {
$('#quickmodform').submit(); $('#quickmodform').submit();
}); });
$('#delete_permanent').click(function () {
if ($(this).attr('checked')) {
$('#delete_reason').hide();
} else {
$('#delete_reason').show();
}
});
/** /**
* Toggle the member search panel in memberlist.php. * Toggle the member search panel in memberlist.php.
* *

8
phpBB/styles/prosilver/template/confirm_delete_body.html
View file

@ -11,9 +11,9 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_DELETE_REASON --> <!-- IF S_DELETE_REASON -->
<label> <label id="delete_reason">
<strong>{L_DELETE_REASON}:</strong><br /><span>{L_DELETE_REASON_EXPLAIN}</span><br /> <strong>{L_DELETE_REASON}:</strong><br /><span>{L_DELETE_REASON_EXPLAIN}</span><br />
<input type="text" name="delete_reason" id="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /> <input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" />
</label> </label>
<!-- ENDIF --> <!-- ENDIF -->
<!-- ENDIF --> <!-- ENDIF -->
@ -50,9 +50,9 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_DELETE_REASON --> <!-- IF S_DELETE_REASON -->
<dl> <dl id="delete_reason">
<dt><label for="delete_reason">{L_DELETE_REASON}:</label><br /><span>{L_DELETE_REASON_EXPLAIN}</span></dt> <dt><label for="delete_reason">{L_DELETE_REASON}:</label><br /><span>{L_DELETE_REASON_EXPLAIN}</span></dt>
<dd><input type="text" name="delete_reason" id="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></dd> <dd><input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
</fieldset> </fieldset>