From d5f4d288e92499b64e96aeafe673ed05708cc8da Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 28 May 2014 21:33:17 +0200
Subject: [ticket/12608] Improve notifications drop-down menu styling in header

PHPBB3-12608
---
 phpBB/phpbb/notification/type/base.php             | 36 ++++++++++++++++++++
 phpBB/phpbb/notification/type/disapprove_post.php  | 26 +++++++++++++--
 phpBB/phpbb/notification/type/disapprove_topic.php | 26 +++++++++++++--
 phpBB/phpbb/notification/type/pm.php               | 15 ++++++++-
 phpBB/phpbb/notification/type/post.php             | 14 +++++++-
 phpBB/phpbb/notification/type/report_pm.php        | 38 +++++++++++++++++-----
 phpBB/phpbb/notification/type/report_pm_closed.php | 14 +++++++-
 phpBB/phpbb/notification/type/report_post.php      | 38 +++++++++++++++++-----
 .../phpbb/notification/type/report_post_closed.php | 14 +++++++-
 phpBB/phpbb/notification/type/topic.php            | 28 ++++++++++++++--
 phpBB/phpbb/notification/type/type_interface.php   | 14 ++++++++
 11 files changed, 235 insertions(+), 28 deletions(-)

(limited to 'phpBB/phpbb/notification')

diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php
index c1d4d0e257..7e881d0c55 100644
--- a/phpBB/phpbb/notification/type/base.php
+++ b/phpBB/phpbb/notification/type/base.php
@@ -312,6 +312,12 @@ abstract class base implements \phpbb\notification\type\type_interface
 			'AVATAR'			=> $this->get_avatar(),
 
 			'FORMATTED_TITLE'	=> $this->get_title(),
+			
+			'REFERENCE'			=> $this->get_reference(),
+			
+			'FORUM'				=> $this->get_forum(),
+			
+			'REASON'			=> $this->get_reason(),
 
 			'URL'				=> $this->get_url(),
 			'TIME'	   			=> $this->user->format_date($this->notification_time),
@@ -346,6 +352,36 @@ abstract class base implements \phpbb\notification\type\type_interface
 		return '';
 	}
 
+	/**
+	* Get the reference of the notifcation (fall back)
+	*
+	* @return string
+	*/
+	public function get_reference()
+	{
+		return '';
+	}
+
+	/**
+	* Get the forum of the notification reference (fall back)
+	*
+	* @return string
+	*/
+	public function get_forum()
+	{
+		return '';
+	}
+
+	/**
+	* Get the reason for the notifcation (fall back)
+	*
+	* @return string
+	*/
+	public function get_reason()
+	{
+		return '';
+	}
+
 	/**
 	* Get the special items to load (fall back)
 	*
diff --git a/phpBB/phpbb/notification/type/disapprove_post.php b/phpBB/phpbb/notification/type/disapprove_post.php
index b5f94f404f..c3dbe4e91d 100644
--- a/phpBB/phpbb/notification/type/disapprove_post.php
+++ b/phpBB/phpbb/notification/type/disapprove_post.php
@@ -62,10 +62,32 @@ class disapprove_post extends \phpbb\notification\type\approve_post
 	* @return string
 	*/
 	public function get_title()
+	{
+		return $this->user->lang($this->language_key);
+	}
+
+	/**
+	* Get the HTML formatted reference of the notification
+	*
+	* @return string
+	*/
+	public function get_reference()
+	{
+		return $this->user->lang(
+			'NOTIFICATION_REFERENCE',
+			censor_text($this->get_data('topic_title'))
+		);
+	}
+
+	/**
+	* Get the reason for the disapproval notification
+	*
+	* @return string
+	*/
+	public function get_reason()
 	{
 		return $this->user->lang(
-			$this->language_key,
-			censor_text($this->get_data('topic_title')),
+			'NOTIFICATION_REASON',
 			$this->get_data('disapprove_reason')
 		);
 	}
diff --git a/phpBB/phpbb/notification/type/disapprove_topic.php b/phpBB/phpbb/notification/type/disapprove_topic.php
index 8883c53294..2f29bb271e 100644
--- a/phpBB/phpbb/notification/type/disapprove_topic.php
+++ b/phpBB/phpbb/notification/type/disapprove_topic.php
@@ -62,10 +62,32 @@ class disapprove_topic extends \phpbb\notification\type\approve_topic
 	* @return string
 	*/
 	public function get_title()
