diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-03-27 22:45:02 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-03-27 22:45:02 -0400 |
| commit | 4239d8aa4e53cda036f67e39d8eb61ccd317a6c9 (patch) | |
| tree | cff929c639ffaec9ef725c6af35f1d5d351d3023 /phpBB/styles | |
| parent | 17a7fb7743ba3eb1bcb3d27d3958d503101c5bbb (diff) | |
| parent | 3a044b4b3ef6b5a7c27ea357bc3b7d7dd101a262 (diff) | |
| download | forums-4239d8aa4e53cda036f67e39d8eb61ccd317a6c9.tar forums-4239d8aa4e53cda036f67e39d8eb61ccd317a6c9.tar.gz forums-4239d8aa4e53cda036f67e39d8eb61ccd317a6c9.tar.bz2 forums-4239d8aa4e53cda036f67e39d8eb61ccd317a6c9.tar.xz forums-4239d8aa4e53cda036f67e39d8eb61ccd317a6c9.zip | |
Merge remote-tracking branch 'brunoais/feature/save-post-on-report' into develop
* brunoais/feature/save-post-on-report:
[feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopic
[feature/save-post-on-report] bbcode_nl2br missing.
[feature/save-post-on-report] Change the column type of reported text
[feature/save-post-on-report] Changed the name of the column
[feature/save-post-on-report] Bug fix table name
[feature/save-post-on-report] Saves the post reported when a report is creat
[feature/save-post-on-report] The complete changes for this feature
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_topic_review.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/posting_topic_review.html | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index 67627f9785..1c4b67044d 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -17,7 +17,7 @@ <div class="inner"><span class="corners-top"><span></span></span> {topic_review_row.L_IGNORE_POST} <!-- ELSE --> - <div class="post <!-- IF topic_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> + <div class="post <!-- IF topic_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF topic_review_row.POST_ID == REPORTED_POST_ID --> reported<!-- ENDIF -->"> <div class="inner"><span class="corners-top"><span></span></span> <!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/posting_topic_review.html b/phpBB/styles/subsilver2/template/posting_topic_review.html index 2bfa95f3d4..cbd6746a8a 100644 --- a/phpBB/styles/subsilver2/template/posting_topic_review.html +++ b/phpBB/styles/subsilver2/template/posting_topic_review.html @@ -51,6 +51,13 @@ <table width="100%" cellspacing="0" cellpadding="2"> <tr> <td> + <!-- IF topic_review_row.POST_ID == REPORTED_POST_ID --> + <table width="100%" cellspacing="0"> + <tr> + <span class="postreported">{REPORTED_IMG}</span> + </tr> + </table> + <!-- ENDIF --> <div class="postbody">{topic_review_row.MESSAGE}</div> <!-- IF topic_review_row.S_HAS_ATTACHMENTS --> |