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 => 'Reply from %1$s in bookmarked topic:', ), - 'NOTIFICATION_FORUM' => 'Forum: "%1$s"', + 'NOTIFICATION_FORUM' => 'Forum: %1$s', 'NOTIFICATION_GROUP_REQUEST' => 'Group request from %1$s to join the group %2$s.', 'NOTIFICATION_GROUP_REQUEST_APPROVED' => 'Group request approved to join the group %1$s.', 'NOTIFICATION_PM' => 'Private Message from %1$s:', @@ -456,7 +456,7 @@ $lang = array_merge($lang, array( 1 => 'Quoted by %1$s in:', ), 'NOTIFICATION_REFERENCE' => '"%1$s"', - 'NOTIFICATION_REASON' => 'Reason: "%1$s".', + 'NOTIFICATION_REASON' => 'Reason: %1$s.', 'NOTIFICATION_REPORT_PM' => 'Private Message reported by %1$s:', 'NOTIFICATION_REPORT_POST' => 'Post reported by %1$s:', 'NOTIFICATION_REPORT_CLOSED' => 'Report closed 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(), @@ -342,6 +344,16 @@ abstract class base implements \phpbb\notification\type\type_interface return false; } + /** + * Get the styling of the notification (fall back) + * + * @return string + */ + public function get_styling() + { + return ''; + } + /** * Get the user's avatar (fall back) * 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 @@ -30,6 +30,16 @@ class report_pm extends \phpbb\notification\type\pm return 'report_pm'; } + /** + * Get the styling of the notification + * + * @return string + */ + public function get_styling() + { + return 'reported'; + } + /** * Language key used to output the text * 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 @@ -29,6 +29,16 @@ class report_post extends \phpbb\notification\type\post_in_queue return 'report_post'; } + /** + * Get the styling of the notification + * + * @return string + */ + public function get_styling() + { + return 'reported'; + } + /** * Language key used to output the text * 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 @@ -87,6 +87,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 * 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 @@ -
  • +
  • {notifications.AVATAR}
    -

    {notifications.FORMATTED_TITLE}

    +

    {notifications.FORMATTED_TITLE}

    {notifications.REFERENCE}

    {notifications.FORUM}

    {notifications.REASON}

    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 @@
      -
    • +
    • 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;