mirror of
https://github.com/phpbb/phpbb.git
synced 2025-10-28 14:08:23 +01:00
948bfcbe77
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
[ticket/10865] Use code tags for install/database_update.php.
[ticket/10865] Should have been a slash.
[ticket/10780] Use L_COLON on LDAP page.
[ticket/10780] Use L_COLON on search backend ACP pages.
[ticket/10780] Use L_COLON for "download all attachments".
[ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
[ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
[ticket/10780] Replace colon usage in adm template output with {L_COLON}
[ticket/10780] Replace colon usage in template output with {L_COLON}
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
[ticket/10172] Show prosilver birthday list even if there are no birthdays.
[ticket/11050] make all properties protected in all search backends
[ticket/11050] get_common_words() returns empty array for sphinx
[ticket/11050] fix tidied search query docblock language
[ticket/11050] fix min/max length docblock language
[ticket/11050] multi sentences separated by period in docblocks
[ticket/11050] fix separated spelling in docblock
[ticket/11050] fix split words doc block language
[ticket/11050] remove class word from docblocks
...
Conflicts:
phpBB/install/database_update.php
phpBB/install/schemas/mssql_schema.sql
phpBB/language/en/acp/permissions_phpbb.php
phpBB/styles/prosilver/template/posting_editor.html
54 lines
1.6 KiB
HTML
54 lines
1.6 KiB
HTML
<!-- INCLUDE overall_header.html -->
|
|
|
|
<form id="confirm" action="{S_CONFIRM_ACTION}" method="post">
|
|
<div class="panel">
|
|
{S_FORM_TOKEN}
|
|
<div class="inner">
|
|
|
|
<div class="content">
|
|
|
|
<h2>{MESSAGE_TITLE}</h2>
|
|
<!-- IF ADDITIONAL_MSG --><p class="error">{ADDITIONAL_MSG}</p><!-- ENDIF -->
|
|
|
|
<fieldset>
|
|
<!-- IF S_NOTIFY_POSTER -->
|
|
<dl class="panel">
|
|
<dt> </dt>
|
|
<dd><label><input type="checkbox" name="notify_poster" checked="checked" /> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label></dd>
|
|
</dl>
|
|
<!-- ENDIF -->
|
|
|
|
<!-- IF not S_APPROVE and not S_RESTORE -->
|
|
<dl class="fields2 nobg">
|
|
<dt><label>{L_DISAPPROVE_REASON}{L_COLON}</label></dt>
|
|
<dd><select name="reason_id">
|
|
<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason -->
|
|
</select>
|
|
</dd>
|
|
</dl>
|
|
<dl class="fields2 nobg">
|
|
<dt><label for="reason">{L_MORE_INFO}{L_COLON}</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>
|
|
<dd><textarea class="inputbox" name="reason" id="reason" rows="4" cols="40">{REASON}</textarea></dd>
|
|
</dl>
|
|
<!-- ENDIF -->
|
|
|
|
<dl class="fields2 nobg">
|
|
<dt> </dt>
|
|
<dd><strong>{MESSAGE_TEXT}</strong></dd>
|
|
</dl>
|
|
</fieldset>
|
|
|
|
<fieldset class="submit-buttons">
|
|
{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />
|
|
<input type="submit" name="cancel" value="{L_NO}" class="button2" />
|
|
</fieldset>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
</div>
|
|
|
|
</form>
|
|
|
|
<!-- INCLUDE overall_footer.html -->
|