mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-20 23:41:29 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission

Browse Source 
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11408] user_jabber instead of jabber
  [ticket/10202] Rename method names _all() to _array().
  [ticket/10202] Add migration file for config_db_text.
  [ticket/10202] Upgrade TEXT to the bigger MTEXT.
  [ticket/10202] Improve method documentation.
  [ticket/10202] SQL escape the table name.
  [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
  [ticket/10202] Define phpbb_config_db_text as a service.
  [ticket/10202] Add tests for phpbb_config_db_text.
  [ticket/10202] Adjust method names to guidelines.
  [ticket/10202] Add database schema for phpbb_config_db_text.
  [ticket/10202] Implementation of config options with arbitrary length values.
  [ticket/11166] Add ajaxify support to normal ACP confirm_box()
  [ticket/11166] Fix several custom confirm templates in prosilver
  [ticket/11166] Add caption to AJAX confirm box default template
  [ticket/11166] Fix typo in comment
  [ticket/11166] Use provided custom templates on AJAX confirm box
This commit is contained in:
Joas Schilling
2013-03-07 16:09:55 +01:00
parent 1a49852413 d658d6640b
commit 20f84c3795
25 changed files with 562 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
phpBB/styles/prosilver/template/mcp_approve.html
View File

@@ -1,3 +1,30 @@
<!-- IF S_AJAX_REQUEST -->
<h3>{MESSAGE_TITLE}</h3>
<p>{MESSAGE_TEXT}</p>
<!-- IF S_NOTIFY_POSTER -->
<label><input type="checkbox" name="notify_poster" checked="checked" /> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label>
<!-- ENDIF -->
<!-- IF not S_APPROVE -->
<label><strong>{L_DISAPPROVE_REASON}{L_COLON}</strong>
<select name="reason_id">
<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason -->
</select></label>
<label><strong>{L_MORE_INFO}{L_COLON}</strong><br /><span>{L_CAN_LEAVE_BLANK}</span>
<textarea class="inputbox" name="reason" id="reason" rows="4" cols="40">{REASON}</textarea>
</label>
<!-- ENDIF -->
<fieldset class="submit-buttons">
<input type="button" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp;
<input type="button" name="cancel" value="{L_NO}" class="button2" />
</fieldset>
<!-- ELSE -->
<!-- INCLUDE overall_header.html -->
<form id="confirm" action="{S_CONFIRM_ACTION}" method="post">
@@ -51,3 +78,4 @@
</form>
<!-- INCLUDE overall_footer.html -->
<!-- ENDIF -->