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
---
 phpBB/styles/prosilver/template/overall_header.html    | 15 ++++++++-------
 phpBB/styles/prosilver/template/ucp_notifications.html | 15 +++++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'phpBB/styles/prosilver/template')

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