+	{
+		return $this->user->lang($this->language_key);
+	}
+
+	/**
+	* Get the HTML formatted reference of the notification
+	*
+	* @return string
+	*/
+	public function get_reference()
+	{
+		return $this->user->lang(
+			'NOTIFICATION_REFERENCE',
+			censor_text($this->get_data('topic_title'))
+		);
+	}
+
+	/**
+	* Get the reason for the disapproval notification
+	*
+	* @return string
+	*/
+	public function get_reason()
 	{
 		return $this->user->lang(
-			$this->language_key,
-			censor_text($this->get_data('topic_title')),
+			'NOTIFICATION_REASON',
 			$this->get_data('disapprove_reason')
 		);
 	}
diff --git a/phpBB/phpbb/notification/type/pm.php b/phpBB/phpbb/notification/type/pm.php
index 955d121cc6..4f54e93e06 100644
--- a/phpBB/phpbb/notification/type/pm.php
+++ b/phpBB/phpbb/notification/type/pm.php
@@ -111,7 +111,20 @@ class pm extends \phpbb\notification\type\base
 	{
 		$username = $this->user_loader->get_username($this->get_data('from_user_id'), 'no_profile');
 
-		return $this->user->lang('NOTIFICATION_PM', $username, $this->get_data('message_subject'));
+		return $this->user->lang('NOTIFICATION_PM', $username);
+	}
+
+	/**
+	* Get the HTML formatted reference of the notification
+	*
+	* @return string
+	*/
+	public function get_reference()
+	{
+		return $this->user->lang(
+			'NOTIFICATION_REFERENCE',
+			$this->get_data('message_subject')
+		);
 	}
 
 	/**
diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php
index c8760f904e..ee3a253e0f 100644
--- a/phpBB/phpbb/notification/type/post.php
+++ b/phpBB/phpbb/notification/type/post.php
@@ -225,11 +225,23 @@ class post extends \phpbb\notification\type\base
 		return $this->user->lang(
 			$this->language_key,
 			phpbb_generate_string_list($usernames, $this->user),
-			censor_text($this->get_data('topic_title')),
 			$responders_cnt
 		);
 	}
 
+	/**
+	* Get the HTML formatted reference of the notification
+	*
+	* @return string
+	*/
+	public function get_reference()
+	{
+		return $this->user->lang(
+			'NOTIFICATION_REFERENCE',
+			censor_text($this->get_data('topic_title'))
+		);
+	}
+
 	/**
 	* Get email template
 	*
diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php
index 03e89dd28e..2bf13d4aa6 100644
--- a/phpBB/phpbb/notification/type/report_pm.php
+++ b/phpBB/phpbb/notification/type/report_pm.php
@@ -159,12 +159,36 @@ class report_pm extends \phpbb\notification\type\pm
 
 		$username = $this->user_loader->get_username($this->get_data('reporter_id'), 'no_profile');
 
+		return $this->user->lang(
+			$this->language_key,
+			$username
+		);
+	}
+
+	/**
+	* Get the HTML formatted reference of the notification
+	*
+	* @return string
+	*/
+	public function get_reference()
+	{
+		return $this->user->lang(
+			'NOTIFICATION_REFERENCE',
+			censor_text($this->get_data('message_subject'))
+		);
+	}
+
+	/**
+	* Get the reason for the notification
+	*
+	* @return string
+	*/
+	public function get_reason()
+	{
 		if ($this->get_data('report_text'))
 		{
 			return $this->user->lang(
-				$this->language_key,
-				$username,
-				censor_text($this->get_data('message_subject')),
+				'NOTIFICATION_REASON',
 				$this->get_data('report_text')
 			);
 		}
@@ -172,17 +196,13 @@ class report_pm extends \phpbb\notification\type\pm
 		if (isset($this->user->lang[$this->get_data('reason_title')]))
 		{
 			return $this->user->lang(
-				$this->language_key,
-				$username,
-				censor_text($this->get_data('message_subject')),
+				'NOTIFICATION_REASON',
 				$this->user->lang[$this->get_data('reason_title')]
 			);
 		}
 
 		return $this->user->lang(
-			$this->language_key,
-			$username,
-			censor_text($this->get_data('message_subject')),
+			'NOTIFICATION_REASON',
 			$this->get_data('reason_description')
 		);
 	}
