makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1651 from cyberalien/ticket/11782

Browse source 
Fix layout of notices in posts
This commit is contained in:
Nathan Guse 2013-09-05 08:26:29 -07:00
commit ab0af38629
7 changed files with 81 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/styles/prosilver/template/mcp_post.html
View file

@ -14,7 +14,7 @@
<h3>{L_REPORT_REASON}{L_COLON} {REPORT_REASON_TITLE}</h3> <h3>{L_REPORT_REASON}{L_COLON} {REPORT_REASON_TITLE}</h3>
<p class="author">{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} &laquo; {REPORT_DATE}</p> <p class="author">{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} &laquo; {REPORT_DATE}</p>
<!-- IF not S_POST_REPORTED --> <!-- IF not S_POST_REPORTED -->
<p class="rules">{L_REPORT_CLOSED}</p> <p class="post-notice reported">{L_REPORT_CLOSED}</p>
<!-- ENDIF --> <!-- ENDIF -->
<div class="content"> <div class="content">
<!-- IF REPORT_TEXT --> <!-- IF REPORT_TEXT -->
@ -71,7 +71,7 @@
<!-- IF S_POST_UNAPPROVED --> <!-- IF S_POST_UNAPPROVED -->
<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}"> <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]" /> &nbsp; <input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> &nbsp;
<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> <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 --> <!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF -->
@ -82,7 +82,7 @@
<!-- ELSEIF S_POST_DELETED --> <!-- ELSEIF S_POST_DELETED -->
<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}"> <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]" /> &nbsp; <input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" /> &nbsp;
<input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" /> <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 --> <!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF -->
@ -93,7 +93,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_MESSAGE_REPORTED --> <!-- 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> {REPORTED_IMG} <a href="{U_MCP_REPORT}"><strong>{L_MESSAGE_REPORTED}</strong></a>
</p> </p>
<!-- ENDIF --> <!-- ENDIF -->

20
phpBB/styles/prosilver/template/mcp_topic.html
View file

@ -101,11 +101,21 @@
<h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3> <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> <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 --> <!-- IF postrow.S_POST_UNAPPROVED -->
<p class="rules"> <p class="post-notice unapproved">
<!-- IF postrow.S_POST_UNAPPROVED -->{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a><br /><!-- ENDIF --> <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a>
<!-- IF postrow.S_POST_DELETED -->{DELETED_IMG} <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_DELETED}</strong></a><br /><!-- ENDIF --> </p>
<!-- IF postrow.S_POST_REPORTED -->{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a><!-- ENDIF --> <!-- 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> </p>
<!-- ENDIF --> <!-- ENDIF -->

2
phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
View file

@ -62,7 +62,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_DISPLAY_NOTICE --> <!-- IF S_DISPLAY_NOTICE -->
<div class="rules">{L_DOWNLOAD_NOTICE}</div> <div class="post-notice error">{L_DOWNLOAD_NOTICE}</div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF EDITED_MESSAGE or EDIT_REASON --> <!-- IF EDITED_MESSAGE or EDIT_REASON -->

43
phpBB/styles/prosilver/template/viewtopic_body.html
View file

@ -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> <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> &raquo; {postrow.POST_DATE} </p> <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> &raquo; {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}"> <form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}">
<p class="rules"> <p class="post-notice unapproved">
<!-- IF postrow.S_POST_UNAPPROVED --> <strong>{L_POST_UNAPPROVED}</strong>
{UNAPPROVED_IMG} <strong>{L_POST_UNAPPROVED}</strong> <input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" />
<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> <input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />
<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> <input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" />
<input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" /> {S_FORM_TOKEN}
{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> </p>
</form> </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 --> <!-- ENDIF -->
<div class="content">{postrow.MESSAGE}</div> <div class="content">{postrow.MESSAGE}</div>

7
phpBB/styles/prosilver/theme/bidi.css
View file

@ -371,6 +371,13 @@
float: right; float: right;
} }
.rtl p.post-notice:before {
left: auto;
right: 0;
padding-left: 5px;
padding-right: 26px;
}
/* Topic review panel /* Topic review panel
----------------------------------------*/ ----------------------------------------*/
.rtl #topicreview { .rtl #topicreview {

15
phpBB/styles/prosilver/theme/colours.css
View file

@ -214,11 +214,24 @@ div.rules {
color: #BC2A4D; color: #BC2A4D;
} }
p.rules { p.post-notice {
background-color: #ECD5D8; background-color: #ECD5D8;
background-image: none; 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 Colours and backgrounds for links.css

29
phpBB/styles/prosilver/theme/common.css
View file

@ -685,23 +685,28 @@ div.rules ul, div.rules ol {
margin-left: 20px; margin-left: 20px;
} }
p.rules { p.post-notice {
background-image: none; position: relative;
padding: 5px; padding: 5px;
padding-left: 26px;
min-height: 14px;
margin-bottom: 1em;
} }
p.rules img { p.post-notice:before {
vertical-align: middle; 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 strong { form > p.post-notice strong {
vertical-align: middle; line-height: 20px;
padding-top: 5px;
}
p.rules a {
vertical-align: middle;
clear: both;
} }
#top { #top {