From e45fb0025ec8c27147caee7e3c14902f2e3f02c5 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 12:05:55 -0500
Subject: [ticket/11103] Output the notifications to the template

For now, just dumping the notifications in the header.

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 43ae83767d..77fdb230ad 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -166,3 +166,10 @@
 			</div>
 		</div>
 		<!-- ENDIF -->
+
+<!-- BEGIN notifications -->
+	<p>
+		<a href="{notifications.URL}">{notifications.TITLE}</a><br />
+		{notifications.TIME}
+	</p>
+<!-- END notifications -->
\ No newline at end of file
-- 
cgit v1.2.1


From 5502f3c4aa30ce72131f2a55bcfa3db7a4059427 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 17:20:39 -0500
Subject: [ticket/11103] Restyle the notification list

Very rough (lots of inline CSS, very ugly)

PHPBB3-11103
---
 .../styles/prosilver/template/overall_header.html  | 25 +++++++++++++++-------
 phpBB/styles/prosilver/theme/common.css            |  8 +++++++
 2 files changed, 25 insertions(+), 8 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 77fdb230ad..1695f8d03a 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -132,6 +132,22 @@
 			<ul class="linklist leftside">
 				<li class="icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
+					<a href="#" title="{L_NOTIFICATIONS}" onClick="$('#notification_list').toggle();">{L_NOTIFICATIONS}</a>
+					<div id="notification_list" style="display: block; position: absolute; width: 330px; background-color: #FFFFFF; z-index: 1;">
+						<ul style="list-style-type: none;">
+						<!-- BEGIN notifications -->
+							<li style="margin: 10px;">
+								<a href="{notifications.URL}" style="text-decoration: none;">
+									{notifications.AVATAR}
+									<div>
+										{notifications.FORMATTED_TITLE}<br />
+										{notifications.TIME}
+									</div>
+								</a>
+							</li>
+				   			<!-- END notifications -->
+						</ul>
+					</div>
 						<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
 					<!-- IF S_DISPLAY_SEARCH --> &bull;
 					<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
@@ -165,11 +181,4 @@
 				<strong>{L_INFORMATION}:</strong> {L_BOARD_DISABLED}
 			</div>
 		</div>