diff --git a/phpBB/phpbb/notification/type/report_pm_closed.php b/phpBB/phpbb/notification/type/report_pm_closed.php
index a646996f75..ed40df67f3 100644
--- a/phpBB/phpbb/notification/type/report_pm_closed.php
+++ b/phpBB/phpbb/notification/type/report_pm_closed.php
@@ -107,7 +107,19 @@ class report_pm_closed extends \phpbb\notification\type\pm
 
 		return $this->user->lang(
 			$this->language_key,
-			$username,
+			$username
+		);
+	}
+
+	/**
+	* Get the HTML formatted reference of the notification
+	*
+	* @return string
+	*/
+	public function get_reference()
+	{
+		return $this->user->lang(
+			'NOTIFICATION_REFERENCE',
 			censor_text($this->get_data('message_subject'))
 		);
 	}
diff --git a/phpBB/phpbb/notification/type/report_post.php b/phpBB/phpbb/notification/type/report_post.php
index d5589a6756..1a4682eb62 100644
--- a/phpBB/phpbb/notification/type/report_post.php
+++ b/phpBB/phpbb/notification/type/report_post.php
@@ -132,12 +132,36 @@ class report_post extends \phpbb\notification\type\post_in_queue
 
 		$username = $this->user_loader->get_username($this->get_data('reporter_id'), 'no_profile');
 
+		return $this->user->lang(
+			$this->language_key,
+			$username
+		);
+	}
+
+	/**
+	* Get the HTML formatted reference of the notification
+	*
+	* @return string
+	*/
+	public function get_reference()
+	{
+		return $this->user->lang(
+			'NOTIFICATION_REFERENCE',
+			censor_text($this->get_data('post_subject'))
+		);
+	}
+
+	/**
+	* Get the reason for the notification
+	*
+	* @return string
+	*/
+	public function get_reason()
+	{
 		if ($this->get_data('report_text'))
 		{
 			return $this->user->lang(
-				$this->language_key,
-				$username,
-				censor_text($this->get_data('post_subject')),
+				'NOTIFICATION_REASON',
 				$this->get_data('report_text')
 			);
 		}
@@ -145,17 +169,13 @@ class report_post extends \phpbb\notification\type\post_in_queue
 		if (isset($this->user->lang[$this->get_data('reason_title')]))
 		{
 			return $this->user->lang(
-				$this->language_key,
-				$username,
-				censor_text($this->get_data('post_subject')),
+				'NOTIFICATION_REASON',
 				$this->user->lang[$this->get_data('reason_title')]
 			);
 		}
 
 		return $this->user->lang(
-			$this->language_key,
-			$username,
-			censor_text($this->get_data('post_subject')),
+			'NOTIFICATION_REASON',
 			$this->get_data('reason_description')
 		);
 	}
diff --git a/phpBB/phpbb/notification/type/report_post_closed.php b/phpBB/phpbb/notification/type/report_post_closed.php
index e76fa57036..a979af1fb0 100644
--- a/phpBB/phpbb/notification/type/report_post_closed.php
+++ b/phpBB/phpbb/notification/type/report_post_closed.php
@@ -114,7 +114,19 @@ class report_post_closed extends \phpbb\notification\type\post
 
 		return $this->user->lang(
 			$this->language_key,
-			$username,
+			$username
+		);
+	}
+
+	/**
+	* Get the HTML formatted reference of the notification
+	*
+	* @return string
+	*/
+	public function get_reference()
+	{
+		return $this->user->lang(
+			'NOTIFICATION_REFERENCE',
 			censor_text($this->get_data('post_subject'))
 		);
 	}
