From 9a5363462b54cf137a1ec0149c0fa6cfbeca5e7c Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sun, 11 Aug 2013 19:57:34 +0300 Subject: [PATCH 1/4] [ticket/11782] Change p.rules to p.post-notice in templates PHPBB3-11782 --- phpBB/styles/prosilver/template/mcp_post.html | 8 ++-- .../styles/prosilver/template/mcp_topic.html | 20 ++++++--- .../template/ucp_pm_viewmessage.html | 2 +- .../prosilver/template/viewtopic_body.html | 43 ++++++++++--------- 4 files changed, 43 insertions(+), 30 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 @@

{L_REPORT_REASON}{L_COLON} {REPORT_REASON_TITLE}

{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} « {REPORT_DATE}

-

{L_REPORT_CLOSED}

+

{L_REPORT_CLOSED}

@@ -71,7 +71,7 @@
-

+

  @@ -82,7 +82,7 @@ -

+

  @@ -93,7 +93,7 @@ -

+

{REPORTED_IMG} {L_MESSAGE_REPORTED}

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 @@

{postrow.POST_SUBJECT}

{postrow.MINI_POST_IMG} {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} [ {L_POST_DETAILS} ]

- -

- {UNAPPROVED_IMG} {L_POST_UNAPPROVED}
- {DELETED_IMG} {L_POST_DELETED}
- {REPORTED_IMG} {L_POST_REPORTED} + +

+ {L_POST_UNAPPROVED} +

+ + + +

+ {L_POST_DELETED} +

+ + + +

+ {L_POST_REPORTED}

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 @@ -
{L_DOWNLOAD_NOTICE}
+
{L_DOWNLOAD_NOTICE}
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index c8a99b18e4..0f0961eba2 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -151,29 +151,32 @@

class="first"> {postrow.POST_SUBJECT}

{postrow.MINI_POST_IMG}{postrow.MINI_POST_IMG}{L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_DATE}

- + -

- - {UNAPPROVED_IMG} {L_POST_UNAPPROVED} - - - - {S_FORM_TOKEN} -
- - {DELETED_IMG} {L_POST_DELETED} - - - - {S_FORM_TOKEN} -
- - - {REPORTED_IMG} {L_POST_REPORTED} - +

+ {L_POST_UNAPPROVED} + + + + {S_FORM_TOKEN}

+ +
+

+ {L_POST_DELETED} + + + + {S_FORM_TOKEN} +

+
+ + + +

+ {L_POST_REPORTED} +

{postrow.MESSAGE}
From 788238d7a989951747307b15eaa2192253e81535 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sun, 11 Aug 2013 20:00:41 +0300 Subject: [PATCH 2/4] [ticket/11782] Change p.rules to p.post-notice in CSS PHPBB3-11782 --- phpBB/styles/prosilver/theme/colours.css | 15 +++++++++++- phpBB/styles/prosilver/theme/common.css | 29 ++++++++++++++---------- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 5548905ede..7736371460 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..cdafc706df 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.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 strong { - vertical-align: middle; - padding-top: 5px; -} - -p.rules a { - vertical-align: middle; - clear: both; +form p.post-notice strong { + line-height: 20px; } #top { From c63901fcb59f3795023dc9ea2b35c616fa08b756 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sun, 11 Aug 2013 20:01:15 +0300 Subject: [PATCH 3/4] [ticket/11782] RTL support for post notices PHPBB3-11782 --- phpBB/styles/prosilver/theme/bidi.css | 7 +++++++ 1 file changed, 7 insertions(+) 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 { From 0b32a97c4711afccc77ff74b32cc0d0ff6b7d6bc Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sun, 11 Aug 2013 20:10:33 +0300 Subject: [PATCH 4/4] [ticket/11782] Apply line-height correctly Apply line-height only to bolded elements inside post notices that are direct child elements of forms. PHPBB3-11782 --- phpBB/styles/prosilver/theme/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index cdafc706df..4a77dc78d0 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -705,7 +705,7 @@ p.post-notice:before { pointer-events: none; } -form p.post-notice strong { +form > p.post-notice strong { line-height: 20px; }