diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-07-01 23:25:29 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-07-01 23:25:29 +0530 |
| commit | c80b80ca0f4328124bc4f2e8fdf9374aff06b7e1 (patch) | |
| tree | 5aae5584dd9fc1aed161bc4391865c8263486522 /phpBB/styles/prosilver | |
| parent | 8233c3e340a3608a6952ef444143a10e668d6561 (diff) | |
| parent | 045e04fb6fa55ae96ba82245010a684cd2d61e5d (diff) | |
| download | forums-c80b80ca0f4328124bc4f2e8fdf9374aff06b7e1.tar forums-c80b80ca0f4328124bc4f2e8fdf9374aff06b7e1.tar.gz forums-c80b80ca0f4328124bc4f2e8fdf9374aff06b7e1.tar.bz2 forums-c80b80ca0f4328124bc4f2e8fdf9374aff06b7e1.tar.xz forums-c80b80ca0f4328124bc4f2e8fdf9374aff06b7e1.zip | |
Merge branch 'ticket/11566' into ticket/11566-develop
* ticket/11566:
[ticket/11566] Subsilver template error displayed after table headers
[ticket/11566] Remove extra pair of brackets from conditional statement
[ticket/11566] Check that guest doesn't have reporting permission by default
[ticket/11566] Add captcha to report post template in subsilver
[ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
[ticket/11566] Rename var to $visual_confirmation_response
[ticket/11566] Revert forum permission changes
[ticket/11566] Use language variable instead of hardcode
[ticket/11566] add tests for reporting post
[ticket/11566] add captcha reset and hidden fields
[ticket/11566] display error instead of trigger_error
[ticket/11566] add error in template
[ticket/11566] add error functionality
[ticket/11566] add interface for captcha
Conflicts:
phpBB/report.php
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/report_body.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/template/report_body.html b/phpBB/styles/prosilver/template/report_body.html index 4cb03dc51c..2a5e6c9d0e 100644 --- a/phpBB/styles/prosilver/template/report_body.html +++ b/phpBB/styles/prosilver/template/report_body.html @@ -10,6 +10,7 @@ <p><!-- IF S_REPORT_POST -->{L_REPORT_POST_EXPLAIN}<!-- ELSE -->{L_REPORT_MESSAGE_EXPLAIN}<!-- ENDIF --></p> <fieldset> + <!-- IF ERROR --><dl><dd class="error">{ERROR}</dd></dl><!-- ENDIF --> <dl class="fields2"> <dt><label for="reason_id">{L_REASON}{L_COLON}</label></dt> <dd><select name="reason_id" id="reason_id" class="full"><!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason --></select></dd> @@ -27,6 +28,9 @@ <dt><label for="report_text">{L_MORE_INFO}{L_COLON}</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt> <dd><textarea name="report_text" id="report_text" rows="10" cols="76" class="inputbox">{REPORT_TEXT}</textarea></dd> </dl> + <!-- IF CAPTCHA_TEMPLATE --> + <!-- INCLUDE {CAPTCHA_TEMPLATE} --> + <!-- ENDIF --> </fieldset> </div> |