diff --git a/phpBB/phpbb/notification/type/topic.php b/phpBB/phpbb/notification/type/topic.php
index 144c4e58a0..a512a12f20 100644
--- a/phpBB/phpbb/notification/type/topic.php
+++ b/phpBB/phpbb/notification/type/topic.php
@@ -151,8 +151,32 @@ class topic extends \phpbb\notification\type\base
 
 		return $this->user->lang(
 			$this->language_key,
-			$username,
-			censor_text($this->get_data('topic_title')),
+			$username
+		);
+	}
+
+	/**
+	* Get the HTML formatted reference of the notification
+	*
+	* @return string
+	*/
+	public function get_reference()
+	{
+		return $this->user->lang(
+			'NOTIFICATION_REFERENCE',
+			censor_text($this->get_data('topic_title'))
+		);
+	}
+
+	/**
+	* Get the forum of the notification reference
+	*
+	* @return string
+	*/
+	public function get_forum()
+	{
+		return $this->user->lang(
+			'NOTIFICATION_FORUM',
 			$this->get_data('forum_name')
 		);
 	}
diff --git a/phpBB/phpbb/notification/type/type_interface.php b/phpBB/phpbb/notification/type/type_interface.php
index c91c7078ad..5e139b797e 100644
--- a/phpBB/phpbb/notification/type/type_interface.php
+++ b/phpBB/phpbb/notification/type/type_interface.php
@@ -94,6 +94,20 @@ interface type_interface
 	*/
 	public function get_title();
 
+	/**
+	* Get the HTML formatted reference of the notification
+	*
+	* @return string
+	*/
+	public function get_reference();
+
+	/**
+	* Get the forum of the notification reference
+	*
+	* @return string
+	*/
+	public function get_forum();
+
 	/**
 	* Get the url to this item
 	*
-- 
cgit v1.2.1


From 693cbd247cc1d3768d56795da4a580780e6b899c Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 28 May 2014 22:49:16 +0200
Subject: [ticket/12608] Add styling (CSS class) options to notifications

This will allow different notifications to have different styles

PHPBB3-12608
---
 phpBB/phpbb/notification/type/base.php           | 12 ++++++++++++
 phpBB/phpbb/notification/type/report_pm.php      | 10 ++++++++++
 phpBB/phpbb/notification/type/report_post.php    | 10 ++++++++++
 phpBB/phpbb/notification/type/type_interface.php |  7 +++++++
 4 files changed, 39 insertions(+)

(limited to 'phpBB/phpbb/notification')

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
 	*
-- 
cgit v1.2.1


From 49a1896a76f205b30f7daf41056dca445eecb1d7 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Thu, 29 May 2014 13:09:47 +0200
Subject: [ticket/12608] Clean up whitespace

PHPBB3-12608
---
 phpBB/phpbb/notification/type/base.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/notification')

diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php
index f5a4a9cc45..db0446f510 100644
--- a/phpBB/phpbb/notification/type/base.php
+++ b/phpBB/phpbb/notification/type/base.php
@@ -314,11 +314,11 @@ abstract class base implements \phpbb\notification\type\type_interface
 			'AVATAR'			=> $this->get_avatar(),
 
 			'FORMATTED_TITLE'	=> $this->get_title(),
-			
+
 			'REFERENCE'			=> $this->get_reference(),
-			
+
 			'FORUM'				=> $this->get_forum(),
-			
+
 			'REASON'			=> $this->get_reason(),
 
 			'URL'				=> $this->get_url(),
-- 
cgit v1.2.1


From 976bda83dbfe207a29bf6c3a6fe72ceed75cd98f Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Thu, 29 May 2014 17:16:37 +0200
Subject: [ticket/12608] Improved LTR and various bugfixes

PHPBB3-12608
---
 phpBB/phpbb/notification/type/disapprove_post.php  | 10 ++++++++++
 phpBB/phpbb/notification/type/disapprove_topic.php | 10 ++++++++++
 2 files changed, 20 insertions(+)

(limited to 'phpBB/phpbb/notification')

diff --git a/phpBB/phpbb/notification/type/disapprove_post.php b/phpBB/phpbb/notification/type/disapprove_post.php
index c3dbe4e91d..004c484409 100644
--- a/phpBB/phpbb/notification/type/disapprove_post.php
+++ b/phpBB/phpbb/notification/type/disapprove_post.php
@@ -30,6 +30,16 @@ class disapprove_post extends \phpbb\notification\type\approve_post
 		return 'disapprove_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/disapprove_topic.php b/phpBB/phpbb/notification/type/disapprove_topic.php
index 2f29bb271e..42ca693f7a 100644
--- a/phpBB/phpbb/notification/type/disapprove_topic.php
+++ b/phpBB/phpbb/notification/type/disapprove_topic.php
@@ -30,6 +30,16 @@ class disapprove_topic extends \phpbb\notification\type\approve_topic
 		return 'disapprove_topic';
 	}
 
+	/**
+	* Get the styling of the notification
+	*
+	* @return string
+	*/
+	public function get_styling()
+	{
+		return 'reported';
+	}
+
 	/**
 	* Language key used to output the text
 	*
-- 
cgit v1.2.1


From 8e06d76aaa5179096923971893c26a7f8bfe2fbe Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Fri, 13 Jun 2014 09:42:57 +0200
Subject: [ticket/12608] Changed get_styling() to get_style_class()

PHPBB3-12608
---
 phpBB/phpbb/notification/type/base.php             | 15 +++------------
 phpBB/phpbb/notification/type/disapprove_post.php  |  4 ++--
 phpBB/phpbb/notification/type/disapprove_topic.php |  4 ++--
 phpBB/phpbb/notification/type/report_pm.php        |  4 ++--
 phpBB/phpbb/notification/type/report_post.php      |  4 ++--
 phpBB/phpbb/notification/type/type_interface.php   |  4 ++--
 6 files changed, 13 insertions(+), 22 deletions(-)

(limited to 'phpBB/phpbb/notification')

diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php
index db0446f510..910f51b3a6 100644
--- a/phpBB/phpbb/notification/type/base.php
+++ b/phpBB/phpbb/notification/type/base.php
@@ -308,24 +308,15 @@ abstract class base implements \phpbb\notification\type\type_interface
 
 		return array(
 			'NOTIFICATION_ID'	=> $this->notification_id,
-
-			'STYLING'			=> $this->get_styling(),
-
+			'STYLING'			=> $this->get_style_class(),
 			'AVATAR'			=> $this->get_avatar(),
-
 			'FORMATTED_TITLE'	=> $this->get_title(),
-
 			'REFERENCE'			=> $this->get_reference(),
-
 			'FORUM'				=> $this->get_forum(),
-
 			'REASON'			=> $this->get_reason(),
-
 			'URL'				=> $this->get_url(),
 			'TIME'	   			=> $this->user->format_date($this->notification_time),
-
 			'UNREAD'			=> !$this->notification_read,
-
 			'U_MARK_READ'		=> (!$this->notification_read) ? $u_mark_read : '',
 		);
 	}
@@ -345,11 +336,11 @@ abstract class base implements \phpbb\notification\type\type_interface
 	}
 
 	/**
-	* Get the styling of the notification (fall back)
+	* Get the CSS style class of the notification (fall back)
 	*
 	* @return string
 	*/