-		<!-- ENDIF -->
-
-<!-- BEGIN notifications -->
-	<p>
-		<a href="{notifications.URL}">{notifications.TITLE}</a><br />
-		{notifications.TIME}
-	</p>
-<!-- END notifications -->
\ No newline at end of file
+		<!-- ENDIF -->
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 4b4fa263b1..a3f2a83886 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -665,3 +665,11 @@ p.rules a {
 .smilies {
 	vertical-align: text-bottom;
 }
+
+.notifications-avatar {
+	float: left;
+	padding: 0 10px 10px 0;
+
+	max-width: 50px;
+	max-height: 50px;
+}
-- 
cgit v1.2.1


From fb0ed78c8fffe95d40e47c8dd27d44973eba88ae Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 15:59:13 -0500
Subject: [ticket/11103] Store the item's parent id for marking things read

Mark topics/posts read from the markread() function.

Identify unread items by a grey background in the header (for now)

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 1695f8d03a..8c0cc562ae 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -136,7 +136,7 @@
 					<div id="notification_list" style="display: block; position: absolute; width: 330px; background-color: #FFFFFF; z-index: 1;">
 						<ul style="list-style-type: none;">
 						<!-- BEGIN notifications -->
-							<li style="margin: 10px;">
+							<li style="padding: 10px; width: 310px;<!-- IF notifications.UNREAD --> background-color: grey;<!-- ENDIF -->">
 								<a href="{notifications.URL}" style="text-decoration: none;">
 									{notifications.AVATAR}
 									<div>
-- 
cgit v1.2.1


From 7589a3093d95048f5a8cfdc6259501f43fd3fe10 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 18:30:12 -0500
Subject: [ticket/11103] Display all unread notifications by default

Add unread count to the page title

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 8c0cc562ae..1805ca6b8a 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -5,7 +5,7 @@
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
-<title><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
+<title><!-- IF NUM_UNREAD_NOTIFICATIONS -->({NUM_UNREAD_NOTIFICATIONS}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
 
 <!-- IF S_ENABLE_FEEDS -->
 	<!-- IF S_ENABLE_FEEDS_OVERALL --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{U_FEED}" /><!-- ENDIF -->
-- 
cgit v1.2.1


From aaf6711b44c8f86d8fc5ca0d29fb95598ddba762 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 10:15:50 -0500
Subject: [ticket/11103] Some tweaks to the notifications output

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 1805ca6b8a..a702c6fc69 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -133,10 +133,10 @@
 				<li class="icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
 					<a href="#" title="{L_NOTIFICATIONS}" onClick="$('#notification_list').toggle();">{L_NOTIFICATIONS}</a>
-					<div id="notification_list" style="display: block; position: absolute; width: 330px; background-color: #FFFFFF; z-index: 1;">
+					<div id="notification_list" style="display: none; position: absolute; width: 330px; max-height: 450px; background-color: #FFFFFF; z-index: 1; overflow-y: scroll;">
 						<ul style="list-style-type: none;">
 						<!-- BEGIN notifications -->
-							<li style="padding: 10px; width: 310px;<!-- IF notifications.UNREAD --> background-color: grey;<!-- ENDIF -->">
+							<li style="padding: 10px; width: 290px;<!-- IF notifications.UNREAD --> background-color: grey;<!-- ENDIF -->">
 								<a href="{notifications.URL}" style="text-decoration: none;">
 									{notifications.AVATAR}
 									<div>
-- 
cgit v1.2.1


From 05b573ebf76c737f89deaefd22ce963aa910e5d1 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 13:51:02 -0500
Subject: [ticket/11103] Topic and post dis/approval notifications

Remove the formatted title function, plaintext is not needed since
email templates are used

Fix a number of bugs.

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index e217ceb449..87e0a2fa92 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -137,13 +137,13 @@
 						<ul style="list-style-type: none;">
 						<!-- BEGIN notifications -->
 							<li style="padding: 10px; width: 290px;<!-- IF notifications.UNREAD --> background-color: grey;<!-- ENDIF -->">
-								<a href="{notifications.URL}" style="text-decoration: none;">
+								<!-- IF notifications.URL --><a href="{notifications.URL}" style="text-decoration: none;"><!-- ENDIF -->
 									{notifications.AVATAR}
 									<div>
 										{notifications.FORMATTED_TITLE}<br />
 										{notifications.TIME}
 									</div>
-								</a>
+								<!-- IF notifications.URL --></a><!-- ENDIF -->
 							</li>
 				   			<!-- END notifications -->
 						</ul>
-- 
cgit v1.2.1


From b081729f25dab258ac4259907ba1af1a16ee8138 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 14:47:58 -0500
Subject: [ticket/11103] Revert the changes to functions_display.php

The css we need to apply to avatars can be applied through css rules.
We don't need to be able to specify a class for the img.

PHPBB3-11103
---
 phpBB/styles/prosilver/theme/common.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index a3f2a83886..a1c71fe228 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -666,7 +666,7 @@ p.rules a {
 	vertical-align: text-bottom;
 }
 
-.notifications-avatar {
+#notification_list ul li img {
 	float: left;
 	padding: 0 10px 10px 0;
 
-- 
cgit v1.2.1


From 661dd09d6f44b46e5a30b37bb3425058f055ea01 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 16 Sep 2012 23:03:00 -0500
Subject: [ticket/11103] Bug fix

PHPBB3-11103
---
 phpBB/styles/prosilver/theme/common.css | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index a1c71fe228..d459c6e559 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -669,7 +669,6 @@ p.rules a {
 #notification_list ul li img {
 	float: left;
 	padding: 0 10px 10px 0;
-
 	max-width: 50px;
 	max-height: 50px;
 }
-- 
cgit v1.2.1


From 98731b127748af4673fdee92db2e139e84fd4d4b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 20 Sep 2012 10:36:11 -0500
Subject: [ticket/11103] Prettify the output for prosilver.

Create a way to mark items read from the output list.

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ajax.js             |  7 +++++++
 phpBB/styles/prosilver/template/overall_header.html | 18 ++++++++++--------
 phpBB/styles/prosilver/theme/common.css             | 20 ++++++++++++++++++++
 3 files changed, 37 insertions(+), 8 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 54f34e4204..d98070a114 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -77,6 +77,13 @@ $('#qr_full_editor').click(function() {
 });
 
 
+/**
+ * Toggle notification list
+ */
+$('#notification_list_button').click(function() {
+	$('#notification_list').toggle();
+});
+
 
 /**
  * This AJAXifies the quick-mod tools. The reason it cannot be a standard
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 87e0a2fa92..242ad60e70 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -130,25 +130,27 @@
 
 			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 			<ul class="linklist leftside">
-				<li class="icon-ucp">
-					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
-					<a href="#" title="{L_NOTIFICATIONS}" onClick="$('#notification_list').toggle();">{L_NOTIFICATIONS}</a>
-					<div id="notification_list" style="display: none; position: absolute; width: 330px; max-height: 450px; background-color: #FFFFFF; z-index: 1; overflow-y: scroll;">
-						<ul style="list-style-type: none;">
+				<li>
+					[ <a href="#" id="notification_list_button" title="{L_NOTIFICATIONS}">{L_NOTIFICATIONS}</a> ] &bull;
+					<div id="notification_list">
+						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
-							<li style="padding: 10px; width: 290px;<!-- IF notifications.UNREAD --> background-color: grey;<!-- ENDIF -->">
-								<!-- IF notifications.URL --><a href="{notifications.URL}" style="text-decoration: none;"><!-- ENDIF -->
+							<li class="row<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
+								<!-- IF notifications.URL --><a href="{notifications.URL}"><!-- ENDIF -->
 									{notifications.AVATAR}
 									<div>
 										{notifications.FORMATTED_TITLE}<br />
 										{notifications.TIME}
 									</div>
 								<!-- IF notifications.URL --></a><!-- ENDIF -->
+								<!-- IF notifications.UNREAD --><a href="{notifications.U_MARK_READ}" title="{L_MARK_READ}">{L_MARK_READ}</a><!-- ENDIF -->
 							</li>
 				   			<!-- END notifications -->
 						</ul>
 					</div>
-						<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
+				</li>
+				<li class="icon-ucp">
+					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
 					<!-- IF S_DISPLAY_SEARCH --> &bull;
 					<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
 					<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index d459c6e559..1f5b45e006 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -666,6 +666,26 @@ p.rules a {
 	vertical-align: text-bottom;
 }
 
+#notification_list {
+	display: none;
+	position: absolute;
+	width: 330px;
+	max-height: 350px;
+	z-index: 1;
+	overflow-y: auto;
+	overflow-x: hidden;
+	background-color: #FFFFFF;
+}
+
+#notification_list ul li {
+	padding: 10px;
+	width: 310px;
+}
+
+#notification_list ul li a {
+	text-decoration: none;
+}
+
 #notification_list ul li img {
 	float: left;
 	padding: 0 10px 10px 0;
-- 
cgit v1.2.1


From a8e53bda36ee88e5aeb3eec6a7ffee3ddadec5a9 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Sep 2012 10:10:49 -0500
Subject: [ticket/11103] Display number of notifications in the [ Notifications
 ] link

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 242ad60e70..94830bb3a5 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -131,7 +131,7 @@
 			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 			<ul class="linklist leftside">
 				<li>
-					[ <a href="#" id="notification_list_button" title="{L_NOTIFICATIONS}">{L_NOTIFICATIONS}</a> ] &bull;
+					[ <a href="#" id="notification_list_button" title="{L_NOTIFICATIONS}">{NUM_UNREAD_NOTIFICATIONS} {L_NOTIFICATIONS}</a> ] &bull;
 					<div id="notification_list">
 						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
-- 
cgit v1.2.1


From e66117409c68242832f76cdb456d16c40573639e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 26 Sep 2012 22:39:12 -0500
Subject: [ticket/11103] More work on the UCP Notifications page

PHPBB3-11103
---
 .../prosilver/template/ucp_notifications.html      | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 phpBB/styles/prosilver/template/ucp_notifications.html

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
new file mode 100644
index 0000000000..776e565dd0
--- /dev/null
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -0,0 +1,48 @@
+<!-- INCLUDE ucp_header.html -->
+
+<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
+
+<div class="panel">
+	<div class="inner">
+		<ul class="topiclist">
+			<li class="header">
+				<dl class="icon">
+					<dt>{L_NOTIFICATION_TYPE}</dt>
+						<dd class="topics">{L_NOTIFICATIONS}</dd>
+					<!-- BEGIN notification_methods -->
+						<dd class="topics">{notification_methods.NAME}</dd>
+					<!-- END notification_methods -->
+				</dl>
+			</li>
+		</ul>
+	<ul class="topiclist cplist">
+
+		<!-- BEGIN notification_types -->
+			<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
+				<dl class="icon">
+					<dt>
+						{notification_types.NAME}<br />
+						{notification_types.DESC}
+					</dt>
+						<dd class="topics"><input type="checkbox" name="{notification_types.TYPE}_notification" /> <dfn>{notification_methods.NAME}</dfn></dd>
+					<!-- BEGIN notification_methods -->
+						<dd class="topics"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}" /> <dfn>{notification_methods.NAME}</dfn></dd>
+					<!-- END notification_methods -->
+				</dl>
+			</li>
+		<!-- END notification_types -->
+
+		</ul>
+	</div>
+</div>
+
+
+<fieldset class="submit-buttons">
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	{S_FORM_TOKEN}
+</fieldset>
+
+</form>
+
+<!-- INCLUDE ucp_footer.html -->
-- 
cgit v1.2.1


From 544fbe35f4b5cd12e4556c9c300f471a4092dc41 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 26 Sep 2012 22:59:22 -0500
Subject: [ticket/11103] Some tweaks to the template output

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ucp_notifications.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 776e565dd0..7ded4d01fe 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -8,10 +8,10 @@
 			<li class="header">
 				<dl class="icon">
 					<dt>{L_NOTIFICATION_TYPE}</dt>
-						<dd class="topics">{L_NOTIFICATIONS}</dd>
 					<!-- BEGIN notification_methods -->
-						<dd class="topics">{notification_methods.NAME}</dd>
+						<dd class="mark">{notification_methods.NAME}</dd>
 					<!-- END notification_methods -->
+					<dd class="mark">{L_NOTIFICATIONS}</dd>
 				</dl>
 			</li>
 		</ul>
@@ -21,13 +21,12 @@
 			<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 				<dl class="icon">
 					<dt>
-						{notification_types.NAME}<br />
-						{notification_types.DESC}
+						{notification_types.NAME}
 					</dt>
-						<dd class="topics"><input type="checkbox" name="{notification_types.TYPE}_notification" /> <dfn>{notification_methods.NAME}</dfn></dd>
 					<!-- BEGIN notification_methods -->
-						<dd class="topics"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}" /> <dfn>{notification_methods.NAME}</dfn></dd>
+						<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}" /> <dfn>{notification_methods.NAME}</dfn></dd>
 					<!-- END notification_methods -->
+					<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification" /> <dfn>{notification_methods.NAME}</dfn></dd>
 				</dl>
 			</li>
 		<!-- END notification_types -->
-- 
cgit v1.2.1


From ae91a0a846828b44a53c2a7cd724e0ba062b0f3e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 10:37:37 -0500
Subject: [ticket/11103] Allow grouping of multiple types in ucp notification
 options

Ability to hide notification types from UCP Notification options
(if users do not have permission to use the notification type, or for
whatever reason they should not see it)

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ucp_notifications.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 7ded4d01fe..0479e66efe 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -6,7 +6,7 @@
 	<div class="inner">
 		<ul class="topiclist">
 			<li class="header">
-				<dl class="icon">
+				<dl>
 					<dt>{L_NOTIFICATION_TYPE}</dt>
 					<!-- BEGIN notification_methods -->
 						<dd class="mark">{notification_methods.NAME}</dd>
@@ -15,11 +15,11 @@
 				</dl>
 			</li>
 		</ul>
-	<ul class="topiclist cplist">
+		<ul class="topiclist cplist">
 
 		<!-- BEGIN notification_types -->
 			<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-				<dl class="icon">
+				<dl>
 					<dt>
 						{notification_types.NAME}
 					</dt>
-- 
cgit v1.2.1


From 48ccc9eb93c8413f05f6a50d40e597f560c671d8 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 18:25:37 -0500
Subject: [ticket/11103] UCP Notification Options can now be set

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html    | 2 +-
 phpBB/styles/prosilver/template/ucp_notifications.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 94830bb3a5..ff4e5d7b25 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -131,7 +131,7 @@
 			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 			<ul class="linklist leftside">
 				<li>
-					[ <a href="#" id="notification_list_button" title="{L_NOTIFICATIONS}">{NUM_UNREAD_NOTIFICATIONS} {L_NOTIFICATIONS}</a> ] &bull;
+					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_CNT}">{NOTIFICATIONS_CNT}</a> ] &bull;
 					<div id="notification_list">
 						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 0479e66efe..c6665c16c0 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -24,9 +24,9 @@
 						{notification_types.NAME}
 					</dt>
 					<!-- BEGIN notification_methods -->
-						<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}" /> <dfn>{notification_methods.NAME}</dfn></dd>
+						<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
 					<!-- END notification_methods -->
-					<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification" /> <dfn>{notification_methods.NAME}</dfn></dd>
+					<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
 				</dl>
 			</li>
 		<!-- END notification_types -->
-- 
cgit v1.2.1


From dfb17f444ae560a0af1b242cfbf85008cd993816 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 19:04:47 -0500
Subject: [ticket/11103] Fix module setup, add explanation to template

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ucp_notifications.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index c6665c16c0..531ffd3e6a 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -2,8 +2,12 @@
 
 <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
 
+<h2>{L_UCP_NOTIFICATION_OPTIONS}</h2>
 <div class="panel">
 	<div class="inner">
+
+		<p>{L_UCP_NOTIFICATION_OPTIONS_EXPLAIN}</p>
+
 		<ul class="topiclist">
 			<li class="header">
 				<dl>
-- 
cgit v1.2.1


From ba7289b9d273df4f3dfb228ab37d324ff17cc9db Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 19:19:38 -0500
Subject: [ticket/11103] Use PM Notification Preferences from Notification
 Options

Remove all PM Notification preferences from UCP Board Preferences

PHPBB3-11103
---
 .../prosilver/template/ucp_prefs_personal.html     | 24 ----------------------
 1 file changed, 24 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
index 29c01e03b9..f03cb2af38 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
@@ -38,31 +38,7 @@
 				<label for="hideonline0"><input type="radio" name="hideonline" id="hideonline0" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
-	<!-- ENDIF -->		
-	<!-- IF S_SELECT_NOTIFY -->
-		<dl>
-			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}:</label></dt>
-			<dd>
-				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label> 
-				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label> 
-				<label for="notifymethod2"><input type="radio" name="notifymethod" id="notifymethod2" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label>
-			</dd>
-		</dl>
 	<!-- ENDIF -->
-	<dl>
-		<dt><label for="notifypm1">{L_NOTIFY_ON_PM}:</label></dt>
-		<dd>
-			<label for="notifypm1"><input type="radio" name="notifypm" id="notifypm1" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="notifypm0"><input type="radio" name="notifypm" id="notifypm0" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="popuppm0">{L_POPUP_ON_PM}:</label></dt>
-		<dd>
-			<label for="popuppm1"><input type="radio" name="popuppm" id="popuppm1" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="popuppm0"><input type="radio" name="popuppm" id="popuppm0" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
 	<dl>
 		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
 		<dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd>
-- 
cgit v1.2.1


From 07fb66ac1090dfe92431ed749b520115595f7927 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Oct 2012 14:31:00 -0500
Subject: [ticket/11103] Do not abbreviate template output

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index ff4e5d7b25..690caea36b 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -5,7 +5,7 @@
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
-<title><!-- IF NUM_UNREAD_NOTIFICATIONS -->({NUM_UNREAD_NOTIFICATIONS}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
+<title><!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
 
 <!-- IF S_ENABLE_FEEDS -->
 	<!-- IF S_ENABLE_FEEDS_OVERALL --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{U_FEED}" /><!-- ENDIF -->
@@ -131,7 +131,7 @@
 			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 			<ul class="linklist leftside">
 				<li>
-					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_CNT}">{NOTIFICATIONS_CNT}</a> ] &bull;
+					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list">
 						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
-- 
cgit v1.2.1


From 0bab8ff777bcb82361b75441c085ee2e510db5cc Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Oct 2012 13:43:03 -0500
Subject: [ticket/11103] ACP option to enable/disable notifications output in
 header

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 690caea36b..2f789f3f2c 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -130,6 +130,7 @@
 
 			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 			<ul class="linklist leftside">
+				<!-- IF S_NOTIFICATIONS_DISPLAY -->
 				<li>
 					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list">
@@ -149,6 +150,7 @@
 						</ul>
 					</div>
 				</li>
+				<!-- ENDIF -->
 				<li class="icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
 					<!-- IF S_DISPLAY_SEARCH --> &bull;
-- 
cgit v1.2.1


From cb937841269017d13058208378e4c9ad79718c6e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Oct 2012 20:02:38 -0500
Subject: [ticket/11103] UCP Notification List

PHPBB3-11103
---
 .../styles/prosilver/template/overall_header.html  |   2 +-
 .../prosilver/template/ucp_notifications.html      | 122 +++++++++++++++------
 phpBB/styles/prosilver/theme/common.css            |   4 +-
 3 files changed, 94 insertions(+), 34 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 2f789f3f2c..e00ad555ff 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -133,7 +133,7 @@
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
 				<li>
 					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
-					<div id="notification_list">
+					<div id="notification_list" class="notification_list">
 						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
 							<li class="row<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 531ffd3e6a..3ee58a278e 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -2,45 +2,105 @@
 
 <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
 
-<h2>{L_UCP_NOTIFICATION_OPTIONS}</h2>
+<h2>{TITLE}</h2>
 <div class="panel">
 	<div class="inner">
 
-		<p>{L_UCP_NOTIFICATION_OPTIONS_EXPLAIN}</p>
-
-		<ul class="topiclist">
-			<li class="header">
-				<dl>
-					<dt>{L_NOTIFICATION_TYPE}</dt>
-					<!-- BEGIN notification_methods -->
-						<dd class="mark">{notification_methods.NAME}</dd>
-					<!-- END notification_methods -->
-					<dd class="mark">{L_NOTIFICATIONS}</dd>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist cplist">
-
-		<!-- BEGIN notification_types -->
-			<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-				<dl>
-					<dt>
-						{notification_types.NAME}
-					</dt>
-					<!-- BEGIN notification_methods -->
-						<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
-					<!-- END notification_methods -->
-					<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
-				</dl>
-			</li>
-		<!-- END notification_types -->
-
-		</ul>
+		<p>{TITLE_EXPLAIN}</p>
+
+		<!-- IF MODE == 'notification_options' -->
+			<ul class="topiclist">
+				<li class="header">
+					<dl>
+						<dt>{L_NOTIFICATION_TYPE}</dt>
+						<!-- BEGIN notification_methods -->
+							<dd class="mark">{notification_methods.NAME}</dd>
+						<!-- END notification_methods -->
+						<dd class="mark">{L_NOTIFICATIONS}</dd>
+					</dl>
+				</li>
+			</ul>
+			<ul class="topiclist cplist">
+
+			<!-- BEGIN notification_types -->
+				<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
+					<dl>
+						<dt>
+							{notification_types.NAME}
+						</dt>
+						<!-- BEGIN notification_methods -->
+							<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
+						<!-- END notification_methods -->
+						<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
+					</dl>
+				</li>
+			<!-- END notification_types -->
+			</ul>
+		<!-- ELSE -->
+			<!-- IF .pagination or TOTAL_COUNT -->
+				<div class="topic-actions">
+					<div class="pagination">
+						<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a> &bull; <!-- ENDIF -->
+						<!-- IF TOTAL_COUNT -->{TOTAL_COUNT} &bull; <!-- ENDIF -->
+						<!-- IF .pagination -->
+							<!-- INCLUDE pagination.html -->
+						<!-- ELSE -->
+							{PAGE_NUMBER}
+						<!-- ENDIF -->
+					</div>
+				</div>
+			<!-- ENDIF -->
+
+			<ul class="topiclist">
+				<li class="header">
+					<dl>
+						<dt>{L_NOTIFICATIONS}</dt>
+						<dd class="mark">{L_MARK_READ}</dd>
+					</dl>
+				</li>
+			</ul>
+
+			<div class="notification_list">
+				<ul class="topiclist cplist">
+				<!-- 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 -->">
+						<dl>
+							<dt>
+								<!-- IF notification_list.URL --><a href="{notification_list.URL}"><!-- ENDIF -->
+									{notification_list.AVATAR}
+									<div>
+										{notification_list.FORMATTED_TITLE}<br />
+										{notification_list.TIME}
+									</div>
+								<!-- IF notification_list.URL --></a><!-- ENDIF -->
+							</dt>
+							<dd class="mark"><!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF --></dd>
+						</dl>
+					</li>
+				<!-- END notification_list -->
+				</ul>
+			</div>
+
+			<!-- IF .pagination or TOTAL_COUNT -->
+				<div class="topic-actions">
+					<div class="pagination">
+						<!-- IF TOTAL_COUNT -->{TOTAL_COUNT} &bull; <!-- ENDIF -->
+						<!-- IF .pagination -->
+							<!-- INCLUDE pagination.html -->
+						<!-- ELSE -->
+							{PAGE_NUMBER}
+						<!-- ENDIF -->
+					</div>
+				</div>
+			<!-- ENDIF -->
+
+		<!-- ENDIF -->
 	</div>
 </div>
 
 
 <fieldset class="submit-buttons">
+	<input type="hidden" name="form_time" value="{FORM_TIME}" />
 	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 1f5b45e006..3d8d640598 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -682,11 +682,11 @@ p.rules a {
 	width: 310px;
 }
 
-#notification_list ul li a {
+.notification_list ul li a {
 	text-decoration: none;
 }
 
-#notification_list ul li img {
+.notification_list ul li img {
 	float: left;
 	padding: 0 10px 10px 0;
 	max-width: 50px;
-- 
cgit v1.2.1


From c5f280351a96aaebd90c27da095c9b1ff28624a5 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Oct 2012 23:52:49 -0500
Subject: [ticket/11103] UCP Notification option grouping

Also add the ability to specify an _EXPLAIN text for the notification option

PHPBB3-11103
---
 .../prosilver/template/ucp_notifications.html      | 33 ++++++++++++++--------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 3ee58a278e..94e8432508 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -23,17 +23,28 @@
 			<ul class="topiclist cplist">
 
 			<!-- BEGIN notification_types -->
-				<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-					<dl>
-						<dt>
-							{notification_types.NAME}
-						</dt>
-						<!-- BEGIN notification_methods -->
-							<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
-						<!-- END notification_methods -->
-						<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
-					</dl>
-				</li>
+				<!-- IF notification_types.GROUP_NAME -->
+					<li class="row bg3">
+						<dl>
+							<dt>
+								{notification_types.GROUP_NAME}
+							</dt>
+						</dl>
+					</li>
+				<!-- ELSE -->
+					<li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
+						<dl>
+							<dt>
+								{notification_types.NAME}
+								<!-- IF notification_types.EXPLAIN --><br />&nbsp; &nbsp;{notification_types.EXPLAIN}<!-- ENDIF -->
+							</dt>
+							<!-- BEGIN notification_methods -->
+								<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
+							<!-- END notification_methods -->
+							<dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd>
+						</dl>
+					</li>
+				<!-- ENDIF -->
 			<!-- END notification_types -->
 			</ul>
 		<!-- ELSE -->
-- 
cgit v1.2.1


From 716635c834dd2d6644f3d47c67f7184f95a35c0b Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 10:58:23 -0500
Subject: [ticket/11103] Fix some language strings

Newlines at end of email files

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ajax.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index d98070a114..0fd56f0e28 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -76,15 +76,11 @@ $('#qr_full_editor').click(function() {
 	});
 });
 
-
-/**
- * Toggle notification list
- */
+// Toggle notification list
 $('#notification_list_button').click(function() {
 	$('#notification_list').toggle();
 });
 
-
 /**
  * This AJAXifies the quick-mod tools. The reason it cannot be a standard
  * callback / data attribute is that it requires filtering - some of the options
-- 
cgit v1.2.1


From a48f09033810148fd9b2d5a0b6a683f14ac73a6a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 12:35:35 -0500
Subject: [ticket/11103] Make sure notifications are marked read when clicking
 them

How do we do this? If an item is unread, the URL to view that item will
be the URL to mark it as read (index.php?mark_notification=$id). When the
URL is visited it marks the item as read and redirects them to the correct
URL for the item.

If the item is read, the URL is directly to the item.

Prettify the html output

PHPBB-11103
---
 .../styles/prosilver/template/overall_header.html  | 15 +++++++------
 .../prosilver/template/ucp_notifications.html      | 15 ++++++++-----
 phpBB/styles/prosilver/theme/common.css            | 26 +++++++++++++++++-----
 3 files changed, 37 insertions(+), 19 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index e00ad555ff..20b98c6f8c 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -137,14 +137,15 @@
 						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
 							<li class="row<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
-								<!-- IF notifications.URL --><a href="{notifications.URL}"><!-- ENDIF -->
-									{notifications.AVATAR}
-									<div>
-										{notifications.FORMATTED_TITLE}<br />
-										{notifications.TIME}
-									</div>
+								<!-- IF notifications.URL or notifications.U_MARK_READ --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
+								<span>
+										{notifications.AVATAR}
+										<span class="notification_title">
+											{notifications.FORMATTED_TITLE}
+											<div class="notification_time">{notifications.TIME}</div>
+										</span>
+								</span>
 								<!-- IF notifications.URL --></a><!-- ENDIF -->
-								<!-- IF notifications.UNREAD --><a href="{notifications.U_MARK_READ}" title="{L_MARK_READ}">{L_MARK_READ}</a><!-- ENDIF -->
 							</li>
 				   			<!-- END notifications -->
 						</ul>
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 94e8432508..f71d8698b9 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -77,14 +77,17 @@
 					<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->">
 						<dl>
 							<dt>
-								<!-- IF notification_list.URL --><a href="{notification_list.URL}"><!-- ENDIF -->
-									{notification_list.AVATAR}
-									<div>
-										{notification_list.FORMATTED_TITLE}<br />
-										{notification_list.TIME}
-									</div>
+								<!-- IF notification_list.URL or notification_list.U_MARK_READ --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
+								<span>
+										{notification_list.AVATAR}
+										<span class="notification_title">
+											{notification_list.FORMATTED_TITLE}
+											<div class="notification_time">{notification_list.TIME}</div>
+										</span>
+								</span>
 								<!-- IF notification_list.URL --></a><!-- ENDIF -->
 							</dt>
+
 							<dd class="mark"><!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF --></dd>
 						</dl>
 					</li>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 3d8d640598..c82fa5b7c8 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -680,15 +680,29 @@ p.rules a {
 #notification_list ul li {
 	padding: 10px;
 	width: 310px;
+	line-height: 1.5em;
 }
 
-.notification_list ul li a {
-	text-decoration: none;
-}
-
-.notification_list ul li img {
+.notification_list ul li a span img {
 	float: left;
-	padding: 0 10px 10px 0;
 	max-width: 50px;
 	max-height: 50px;
 }
+
+.notification_list ul li span .notification_title {
+	float: left;
+	width: 240px;
+	margin: 0 0 0 5px;
+	word-wrap: break-word;
+	position: relative;
+	top: -0.2em;
+}
+
+.notification_list ul li dl dt span .notification_title {
+	width: auto;
+	padding: 10px 0 0 0;
+}
+
+.notification_time {
+	margin-top: 0.5em;
+}
-- 
cgit v1.2.1


From 2284a14813ec0d6ef82a622f33c70d442a761f38 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 13:45:00 -0500
Subject: [ticket/11103] If notification display is disabled, show PM Info in
 header

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 20b98c6f8c..f6bc57fa4b 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -154,6 +154,7 @@
 				<!-- ENDIF -->
 				<li class="icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
+					<!-- IF not S_NOTIFICATIONS_DISPLAY and S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
 					<!-- IF S_DISPLAY_SEARCH --> &bull;
 					<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
 					<!-- ENDIF -->
-- 
cgit v1.2.1


From c8b66a26ef4f6ac2a71980c75a13356dcda72dd6 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 10:51:07 -0500
Subject: [ticket/11103] Mark read link if notification has no URL to view it

Other style stuff

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html    |  7 ++++++-
 phpBB/styles/prosilver/template/ucp_notifications.html |  9 +++++++--
 phpBB/styles/prosilver/theme/common.css                | 10 ++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index f6bc57fa4b..8fcd595972 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -137,7 +137,7 @@
 						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
 							<li class="row<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
-								<!-- IF notifications.URL or notifications.U_MARK_READ --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
+								<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
 								<span>
 										{notifications.AVATAR}
 										<span class="notification_title">
@@ -146,6 +146,11 @@
 										</span>
 								</span>
 								<!-- IF notifications.URL --></a><!-- ENDIF -->
+								<!-- IF not notifications.URL and notifications.UNREAD -->
+									<span class="mark_notification_read">
+										<a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
+									</span>
+								<!-- ENDIF -->
 							</li>
 				   			<!-- END notifications -->
 						</ul>
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index f71d8698b9..08b5396827 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -77,7 +77,7 @@
 					<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->">
 						<dl>
 							<dt>
-								<!-- IF notification_list.URL or notification_list.U_MARK_READ --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
+								<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
 								<span>
 										{notification_list.AVATAR}
 										<span class="notification_title">
@@ -86,9 +86,14 @@
 										</span>
 								</span>
 								<!-- IF notification_list.URL --></a><!-- ENDIF -->
+								<!-- IF not notifications.URL and notifications.UNREAD -->
+									<span class="mark_notification_read">
+										<a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
+									</span>
+								<!-- ENDIF -->
 							</dt>
 
-							<dd class="mark"><!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF --></dd>
+							<dd class="mark">&nbsp;<!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF -->&nbsp;</dd>
 						</dl>
 					</li>
 				<!-- END notification_list -->
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index c82fa5b7c8..6e825f82ce 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -683,6 +683,10 @@ p.rules a {
 	line-height: 1.5em;
 }
 
+.notification_list ul.topiclist dt {
+	width: 70%;
+}
+
 .notification_list ul li a span img {
 	float: left;
 	max-width: 50px;
@@ -706,3 +710,9 @@ p.rules a {
 .notification_time {
 	margin-top: 0.5em;
 }
+
+.mark_notification_read {
+	clear: both;
+	float: left;
+	margin-top: 0.5em;
+}
-- 
cgit v1.2.1


From 25ef4d6f91e7723b0573ecbf66c0109170eae5d0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 11:14:51 -0500
Subject: [ticket/11103] Correct some CSS

PHPBB3-11103
---
 phpBB/styles/prosilver/theme/common.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 6e825f82ce..9b2475384e 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -687,7 +687,7 @@ p.rules a {
 	width: 70%;
 }
 
-.notification_list ul li a span img {
+.notification_list ul li span img {
 	float: left;
 	max-width: 50px;
 	max-height: 50px;
-- 
cgit v1.2.1


From ee006888296c38e650a62f0c19e4fd3e241327ee Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 16:47:45 -0500
Subject: [ticket/11103] Restyling notifications list for prosilver

PHPBB3-11103
---
 .../styles/prosilver/template/overall_header.html  | 34 +++++-----
 .../prosilver/template/ucp_notifications.html      | 56 +++++++---------
 phpBB/styles/prosilver/theme/colours.css           | 31 ++++++---
 phpBB/styles/prosilver/theme/common.css            | 77 ++++++++++++++--------
 4 files changed, 115 insertions(+), 83 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 8fcd595972..3b50ca732d 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -134,26 +134,30 @@
 				<li>
 					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list" class="notification_list">
-						<ul class="topiclist forums">
-						<!-- BEGIN notifications -->
-							<li class="row<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
+						<div class="header">
+							{L_NOTIFICATIONS}
+						</div>
+						<ul>
+							<!-- BEGIN notifications -->
+							<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
 								<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
-								<span>
-										{notifications.AVATAR}
-										<span class="notification_title">
-											{notifications.FORMATTED_TITLE}
-											<div class="notification_time">{notifications.TIME}</div>
-										</span>
-								</span>
+									{notifications.AVATAR}
+									<div>
+										<p>{notifications.FORMATTED_TITLE}</p>
+										<p>{notifications.TIME}</p>
+
+										<!-- IF not notifications.URL and notifications.U_MARK_READ -->
+											<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
+										<!-- ENDIF -->
+									</div>
 								<!-- IF notifications.URL --></a><!-- ENDIF -->
-								<!-- IF not notifications.URL and notifications.UNREAD -->
-									<span class="mark_notification_read">
-										<a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
-									</span>
-								<!-- ENDIF -->
 							</li>
 				   			<!-- END notifications -->
 						</ul>
+
+						<div class="footer">
+							<a style="display: block;" href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
+						</div>
 					</div>
 				</li>
 				<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 08b5396827..728fe972b1 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -62,41 +62,35 @@
 				</div>
 			<!-- ENDIF -->
 
-			<ul class="topiclist">
-				<li class="header">
-					<dl>
-						<dt>{L_NOTIFICATIONS}</dt>
-						<dd class="mark">{L_MARK_READ}</dd>
-					</dl>
-				</li>
-			</ul>
-
 			<div class="notification_list">
-				<ul class="topiclist cplist">
-				<!-- 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 -->">
+				<ul class="topiclist">
+					<li class="header">
 						<dl>
-							<dt>
-								<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
-								<span>
-										{notification_list.AVATAR}
-										<span class="notification_title">
-											{notification_list.FORMATTED_TITLE}
-											<div class="notification_time">{notification_list.TIME}</div>
-										</span>
-								</span>
-								<!-- IF notification_list.URL --></a><!-- ENDIF -->
-								<!-- IF not notifications.URL and notifications.UNREAD -->
-									<span class="mark_notification_read">
-										<a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
-									</span>
-								<!-- ENDIF -->
-							</dt>
-
-							<dd class="mark">&nbsp;<!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF -->&nbsp;</dd>
+							<dt>{L_NOTIFICATIONS}</dt>
+							<dd class="mark">{L_MARK_READ}</dd>
 						</dl>
 					</li>
-				<!-- END notification_list -->
+					<!-- 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 -->">
+							<dl>
+								<dt>
+									<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
+										{notification_list.AVATAR}
+										<div>
+											<p>{notification_list.FORMATTED_TITLE}</p>
+											<p>{notification_list.TIME}</p>
+
+											<!-- IF not notification_list.URL and notification_list.U_MARK_READ -->
+												<p><a href="{notification_list.U_MARK_READ}">{L_MARK_READ}</a></p>
+											<!-- ENDIF -->
+										</div>
+									<!-- IF notification_list.URL --></a><!-- ENDIF -->
+								</dt>
+
+								<dd class="mark">&nbsp;<!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF -->&nbsp;</dd>
+							</dl>
+						</li>
+					<!-- END notification_list -->
 				</ul>
 			</div>
 
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 29968cbb14..49e404a903 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1,4 +1,4 @@
-/*  	
+/*
 --------------------------------------------------------------
 Colours and backgrounds for common.css
 -------------------------------------------------------------- */
@@ -65,7 +65,7 @@ hr {
 
 .panel {
 	background-color: #ECF1F3;
-	color: #28313F;	
+	color: #28313F;
 }
 
 .post:target .content {
@@ -219,7 +219,7 @@ p.rules {
 	background-image: none;
 }
 
-/*  	
+/*
 --------------------------------------------------------------
 Colours and backgrounds for links.css
 -------------------------------------------------------------- */
@@ -312,7 +312,7 @@ a.topictitle:active {
 	color: #105289;
 }
 
-/* Profile searchresults */	
+/* Profile searchresults */
 .search .postprofile a {
 	color: #105289;
 }
@@ -349,7 +349,7 @@ a.right:hover {
 }
 
 
-/*  	
+/*
 --------------------------------------------------------------
 Colours and backgrounds for content.css
 -------------------------------------------------------------- */
@@ -644,7 +644,7 @@ fieldset.polls dd div {
 	background-image: url("./en/icon_user_online.gif");
 }
 
-/*  	
+/*
 --------------------------------------------------------------
 Colours and backgrounds for buttons.css
 -------------------------------------------------------------- */
@@ -752,7 +752,7 @@ a.sendemail {
 .pm_read														{ background-image: url("./images/topic_read.gif"); }
 .pm_unread														{ background-image: url("./images/topic_unread.gif"); }
 
-/*  	
+/*
 --------------------------------------------------------------
 Colours and backgrounds for cp.css
 -------------------------------------------------------------- */
@@ -921,7 +921,7 @@ dl.mini dt {
 	background-color: #EEE;
 }
 
-/*  	
+/*
 --------------------------------------------------------------
 Colours and backgrounds for forms.css
 -------------------------------------------------------------- */
@@ -976,7 +976,7 @@ fieldset.quick-login input.inputbox {
 /* Input field styles
 ---------------------------------------- */
 .inputbox {
-	background-color: #FFFFFF; 
+	background-color: #FFFFFF;
 	border-color: #B4BAC0;
 	color: #333333;
 }
@@ -1044,3 +1044,16 @@ input.disabled {
 	background-color: #000000;
 }
 
+#notification_list {
+	background-color: #FFFFFF;
+	border-color: #00608F;
+}
+
+#notification_list ul li:hover {
+	background-color: #CFE1F6;
+	color: #000000;
+}
+
+#notification_list > .header, .notification_list > .footer {
+	border-color: #00608F;
+}
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 9b2475384e..cbbc829a27 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -9,8 +9,8 @@ b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
 	margin: 0;
@@ -21,7 +21,7 @@ time, mark, audio, video {
 	vertical-align: baseline;
 }
 /* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
+article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
 	display: block;
 }
@@ -164,7 +164,7 @@ ul ul, ol ul {
 
 ol ol ul, ol ul ul, ul ol ul, ul ul ul {
 	list-style-type: square;
-} 
+}
 
 
 /* Main blocks
@@ -670,49 +670,70 @@ p.rules a {
 	display: none;
 	position: absolute;
 	width: 330px;
-	max-height: 350px;
 	z-index: 1;
+	border: 1px solid;
+	border-radius: 4px;
+	box-shadow: 4px 4px 5px;
+}
+
+#notification_list ul {
+	max-height: 350px;
 	overflow-y: auto;
 	overflow-x: hidden;
-	background-color: #FFFFFF;
 }
 
 #notification_list ul li {
+	width: ;
 	padding: 10px;
+	margin: 0;
+	float: left;
+	border-bottom: 1px solid;
+	list-style-type: none;
+	font-size: 0.95em;
+	clear: both;
+}
+
+#notification_list ul li {
 	width: 310px;
-	line-height: 1.5em;
 }
 
-.notification_list ul.topiclist dt {
-	width: 70%;
+#notification_list ul li:last-child {
+	border-bottom: 0px;
 }
 
-.notification_list ul li span img {
-	float: left;
-	max-width: 50px;
-	max-height: 50px;
+#notification_list > .header {
+	padding: 0 5px;
+	font-weight: bold;
+	border-bottom: 1px solid;
 }
 
-.notification_list ul li span .notification_title {
-	float: left;
-	width: 240px;
-	margin: 0 0 0 5px;
-	word-wrap: break-word;
-	position: relative;
-	top: -0.2em;
+#notification_list > .footer {
+	text-align: center;
+	font-size: 1.2em;
+	border-top: 1px solid;
 }
 
-.notification_list ul li dl dt span .notification_title {
-	width: auto;
-	padding: 10px 0 0 0;
+#notification_list ul li a, .notification_list dt > a {
+	display: block;
 }
 
-.notification_time {
-	margin-top: 0.5em;
+.notification_list ul li img {
+	float: left;
+	max-width: 50px;
+	max-height: 50px;
+	margin-right: 5px;
 }
 
-.mark_notification_read {
-	clear: both;
+#notification_list ul li div {
+	width: 240px;
 	float: left;
-	margin-top: 0.5em;
 }
+
+.notification_list ul li p {
+	margin: 0;
+	word-wrap: break-word;
+}
+
+.notification_list ul.topiclist dt {
+	width: 88%;
+}
\ No newline at end of file
-- 
cgit v1.2.1


From 901739b0c6f0034fe91e38b19eba010975dd8fdd Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 17:28:08 -0500
Subject: [ticket/11103] Fix some style code I missed in prosilver

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 3 ++-
 phpBB/styles/prosilver/theme/common.css             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 3b50ca732d..21a1fde7ea 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -137,6 +137,7 @@
 						<div class="header">
 							{L_NOTIFICATIONS}
 						</div>
+
 						<ul>
 							<!-- BEGIN notifications -->
 							<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
@@ -156,7 +157,7 @@
 						</ul>
 
 						<div class="footer">
-							<a style="display: block;" href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
+							<a href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
 						</div>
 					</div>
 				</li>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index cbbc829a27..863feb576b 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -713,7 +713,7 @@ p.rules a {
 	border-top: 1px solid;
 }
 
-#notification_list ul li a, .notification_list dt > a {
+#notification_list ul li a, .notification_list dt > a, #notification_list > .footer > a {
 	display: block;
 }
 
-- 
cgit v1.2.1


From 3557b391154286d1cb18a6e6f88925758247860d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 17:31:48 -0500
Subject: [ticket/11103] Hide notifications flyout on a click outside of the
 list.

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ajax.js | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 0fd56f0e28..f4519bf7aa 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -80,6 +80,13 @@ $('#qr_full_editor').click(function() {
 $('#notification_list_button').click(function() {
 	$('#notification_list').toggle();
 });
+$('#phpbb').click(function(e) {
+    var target = e.target;
+
+    if (!$(target).is('#notification_list') && !$(target).is('#notification_list_button') && !$(target).parents().is('#notification_list')) {
+        $('#notification_list').hide();
+    }
+});
 
 /**
  * This AJAXifies the quick-mod tools. The reason it cannot be a standard
-- 
cgit v1.2.1


From 0d098ae5e5768e6ceb21a65f350f521ebe3c1908 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 18:14:06 -0500
Subject: [ticket/11103] Return false to prevent appending # to the URL

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ajax.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index f4519bf7aa..3c5e1a1c12 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -79,6 +79,7 @@ $('#qr_full_editor').click(function() {
 // Toggle notification list
 $('#notification_list_button').click(function() {
 	$('#notification_list').toggle();
+	return false;
 });
 $('#phpbb').click(function(e) {
     var target = e.target;
-- 
cgit v1.2.1


From 883a96172065b5eb7b07f7c6e19ff2b1d5079ef9 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 18 Oct 2012 18:25:26 -0500
Subject: [ticket/11103] Use e.preventDefault();

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ajax.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 3c5e1a1c12..c221a47b48 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -77,9 +77,9 @@ $('#qr_full_editor').click(function() {
 });
 
 // Toggle notification list
-$('#notification_list_button').click(function() {
+$('#notification_list_button').click(function(e) {
 	$('#notification_list').toggle();
-	return false;
+	e.preventDefault();
 });
 $('#phpbb').click(function(e) {
     var target = e.target;
-- 
cgit v1.2.1


From 2c06c2bd3646585a5b02e6269be655287352a667 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 18 Oct 2012 19:20:54 -0500
Subject: [ticket/11103] Declare $ for jQuery, check for instance of, newlines
 at eof

PHPBB3-11103
---
 phpBB/styles/prosilver/theme/common.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 863feb576b..bf1f4edeea 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -736,4 +736,4 @@ p.rules a {
 
 .notification_list ul.topiclist dt {
 	width: 88%;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.1


From 6861af22eecfa4a254eb62245ee109d8e5635f93 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 19:19:26 -0500
Subject: [ticket/11103] Message of no notifications if you have none

PHPBB3-11103
---
 .../styles/prosilver/template/overall_header.html  | 31 +++++++++++++---------
 .../prosilver/template/ucp_notifications.html      |  7 +++++
 2 files changed, 25 insertions(+), 13 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 21a1fde7ea..5ec707dbcf 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -139,20 +139,25 @@
 						</div>
 
 						<ul>
+							<!-- IF not .notifications -->
+								<li>
+									{L_NO_NOTIFICATIONS}
+								</li>
+							<!-- ENDIF -->
 							<!-- BEGIN notifications -->
-							<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
-								<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
-									{notifications.AVATAR}
-									<div>
-										<p>{notifications.FORMATTED_TITLE}</p>
-										<p>{notifications.TIME}</p>
-
-										<!-- IF not notifications.URL and notifications.U_MARK_READ -->
-											<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
-										<!-- ENDIF -->
-									</div>
-								<!-- IF notifications.URL --></a><!-- ENDIF -->
-							</li>
+								<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
+									<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
+										{notifications.AVATAR}
+										<div>
+											<p>{notifications.FORMATTED_TITLE}</p>
+											<p>{notifications.TIME}</p>
+
+											<!-- IF not notifications.URL and notifications.U_MARK_READ -->
+												<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
+											<!-- ENDIF -->
+										</div>
+									<!-- IF notifications.URL --></a><!-- ENDIF -->
+								</li>
 				   			<!-- END notifications -->
 						</ul>
 
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 728fe972b1..85edf4629b 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -70,6 +70,13 @@
 							<dd class="mark">{L_MARK_READ}</dd>
 						</dl>
 					</li>
+					<!-- IF not .notifications -->
+						<li>
+							<dl>
+								<dt>{L_NO_NOTIFICATIONS}</dt>
+							</dl>
+						</li>
+					<!-- ENDIF -->
 					<!-- 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 -->">
 							<dl>
-- 
cgit v1.2.1


From 4874226b6e41df64959761ff53a61cfa190cabf1 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 22:11:41 -0500
Subject: [ticket/11103] Re-add notify method to the UCP preferences

I've noticed that this is used in other areas still in phpBB, so it should
not be removed.

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ucp_prefs_personal.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
index f03cb2af38..53d1e629a8 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
@@ -38,6 +38,16 @@
 				<label for="hideonline0"><input type="radio" name="hideonline" id="hideonline0" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
+	<!-- ENDIF -->		
+	<!-- IF S_SELECT_NOTIFY -->
+		<dl>
+			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}:</label></dt>
+			<dd>
+				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label> 
+				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label> 
+				<label for="notifymethod2"><input type="radio" name="notifymethod" id="notifymethod2" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label>
+			</dd>
+		</dl>
 	<!-- ENDIF -->
 	<dl>
 		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
-- 
cgit v1.2.1


From ecf6f1eb8ca34da43b14b2da642cc7f1aa397d36 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 29 Oct 2012 18:15:01 -0500
Subject: [ticket/11103] Code cleanup

PHPBB3-11103
---
 phpBB/styles/prosilver/theme/colours.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 49e404a903..88e48e845a 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1056,4 +1056,4 @@ input.disabled {
 
 #notification_list > .header, .notification_list > .footer {
 	border-color: #00608F;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.1


From e3b11c4ecf2eab5e9e1f077fda71e0facc2a063b Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 25 Dec 2012 09:49:05 -0800
Subject: [ticket/11103-VSE] Updated notification AJAX styling

PHPBB3-11103
---
 .../styles/prosilver/template/overall_header.html  |  1 +
 phpBB/styles/prosilver/theme/colours.css           | 29 +++++++++++++-
 phpBB/styles/prosilver/theme/common.css            | 46 ++++++++++++++++------
 3 files changed, 61 insertions(+), 15 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 9c2c1fc6a6..3f5bec9b8a 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -135,6 +135,7 @@
 				<li>
 					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list" class="notification_list">
+						<div class="pointer"><div class="pointer_inner"></div></div>
 						<div class="header">
 							{L_NOTIFICATIONS}
 						</div>
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 0043e7f5bc..a71d6ee557 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1046,7 +1046,11 @@ input.disabled {
 
 #notification_list {
 	background-color: #FFFFFF;
-	border-color: #00608F;
+	border-color: #B9B9B9;
+}
+
+#notification_list ul li {
+	border-bottom-color: #B9B9B9;
 }
 
 #notification_list ul li:hover {
@@ -1055,5 +1059,26 @@ input.disabled {
 }
 
 #notification_list > .header, .notification_list > .footer {
-	border-color: #00608F;
+	border-color: #B9B9B9;
+	border-bottom-color: #B9B9B9;
+	color: #000000;
+}
+
+#notification_list > .header {
+	background: #F1F8FF;
+	background: -moz-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F1F8FF), color-stop(100%, #CADCEB));
+	background: -webkit-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
+	background: -o-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
+	background: -ms-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
+	background: linear-gradient(to bottom, #F1F8FF 0%, #CADCEB 100%);
 }
+
+.notification_list .pointer {	
+	border-bottom-color: #ADADAD;
+}
+
+.notification_list .pointer_inner {
+	border-bottom-color: #F1F8FF;
+}
+
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 570f709ddd..0f44b5f861 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -679,8 +679,8 @@ p.rules a {
 	width: 330px;
 	z-index: 1;
 	border: 1px solid;
-	border-radius: 4px;
-	box-shadow: 4px 4px 5px;
+	box-shadow: 3px 3px 5px darkgray;
+	margin-top: 8px;
 }
 
 #notification_list ul {
@@ -690,7 +690,7 @@ p.rules a {
 }
 
 #notification_list ul li {
-	width: ;
+	width: 310px;
 	padding: 10px;
 	margin: 0;
 	float: left;
@@ -700,24 +700,20 @@ p.rules a {
 	clear: both;
 }
 
-#notification_list ul li {
-	width: 310px;
-}
-
-#notification_list ul li:last-child {
-	border-bottom: 0px;
-}
-
 #notification_list > .header {
-	padding: 0 5px;
+	padding: 0 10px;
+	font-family: Arial, "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 11px;
 	font-weight: bold;
+	text-shadow: 1px 1px 1px white;
+	text-transform: uppercase;	
+	line-height: 30px;
 	border-bottom: 1px solid;
 }
 
 #notification_list > .footer {
 	text-align: center;
 	font-size: 1.2em;
-	border-top: 1px solid;
 }
 
 #notification_list ul li a, .notification_list dt > a, #notification_list > .footer > a {
@@ -744,3 +740,27 @@ p.rules a {
 .notification_list ul.topiclist dt {
 	width: 88%;
 }
+
+.notification_list .pointer, .notification_list .pointer_inner {
+	position: absolute; 
+	width: 0; 
+	height: 0; 
+	border-top-width: 0;
+	border-bottom: 10px solid;
+	border-left: 10px dashed transparent;
+	border-right: 10px dashed transparent;
+	display: block;
+	background: transparent;
+}
+
+.notification_list .pointer {	
+	right: auto;
+	left: 10px;
+	top: -11px;
+}
+
+.notification_list .pointer_inner {
+	top: auto;
+	bottom: -11px;
+	left: -10px;
+}
-- 
cgit v1.2.1


From 918053e4781425f368261db3b55efbb6abad160d Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 27 Dec 2012 22:35:55 -0800
Subject: [ticket/11103] Fix notifications link to handle non-JS fallback

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 3f5bec9b8a..830b9544a5 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -133,7 +133,7 @@
 			<ul class="linklist leftside">
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
 				<li>
-					[ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
+					[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list" class="notification_list">
 						<div class="pointer"><div class="pointer_inner"></div></div>
 						<div class="header">
-- 
cgit v1.2.1


From ce1fca2332679def5884d82164037bedc7dc86ee Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 27 Dec 2012 22:36:44 -0800
Subject: [ticket/11103] Clean up some notifications CSS

PHPBB3-11103
---
 phpBB/styles/prosilver/theme/colours.css | 5 ++---
 phpBB/styles/prosilver/theme/common.css  | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index a71d6ee557..bf4c7ba22a 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1060,7 +1060,6 @@ input.disabled {
 
 #notification_list > .header, .notification_list > .footer {
 	border-color: #B9B9B9;
-	border-bottom-color: #B9B9B9;
 	color: #000000;
 }
 
@@ -1074,8 +1073,8 @@ input.disabled {
 	background: linear-gradient(to bottom, #F1F8FF 0%, #CADCEB 100%);
 }
 
-.notification_list .pointer {	
-	border-bottom-color: #ADADAD;
+.notification_list .pointer {
+	border-bottom-color: #B9B9B9;
 }
 
 .notification_list .pointer_inner {
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 0f44b5f861..7f9431770a 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -742,9 +742,9 @@ p.rules a {
 }
 
 .notification_list .pointer, .notification_list .pointer_inner {
-	position: absolute; 
-	width: 0; 
-	height: 0; 
+	position: absolute;
+	width: 0;
+	height: 0;
 	border-top-width: 0;
 	border-bottom: 10px solid;
 	border-left: 10px dashed transparent;
@@ -753,7 +753,7 @@ p.rules a {
 	background: transparent;
 }
 
-.notification_list .pointer {	
+.notification_list .pointer {
 	right: auto;
 	left: 10px;
 	top: -11px;
-- 
cgit v1.2.1


From 44fcec520f785d18d3cd3b19e26db977f23b844c Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 27 Dec 2012 22:37:39 -0800
Subject: [ticket/11103] CSS fixes to address text inside notifications drop
 down.

PHPBB3-11103
---
 phpBB/styles/prosilver/theme/common.css | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 7f9431770a..aa1a64455f 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -727,11 +727,6 @@ p.rules a {
 	margin-right: 5px;
 }
 
-#notification_list ul li div {
-	width: 240px;
-	float: left;
-}
-
 .notification_list ul li p {
 	margin: 0;
 	word-wrap: break-word;
-- 
cgit v1.2.1


From 006662a03fc159998093fa4d2c3e615d4980ebd3 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 31 Jan 2013 10:34:39 -0800
Subject: [ticket/11103] Rounded Corners and antialiased pointer

PHPBB3-11103
---
 phpBB/styles/prosilver/theme/common.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index aa1a64455f..6c78195457 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -680,6 +680,7 @@ p.rules a {
 	z-index: 1;
 	border: 1px solid;
 	box-shadow: 3px 3px 5px darkgray;
+	border-radius: 5px;
 	margin-top: 8px;
 }
 
@@ -709,6 +710,7 @@ p.rules a {
 	text-transform: uppercase;	
 	line-height: 30px;
 	border-bottom: 1px solid;
+	border-radius: 5px 5px 0 0;
 }
 
 #notification_list > .footer {
@@ -744,8 +746,8 @@ p.rules a {
 	border-bottom: 10px solid;
 	border-left: 10px dashed transparent;
 	border-right: 10px dashed transparent;
+	-webkit-transform: rotate(360deg); /* better anti-aliasing in webkit */
 	display: block;
-	background: transparent;
 }
 
 .notification_list .pointer {
-- 
cgit v1.2.1


From a54128b3bc146fa6f46bd10c712253e568352ec8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 3 Feb 2013 15:51:29 +0100
Subject: [ticket/11342] Mark active topics read when marking forums read

Marking forums read while viewing a category will also mark the active
topics inside that category read. Therefore, the active topics should also
be marked read. With this patch the ajax callback "mark_forums_read" will
check if the active topics id ("active_topics") exists and also mark
topics read if it does. As the active topics will only be displayed in
categories, which can't have any other topics, this is a proper approach.

PHPBB3-11342
---
 phpBB/styles/prosilver/template/ajax.js             | 18 +++++++++++++++---
 phpBB/styles/prosilver/template/viewforum_body.html |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 6ce3b38981..b2a27089f7 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -37,14 +37,24 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
 	// Mark subforums read
 	$('a.subforum[class*="unread"]').removeClass('unread').addClass('read');
 
+	// Mark topics read if we are watching a category and showing active topics
+	if ($('#active_topics').length) {
+		phpbb.ajaxCallbacks['mark_topics_read'].call(this, res, false);
+	}
+
 	// Update mark forums read links
 	$('[data-ajax="mark_forums_read"]').attr('href', res.U_MARK_FORUMS);
 
 	phpbb.closeDarkenWrapper(3000);
 });
 
-// This callback will mark all topic icons read
-phpbb.addAjaxCallback('mark_topics_read', function(res) {
+/** 
+* This callback will mark all topic icons read
+*
+* @param update_topic_links bool Wether "Mark topics read" links should be
+*     updated. Defaults to true.
+*/
+phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links = true) {
 	var readTitle = res.NO_UNREAD_POSTS;
 	var unreadTitle = res.UNREAD_POSTS;
 	var iconsArray = {
@@ -85,7 +95,9 @@ phpbb.addAjaxCallback('mark_topics_read', function(res) {
 	$('a').has('span.icon_topic_newest').remove();
 
 	// Update mark topics read links
-	$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
+	if (update_topic_links) {
+		$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
+	}
 
 	phpbb.closeDarkenWrapper(3000);
 });
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index e0aef4f290..38566dece0 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -130,7 +130,7 @@
 		<ul class="topiclist">
 			<li class="header">
 				<dl class="icon">
-					<dt><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></dt>
+					<dt<!-- IF S_DISPLAY_ACTIVE --> id="active_topics"<!-- ENDIF -->><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></dt>
 					<dd class="posts">{L_REPLIES}</dd>
 					<dd class="views">{L_VIEWS}</dd>
 					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
-- 
cgit v1.2.1


From 283ef6eed4076a4466cc3dccd4b694e141efb8dd Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 13 Feb 2013 17:20:25 -0600
Subject: [ticket/11103] Mark/Unmark All buttons

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ucp_notifications.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 85edf4629b..558bff7349 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -118,13 +118,15 @@
 	</div>
 </div>
 
-
-<fieldset class="submit-buttons">
+<!-- IF .notifications -->
+<fieldset class="display-actions">
 	<input type="hidden" name="form_time" value="{FORM_TIME}" />
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}
+	<input type="submit" name="submit" value="{L_MARK_READ}" class="button1" />
+	<div><a href="#" onclick="$('#ucp input:checkbox').attr('checked', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="$('#ucp input:checkbox').attr('checked', false); return false;">{L_UNMARK_ALL}</a></div>
 	{S_FORM_TOKEN}
 </fieldset>
+<!-- ENDIF -->
 
 </form>
 
-- 
cgit v1.2.1


From 216dc824867df3d680fbad994796454999e3b100 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 14 Feb 2013 10:55:30 -0800
Subject: [ticket/11103] Remove title attribute from notification link

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 506ff823ce..27156dbf15 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -138,7 +138,7 @@
 			<ul class="linklist leftside">
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
 				<li>
-					[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull;
+					[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{NOTIFICATIONS_COUNT}</a> ] &bull;
 					<div id="notification_list" class="notification_list">
 						<div class="pointer"><div class="pointer_inner"></div></div>
 						<div class="header">
-- 
cgit v1.2.1


From 3ba25289aaa938498a05c201d59ae02311dbfbd1 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 14 Feb 2013 10:59:39 -0800
Subject: [ticket/11103] Update styling of prosilver notification modal

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 phpBB/styles/prosilver/theme/common.css             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 27156dbf15..aff346cac5 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -157,7 +157,7 @@
 										{notifications.AVATAR}
 										<div>
 											<p>{notifications.FORMATTED_TITLE}</p>
-											<p>{notifications.TIME}</p>
+											<p class="notification_time">» {notifications.TIME}</p>
 
 											<!-- IF not notifications.URL and notifications.U_MARK_READ -->
 												<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 6c78195457..970c1bffba 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -734,6 +734,10 @@ p.rules a {
 	word-wrap: break-word;
 }
 
+.notification_list ul li p.notification_time {
+	padding-top: 8px;
+}
+
 .notification_list ul.topiclist dt {
 	width: 88%;
 }
-- 
cgit v1.2.1


From fd4e197bde8ae653afd1fb2431f49bfb8ff5053c Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 14 Feb 2013 11:00:59 -0800
Subject: [ticket/11103] Update styling of UCP Notifications in prosilver

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ucp_notifications.html |  6 +++---
 phpBB/styles/prosilver/theme/common.css                | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 558bff7349..95e026ae0e 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -83,9 +83,9 @@
 								<dt>
 									<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
 										{notification_list.AVATAR}
-										<div>
-											<p>{notification_list.FORMATTED_TITLE}</p>
-											<p>{notification_list.TIME}</p>
+										<div class="notifications">
+											<p class="notifications_title">{notification_list.FORMATTED_TITLE}</p>
+											<p class="notifications_time">» {notification_list.TIME}</p>
 
 											<!-- IF not notification_list.URL and notification_list.U_MARK_READ -->
 												<p><a href="{notification_list.U_MARK_READ}">{L_MARK_READ}</a></p>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 970c1bffba..0685322b7f 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -765,3 +765,15 @@ p.rules a {
 	bottom: -11px;
 	left: -10px;
 }
+
+.notification_list div.notifications {
+	padding: 5px;
+}
+
+.notification_list p.notifications_title {
+	font-weight: bold;
+}
+
+.notification_list p.notifications_time {
+	font-size: 11px;
+}
\ No newline at end of file
-- 
cgit v1.2.1


From cdc766c90f800af01e7d21b3d7bf3d017479cf73 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 15 Feb 2013 15:41:34 -0600
Subject: [ticket/11103] Restore new/unread messages info/link in header

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 506ff823ce..2bf15754d5 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -176,7 +176,7 @@
 				<!-- ENDIF -->
 				<li class="icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
-					<!-- IF not S_NOTIFICATIONS_DISPLAY and S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
+					<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
 					<!-- IF S_DISPLAY_SEARCH --> &bull;
 					<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
 					<!-- ENDIF -->
-- 
cgit v1.2.1


From 7ad577a86afa379d67812ed184b7a59a32c64e9e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 15 Feb 2013 16:02:33 -0600
Subject: [ticket/11103] Add Notification Settings link in flyout menu

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 1 +
 phpBB/styles/prosilver/theme/common.css             | 6 ++++++
 2 files changed, 7 insertions(+)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 2bf15754d5..e911007aa6 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -143,6 +143,7 @@
 						<div class="pointer"><div class="pointer_inner"></div></div>
 						<div class="header">
 							{L_NOTIFICATIONS}
+							<span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span>
 						</div>
 
 						<ul>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 6c78195457..3eb09492d5 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -713,6 +713,12 @@ p.rules a {
 	border-radius: 5px 5px 0 0;
 }
 
+#notification_list > .header > .header_settings {
+	float: right;
+	font-weight: normal;
+	text-transform: none;
+}
+
 #notification_list > .footer {
 	text-align: center;
 	font-size: 1.2em;
-- 
cgit v1.2.1


From b05da5ec0e95ddb5bc645e661987ba0a7bb49573 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 15 Feb 2013 14:38:36 -0800
Subject: [ticket/11103] HTML encode double arrow character

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html    | 2 +-
 phpBB/styles/prosilver/template/ucp_notifications.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index aff346cac5..b94eef7aad 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -157,7 +157,7 @@
 										{notifications.AVATAR}
 										<div>
 											<p>{notifications.FORMATTED_TITLE}</p>
-											<p class="notification_time">» {notifications.TIME}</p>
+											<p class="notification_time">&raquo; {notifications.TIME}</p>
 
 											<!-- IF not notifications.URL and notifications.U_MARK_READ -->
 												<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 95e026ae0e..a2d558d0ca 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -85,7 +85,7 @@
 										{notification_list.AVATAR}
 										<div class="notifications">
 											<p class="notifications_title">{notification_list.FORMATTED_TITLE}</p>
-											<p class="notifications_time">» {notification_list.TIME}</p>
+											<p class="notifications_time">&raquo; {notification_list.TIME}</p>
 
 											<!-- IF not notification_list.URL and notification_list.U_MARK_READ -->
 												<p><a href="{notification_list.U_MARK_READ}">{L_MARK_READ}</a></p>
-- 
cgit v1.2.1


From 337b958171c756033a42f88a183b87e893fc2940 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 15 Feb 2013 14:39:06 -0800
Subject: [ticket/11103] Add newlines to bottom of css file

PHPBB3-11103
---
 phpBB/styles/prosilver/theme/common.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 0685322b7f..4f75a8b85b 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -776,4 +776,5 @@ p.rules a {
 
 .notification_list p.notifications_time {
 	font-size: 11px;
-}
\ No newline at end of file
+}
+
-- 
cgit v1.2.1


From d2295b3d1f191710916b12980e13c97419ecf0ae Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 15 Feb 2013 19:27:09 -0600
Subject: [ticket/11103] Restore new/unread messages info/link in header
 (properly)

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index e911007aa6..85bce8a313 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -177,7 +177,7 @@
 				<!-- ENDIF -->
 				<li class="icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
-					<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
+						<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
 					<!-- IF S_DISPLAY_SEARCH --> &bull;
 					<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
 					<!-- ENDIF -->
-- 
cgit v1.2.1


From 37093b6aa522dd15d05659eaf6c541e25e163289 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 19 Feb 2013 13:04:06 +0100
Subject: [ticket/11342] Fix "unexpected token" syntax error

PHPBB-11342
---
 phpBB/styles/prosilver/template/ajax.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index b2a27089f7..0b587ac561 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -54,7 +54,7 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
 * @param update_topic_links bool Wether "Mark topics read" links should be
 *     updated. Defaults to true.
 */
-phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links = true) {
+phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links) {
 	var readTitle = res.NO_UNREAD_POSTS;
 	var unreadTitle = res.UNREAD_POSTS;
 	var iconsArray = {
@@ -68,6 +68,10 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links = tru
 	var classMap = {};
 	var classNames = [];
 
+	if (typeof update_topic_links === 'undefined') {
+		update_topic_links = true;
+	}
+
 	$.each(iconsArray, function(unreadClass, readClass) {
 		$.each(iconsState, function(key, value) {
 			// Only topics can be hot
-- 
cgit v1.2.1


From 5b2d272137ee485307c79e3fd0a10e5ebac4ecdf Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 26 Feb 2013 22:17:24 +0100
Subject: [ticket/11368] Fix background color for PM report rows by using
 accessing var.

PHPBB3-11368
---
 phpBB/styles/prosilver/template/mcp_front.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html
index b71d120ed6..89ab753f12 100644
--- a/phpBB/styles/prosilver/template/mcp_front.html
+++ b/phpBB/styles/prosilver/template/mcp_front.html
@@ -119,7 +119,7 @@
 			<ul class="topiclist cplist">
 
 			<!-- BEGIN pm_report -->
-			<li class="row<!-- IF report.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
+			<li class="row<!-- IF pm_report.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 				<dl>
 					<dt>
 						<a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> {pm_report.ATTACH_ICON_IMG}<br />
-- 
cgit v1.2.1


From 18d85bfc118dc5a38867b2132ae9c78f7d18bbbf Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 27 Feb 2013 20:18:41 -0800
Subject: [ticket/11103] Remove padding from notifications for now.

PHPBB3-11103
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 phpBB/styles/prosilver/theme/common.css             | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index b94eef7aad..f238858b8b 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -157,7 +157,7 @@
 										{notifications.AVATAR}
 										<div>
 											<p>{notifications.FORMATTED_TITLE}</p>
-											<p class="notification_time">&raquo; {notifications.TIME}</p>
+											<p>&raquo; {notifications.TIME}</p>
 
 											<!-- IF not notifications.URL and notifications.U_MARK_READ -->
 												<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 4f75a8b85b..1684f0f7fc 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -734,10 +734,6 @@ p.rules a {
 	word-wrap: break-word;
 }
 
-.notification_list ul li p.notification_time {
-	padding-top: 8px;
-}
-
 .notification_list ul.topiclist dt {
 	width: 88%;
 }
-- 
cgit v1.2.1


From ecb9f44bf11756e1072354bfd658edfd4c01f74a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 28 Feb 2013 17:50:24 -0600
Subject: [ticket/11103] Revert whitespace changes

PHPBB3-11103
---
 phpBB/styles/prosilver/template/ajax.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index d304c710b3..0b587ac561 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -177,6 +177,8 @@ $('#qr_full_editor').click(function() {
 	});
 });
 
+
+
 /**
  * This AJAXifies the quick-mod tools. The reason it cannot be a standard
  * callback / data attribute is that it requires filtering - some of the options
-- 
cgit v1.2.1


From acabe6f5ca5dd1ec467d099b834454e14dd02ac7 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 3 Mar 2013 00:32:31 +0100
Subject: [ticket/6723] Show info that message has been deleted before delivery

If the message has been deleted before the delivery it will still show in
the message history, although with an empty message. This patch will
change that behavior to showing the info that it has been deleted before
it was delivered in red letters. The red letters ensure that users won't
mistake the info for the actual message.

PHPBB3-6723
---
 phpBB/styles/prosilver/template/ucp_pm_history.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html
index 9051eb2ee0..0767920c1b 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_history.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_history.html
@@ -24,7 +24,7 @@
 			<h3><a href="{history_row.U_VIEW_MESSAGE}" <!-- IF history_row.S_CURRENT_MSG -->class="current"<!-- ENDIF -->>{history_row.SUBJECT}</a></h3>
 			<p class="author">{history_row.MINI_POST_IMG} {L_SENT_AT}: <strong>{history_row.SENT_DATE}</strong><br />
 				{L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}</p>
-			<div class="content">{history_row.MESSAGE}</div>
+			<div class="content"><!-- IF history_row.MESSAGE -->{history_row.MESSAGE}<!-- ELSE --><span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span><!-- ENDIF --></div>
 			<div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div>
 		</div>
 
-- 
cgit v1.2.1