diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-05 08:26:29 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-05 08:26:29 -0700 |
| commit | ab0af38629f1f101a420f8f7f245f0afbf37ff76 (patch) | |
| tree | 7c56e952e44f2a4ec4642967725578e9f03573ae | |
| parent | 462355d6542e269b5da06c5a91f8d3a505723cd1 (diff) | |
| parent | 0b32a97c4711afccc77ff74b32cc0d0ff6b7d6bc (diff) | |
| download | forums-ab0af38629f1f101a420f8f7f245f0afbf37ff76.tar forums-ab0af38629f1f101a420f8f7f245f0afbf37ff76.tar.gz forums-ab0af38629f1f101a420f8f7f245f0afbf37ff76.tar.bz2 forums-ab0af38629f1f101a420f8f7f245f0afbf37ff76.tar.xz forums-ab0af38629f1f101a420f8f7f245f0afbf37ff76.zip | |
Merge pull request #1651 from cyberalien/ticket/11782
Fix layout of notices in posts
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_post.html | 8 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_topic.html | 20 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 43 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/bidi.css | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 15 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 29 |
7 files changed, 81 insertions, 43 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 4cdd62957c..7b2ace6792 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -14,7 +14,7 @@ <h3>{L_REPORT_REASON}{L_COLON} {REPORT_REASON_TITLE}</h3> <p class="author">{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} « {REPORT_DATE}</p> <!-- IF not S_POST_REPORTED --> - <p class="rules">{L_REPORT_CLOSED}</p> + <p class="post-notice reported">{L_REPORT_CLOSED}</p> <!-- ENDIF --> <div class="content"> <!-- IF REPORT_TEXT --> @@ -71,7 +71,7 @@ <!-- IF S_POST_UNAPPROVED --> <form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}"> - <p class="rules"> + <p class="post-notice unapproved"> <input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> <input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> <!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF --> @@ -82,7 +82,7 @@ <!-- ELSEIF S_POST_DELETED --> <form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}"> - <p class="rules"> + <p class="post-notice deleted"> <input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" /> <input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" /> <!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF --> @@ -93,7 +93,7 @@ <!-- ENDIF --> <!-- IF S_MESSAGE_REPORTED --> - <p class="rules"> + <p class="post-notice reported"> {REPORTED_IMG} <a href="{U_MCP_REPORT}"><strong>{L_MESSAGE_REPORTED}</strong></a> </p> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 0fd5a9455f..bfe18579a6 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -101,11 +101,21 @@ <h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3> <p class="author"><a href="#pr{postrow.POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p> - <!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_DELETED or postrow.S_POST_REPORTED --> - <p class="rules"> - <!-- IF postrow.S_POST_UNAPPROVED -->{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a><br /><!-- ENDIF --> - <!-- IF postrow.S_POST_DELETED -->{DELETED_IMG} <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_DELETED}</strong></a><br /><!-- ENDIF --> - <!-- IF postrow.S_POST_REPORTED -->{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a><!-- ENDIF --> + <!-- IF postrow.S_POST_UNAPPROVED --> + <p class="post-notice unapproved"> + <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a> + </p> + <!-- ENDIF --> + + <!-- IF postrow.S_POST_DELETED --> + <p class="post-notice deleted"> + <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_DELETED}</strong></a> + </p> + <!-- ENDIF --> + + <!-- IF postrow.S_POST_REPORTED --> + <p class="post-notice reported"> + <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a> </p> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 4f2531d3a6..50e76f5b75 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -62,7 +62,7 @@ <!-- ENDIF --> <!-- IF S_DISPLAY_NOTICE --> - <div class="rules">{L_DOWNLOAD_NOTICE}</div> + <div class="post-notice error">{L_DOWNLOAD_NOTICE}</div> <!-- ENDIF --> <!-- IF EDITED_MESSAGE or EDIT_REASON --> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 0dd4ff220d..e104257e12 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -151,29 +151,32 @@ <h3 <!-- IF postrow.S_FIRST_ROW -->class="first"<!-- ENDIF -->><!-- IF postrow.POST_ICON_IMG --><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></h3> <p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF -->{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> » {postrow.POST_DATE} </p> - <!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_DELETED or postrow.S_POST_REPORTED --> + <!-- IF postrow.S_POST_UNAPPROVED --> <form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}"> - <p class="rules"> - <!-- IF postrow.S_POST_UNAPPROVED --> - {UNAPPROVED_IMG} <strong>{L_POST_UNAPPROVED}</strong> - <input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> - <input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> - <input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" /> - {S_FORM_TOKEN} - <br /> - <!-- ELSEIF postrow.S_POST_DELETED --> - {DELETED_IMG} <strong>{L_POST_DELETED}</strong> - <input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" /> - <input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" /> - <input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" /> - {S_FORM_TOKEN} - <br /> - <!-- ENDIF --> - <!-- IF postrow.S_POST_REPORTED --> - {REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a> - <!-- ENDIF --> + <p class="post-notice unapproved"> + <strong>{L_POST_UNAPPROVED}</strong> + <input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> + <input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> + <input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" /> + {S_FORM_TOKEN} </p> </form> + <!-- ELSEIF postrow.S_POST_DELETED --> + <form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}"> + <p class="post-notice deleted"> + <strong>{L_POST_DELETED}</strong> + <input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" /> + <input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" /> + <input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" /> + {S_FORM_TOKEN} + </p> + </form> + <!-- ENDIF --> + + <!-- IF postrow.S_POST_REPORTED --> + <p class="post-notice reported"> + <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a> + </p> <!-- ENDIF --> <div class="content">{postrow.MESSAGE}</div> diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index a921805327..41a9874a18 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -371,6 +371,13 @@ float: right; } +.rtl p.post-notice:before { + left: auto; + right: 0; + padding-left: 5px; + padding-right: 26px; +} + /* Topic review panel ----------------------------------------*/ .rtl #topicreview { diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index db55540901..9e3d29bec2 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -214,11 +214,24 @@ div.rules { color: #BC2A4D; } -p.rules { +p.post-notice { background-color: #ECD5D8; background-image: none; } +p.post-notice.deleted:before { + background-image: url("./images/icon_topic_deleted.png"); +} + +p.post-notice.unapproved:before { + background-image: url("./images/icon_topic_unapproved.gif"); +} + +p.post-notice.reported:before, p.post-notice.error:before { + background-image: url("./images/icon_topic_reported.gif"); +} + + /* -------------------------------------------------------------- Colours and backgrounds for links.css diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index a2b8034187..4a77dc78d0 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -685,23 +685,28 @@ div.rules ul, div.rules ol { margin-left: 20px; } -p.rules { - background-image: none; +p.post-notice { + position: relative; padding: 5px; + padding-left: 26px; + min-height: 14px; + margin-bottom: 1em; } -p.rules img { - vertical-align: middle; -} - -p.rules strong { - vertical-align: middle; - padding-top: 5px; +p.post-notice:before { + content: ''; + display: block; + position: absolute; + top: 0; + bottom: 0; + left: 0; + width: 28px; + background: transparent none 50% 50% no-repeat; + pointer-events: none; } -p.rules a { - vertical-align: middle; - clear: both; +form > p.post-notice strong { + line-height: 20px; } #top { |