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 +++++++--
 2 files changed, 13 insertions(+), 3 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 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 -->
-- 
cgit v1.2.1