mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

[ticket/11103] Mark read link if notification has no URL to view it

Browse Source 
Other style stuff

PHPBB3-11103
This commit is contained in:
Nathaniel Guse
2012-10-16 10:51:07 -05:00
parent a2d6e40f1b
commit c8b66a26ef
7 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
phpBB/styles/subsilver2/template/overall_header.html
View File

@@ -154,19 +154,22 @@ function marklist(id, name, state)
<div id="notification_list" class="notification_list">
<table class="tablebg" width="310px" cellspacing="1">
<!-- BEGIN notifications -->
<tr>
<tr class="row<!-- IF notifications.UNREAD -->2<!-- ELSE -->1<!-- ENDIF -->">
<!-- IF notifications.AVATAR -->
<td class="row1" width="50px">
<td width="50px">
{notifications.AVATAR}
</td>
<td class="row1" valign="top">
<td valign="top">
<!-- ELSE -->
<td class="row1" colspan="2" valign="top">
<td colspan="2" valign="top">
<!-- 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 -->
{notifications.FORMATTED_TITLE}
<!-- IF notifications.URL --></a><!-- ENDIF --><br />
{notifications.TIME}
<!-- IF not notifications.URL and notifications.UNREAD -->
<br /><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
<!-- ENDIF -->
</td>
</tr>
<!-- END notifications -->

10
phpBB/styles/subsilver2/template/ucp_notifications.html
View File

@@ -88,22 +88,22 @@
<th width="15%">{L_MARK_READ}</th>
</tr>
<!-- BEGIN notification_list -->
<!-- IF notification_list.UNREAD --><tr class="row3"><!-- ELSEIF notification_list.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<tr class="row<!-- IF notification_list.UNREAD -->3<!-- ELSEIF notification_list.S_ROW_COUNT is even -->1<!-- ELSE -->2<!-- ENDIF -->">
<!-- IF notification_list.AVATAR -->
<td width="50px">
<td width="50px">
{notification_list.AVATAR}
</td>
<td valign="top">
<!-- ELSE -->
<td colspan="2" valign="top">
<td colspan="2" valign="top" height="50px">
<!-- ENDIF -->
<!-- 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 -->
{notification_list.FORMATTED_TITLE}
<!-- IF notification_list.URL --></a><!-- ENDIF --><br />
{notification_list.TIME}
</td>
<td align="center">
<!-- IF not notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /><!-- ENDIF -->
<!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /><!-- ENDIF -->
</td>
</tr>
<!-- END notification_list -->