-	public function get_styling()
+	public function get_style_class()
 	{
 		return '';
 	}
diff --git a/phpBB/phpbb/notification/type/disapprove_post.php b/phpBB/phpbb/notification/type/disapprove_post.php
index 004c484409..044658c016 100644
--- a/phpBB/phpbb/notification/type/disapprove_post.php
+++ b/phpBB/phpbb/notification/type/disapprove_post.php
@@ -31,11 +31,11 @@ class disapprove_post extends \phpbb\notification\type\approve_post
 	}
 
 	/**
-	* Get the styling of the notification
+	* Get the CSS style class of the notification
 	*
 	* @return string
 	*/
-	public function get_styling()
+	public function get_style_class()
 	{
 		return 'reported';
 	}
diff --git a/phpBB/phpbb/notification/type/disapprove_topic.php b/phpBB/phpbb/notification/type/disapprove_topic.php
index 42ca693f7a..812045b352 100644
--- a/phpBB/phpbb/notification/type/disapprove_topic.php
+++ b/phpBB/phpbb/notification/type/disapprove_topic.php
@@ -31,11 +31,11 @@ class disapprove_topic extends \phpbb\notification\type\approve_topic
 	}
 
 	/**
-	* Get the styling of the notification
+	* Get the CSS style class of the notification
 	*
 	* @return string
 	*/
-	public function get_styling()
+	public function get_style_class()
 	{
 		return 'reported';
 	}
diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php
index 55bc52927f..d3d91dcd54 100644
--- a/phpBB/phpbb/notification/type/report_pm.php
+++ b/phpBB/phpbb/notification/type/report_pm.php
@@ -31,11 +31,11 @@ class report_pm extends \phpbb\notification\type\pm
 	}
 
 	/**
-	* Get the styling of the notification
+	* Get the CSS style class of the notification
 	*
 	* @return string
 	*/
