mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-25 17:41:25 +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

7
phpBB/styles/prosilver/template/overall_header.html
View File

@@ -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>

9
phpBB/styles/prosilver/template/ucp_notifications.html
View File

@@ -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 -->

10
phpBB/styles/prosilver/theme/common.css
View File

@@ -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;
}