diff options
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_notifications.html | 9 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 10 |
3 files changed, 23 insertions, 3 deletions
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"> <!-- 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 --> 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; +} |