-	public function get_styling()
+	public function get_style_class()
 	{
 		return 'reported';
 	}
diff --git a/phpBB/phpbb/notification/type/report_post.php b/phpBB/phpbb/notification/type/report_post.php
index c982042cb3..5a8febe927 100644
--- a/phpBB/phpbb/notification/type/report_post.php
+++ b/phpBB/phpbb/notification/type/report_post.php
@@ -30,11 +30,11 @@ class report_post extends \phpbb\notification\type\post_in_queue
 	}
 
 	/**
-	* Get the styling of the notification
+	* Get the CSS style class of the notification
 	*
 	* @return string
 	*/
-	public function get_styling()
+	public function get_style_class()
 	{
 		return 'reported';
 	}
diff --git a/phpBB/phpbb/notification/type/type_interface.php b/phpBB/phpbb/notification/type/type_interface.php
index b1e54d9b6b..5c5a110836 100644
--- a/phpBB/phpbb/notification/type/type_interface.php
+++ b/phpBB/phpbb/notification/type/type_interface.php
@@ -88,11 +88,11 @@ interface type_interface
 	public function load_special($data, $notifications);
 
 	/**
-	* Get the styling of the notification
+	* Get the CSS style class of the notification
 	*
 	* @return string
 	*/
-	public function get_styling();
+	public function get_style_class();
 
 	/**
 	* Get the HTML formatted title of this notification
-- 
cgit v1.2.1


From 1a3c1d5b9ad6def9da4186d79a32f583b892a7cd Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Sun, 22 Jun 2014 22:40:07 +0200
Subject: [ticket/12608] Change CSS classes to prevent styling conflicts

PHPBB3-12608
---
 phpBB/phpbb/notification/type/disapprove_post.php  | 2 +-
 phpBB/phpbb/notification/type/disapprove_topic.php | 2 +-
 phpBB/phpbb/notification/type/report_pm.php        | 2 +-
 phpBB/phpbb/notification/type/report_post.php      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/phpbb/notification')

diff --git a/phpBB/phpbb/notification/type/disapprove_post.php b/phpBB/phpbb/notification/type/disapprove_post.php
index 044658c016..7b18ed70ea 100644
--- a/phpBB/phpbb/notification/type/disapprove_post.php
+++ b/phpBB/phpbb/notification/type/disapprove_post.php
@@ -37,7 +37,7 @@ class disapprove_post extends \phpbb\notification\type\approve_post
 	*/
 	public function get_style_class()
 	{
-		return 'reported';
+		return 'notification-disapproved';
 	}
 
 	/**
diff --git a/phpBB/phpbb/notification/type/disapprove_topic.php b/phpBB/phpbb/notification/type/disapprove_topic.php
index 812045b352..3f87741807 100644
--- a/phpBB/phpbb/notification/type/disapprove_topic.php
+++ b/phpBB/phpbb/notification/type/disapprove_topic.php
@@ -37,7 +37,7 @@ class disapprove_topic extends \phpbb\notification\type\approve_topic
 	*/
 	public function get_style_class()
 	{
-		return 'reported';
+		return 'notification-disapproved';
 	}
 
 	/**
diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php
index d3d91dcd54..2eb802eb4b 100644
--- a/phpBB/phpbb/notification/type/report_pm.php
+++ b/phpBB/phpbb/notification/type/report_pm.php
@@ -37,7 +37,7 @@ class report_pm extends \phpbb\notification\type\pm
 	*/
 	public function get_style_class()
 	{
-		return 'reported';
+		return 'notification-reported';
 	}
 
 	/**
diff --git a/phpBB/phpbb/notification/type/report_post.php b/phpBB/phpbb/notification/type/report_post.php
index 5a8febe927..024c8d9d42 100644
--- a/phpBB/phpbb/notification/type/report_post.php
+++ b/phpBB/phpbb/notification/type/report_post.php
@@ -36,7 +36,7 @@ class report_post extends \phpbb\notification\type\post_in_queue
 	*/
 	public function get_style_class()
 	{
-		return 'reported';
+		return 'notification-reported';
 	}
 
 	/**
-- 
cgit v1.2.1