diff options
| -rw-r--r-- | phpBB/language/en/common.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/base.php | 12 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/report_pm.php | 10 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/report_post.php | 10 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/type_interface.php | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/notification_dropdown.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_notifications.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 9 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 2 |
9 files changed, 54 insertions, 6 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 09bac9e997..e8169fc41a 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -442,7 +442,7 @@ $lang = array_merge($lang, array( 'NOTIFICATION_BOOKMARK' => array( 1 => '<strong>Reply</strong> from %1$s in bookmarked topic:', ), - 'NOTIFICATION_FORUM' => 'Forum: "%1$s"', + 'NOTIFICATION_FORUM' => '<em>Forum:</em> %1$s', 'NOTIFICATION_GROUP_REQUEST' => '<strong>Group request</strong> from %1$s to join the group %2$s.', 'NOTIFICATION_GROUP_REQUEST_APPROVED' => '<strong>Group request approved</strong> to join the group %1$s.', 'NOTIFICATION_PM' => '<strong>Private Message</strong> from %1$s:', @@ -456,7 +456,7 @@ $lang = array_merge($lang, array( 1 => '<strong>Quoted</strong> by %1$s in:', ), 'NOTIFICATION_REFERENCE' => '"%1$s"', - 'NOTIFICATION_REASON' => 'Reason: "%1$s".', + 'NOTIFICATION_REASON' => '<em>Reason:</em> %1$s.', 'NOTIFICATION_REPORT_PM' => '<strong>Private Message reported</strong> by %1$s:', 'NOTIFICATION_REPORT_POST' => '<strong>Post reported</strong> by %1$s:', 'NOTIFICATION_REPORT_CLOSED' => '<strong>Report closed</strong> by %1$s for:', diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php index 7e881d0c55..f5a4a9cc45 100644 --- a/phpBB/phpbb/notification/type/base.php +++ b/phpBB/phpbb/notification/type/base.php @@ -309,6 +309,8 @@ abstract class base implements \phpbb\notification\type\type_interface return array( 'NOTIFICATION_ID' => $this->notification_id, + 'STYLING' => $this->get_styling(), + 'AVATAR' => $this->get_avatar(), 'FORMATTED_TITLE' => $this->get_title(), @@ -343,6 +345,16 @@ abstract class base implements \phpbb\notification\type\type_interface } /** + * Get the styling of the notification (fall back) + * + * @return string + */ + public function get_styling() + { + return ''; + } + + /** * Get the user's avatar (fall back) * * @return string diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php index 2bf13d4aa6..55bc52927f 100644 --- a/phpBB/phpbb/notification/type/report_pm.php +++ b/phpBB/phpbb/notification/type/report_pm.php @@ -31,6 +31,16 @@ class report_pm extends \phpbb\notification\type\pm } /** + * Get the styling of the notification + * + * @return string + */ + public function get_styling() + { + return 'reported'; + } + + /** * Language key used to output the text * * @var string diff --git a/phpBB/phpbb/notification/type/report_post.php b/phpBB/phpbb/notification/type/report_post.php index 1a4682eb62..c982042cb3 100644 --- a/phpBB/phpbb/notification/type/report_post.php +++ b/phpBB/phpbb/notification/type/report_post.php @@ -30,6 +30,16 @@ class report_post extends \phpbb\notification\type\post_in_queue } /** + * Get the styling of the notification + * + * @return string + */ + public function get_styling() + { + return 'reported'; + } + + /** * Language key used to output the text * * @var string diff --git a/phpBB/phpbb/notification/type/type_interface.php b/phpBB/phpbb/notification/type/type_interface.php index 5e139b797e..b1e54d9b6b 100644 --- a/phpBB/phpbb/notification/type/type_interface.php +++ b/phpBB/phpbb/notification/type/type_interface.php @@ -88,6 +88,13 @@ interface type_interface public function load_special($data, $notifications); /** + * Get the styling of the notification + * + * @return string + */ + public function get_styling(); + + /** * Get the HTML formatted title of this notification * * @return string diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index fbe0e1efd4..4aebeb16a8 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -18,13 +18,13 @@ </li> <!-- ENDIF --> <!-- BEGIN notifications --> - <li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->"> + <li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF --><!-- IF notifications.STYLING --> {notifications.STYLING}<!-- ENDIF -->"> <!-- IF notifications.URL --> <a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}" class="notification-block" data-real-url="{notifications.URL}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"> <!-- ENDIF --> <!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --> <div class="notification_text"> - <p class="title">{notifications.FORMATTED_TITLE}</p> + <p class="notification-title">{notifications.FORMATTED_TITLE}</p> <!-- IF notifications.REFERENCE --><p class="notification-reference">{notifications.REFERENCE}</p><!-- ENDIF --> <!-- IF notifications.FORUM --><p class="notification-forum">{notifications.FORUM}</p><!-- ENDIF --> <!-- IF notifications.REASON --><p class="notification-reason">{notifications.REASON}</p><!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 61df0c9cf5..a7cf2f43aa 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -65,7 +65,7 @@ </ul> <ul class="topiclist cplist two-columns"> <!-- BEGIN notification_list --> - <li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->"> + <li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF --><!-- IF notification_list.STYLING --> {notification_list.STYLING}<!-- ENDIF -->"> <dl> <dt> <div class="list-inner"> diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 875e61020b..a022c361c3 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -235,6 +235,15 @@ p.post-notice.reported:before, p.post-notice.error:before { background-image: url("./images/icon_topic_reported.gif"); } +.notification_list p.notification-time { + color: #4C5D77; +} + +.notification_list .reported p.notifications_title strong, +.notification_list .reported p.notification-title strong { + color: #D31141; +} + /* -------------------------------------------------------------- Colours and backgrounds for links.css diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 50e89928d0..75ae7ae59d 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1199,7 +1199,7 @@ form > p.post-notice strong { white-space: nowrap; } -.notification_list ul li p.notification-time { +.notification_list p.notification-time { font-size: 0.9em; margin: 0; text-align: right; |