mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 01:20:40 +01:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Marc Alexander 2016-11-12 19:41:10 +01:00
commit 9c7e8c2dc5
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
5 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/styles/prosilver/template/ajax.js
View File

@ -132,9 +132,9 @@ phpbb.markNotifications = function($popup, unreadCount) {
// Update the unread count.
$('strong', '#notification_list_button').html(unreadCount);
// Remove the Mark all read link if there are no unread notifications.
// Remove the Mark all read link & notification count if there are no unread notifications.
if (!unreadCount) {
$('#mark_all_notifications').remove();
$('#mark_all_notifications, #notification_list_button > strong').remove();
}
// Update page title

4
phpBB/styles/prosilver/template/navbar_header.html
View File

@ -145,14 +145,14 @@
<!-- IF S_DISPLAY_PM -->
<li class="rightside" data-skip-responsive="true">
<a href="{U_PRIVATEMSGS}" role="menuitem">
<i class="icon fa-inbox fa-fw" aria-hidden="true"></i><span><span>{L_PRIVATE_MESSAGES} [</span><strong>{PRIVATE_MESSAGE_COUNT}</strong><span>]</span></span>
<i class="icon fa-inbox fa-fw" aria-hidden="true"></i><span><span>{L_PRIVATE_MESSAGES} <!-- IF PRIVATE_MESSAGE_COUNT --><strong class="badge">{PRIVATE_MESSAGE_COUNT}</strong><!-- ENDIF --></span>
</a>
</li>
<!-- ENDIF -->
<!-- IF S_NOTIFICATIONS_DISPLAY -->
<li class="dropdown-container dropdown-{S_CONTENT_FLOW_END} rightside" data-skip-responsive="true">
<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger">
<i class="icon fa-bell fa-fw" aria-hidden="true"></i><span><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></span>
<i class="icon fa-bell fa-fw" aria-hidden="true"></i><span><span>{L_NOTIFICATIONS} <!-- IF NOTIFICATIONS_COUNT --><strong class="badge">{NOTIFICATIONS_COUNT}</strong><!-- ENDIF --></span>
</a>
<!-- INCLUDE notification_dropdown.html -->
</li>

5
phpBB/styles/prosilver/theme/colours.css
View File

@ -1168,3 +1168,8 @@ input.disabled {
li.notification-reported strong, li.notification-disapproved strong {
color: #D31141;
}
.badge {
background-color: #D31141;
color: #ffffff;
}

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

@ -1205,6 +1205,22 @@ ul.linklist:after,
margin-left: 58px;
}
.badge {
border-radius: 10px;
opacity: 0.8;
text-align: center;
white-space: nowrap;
font-size: 10px;
line-height: 1;
float: right;
display: inline-block;
margin-left: 3px;
vertical-align: baseline;
position: relative;
top: 3px;
padding: 4px 6px;
}
/* Navbar specific list items
----------------------------------------*/
@ -1216,10 +1232,6 @@ ul.linklist:after,
display: none;
}
.linklist.compact .rightside > a strong {
padding-left: 2px;
}
.dropdown-page-jump .dropdown {
top: 20px;
}

2
tests/functional/notification_test.php
View File

@ -82,6 +82,6 @@ class phpbb_functional_notification_test extends phpbb_functional_test_case
// Get form token
$link = $crawler->selectLink($this->lang('NOTIFICATIONS_MARK_ALL_READ'))->link()->getUri();
$crawler = self::request('GET', substr($link, strpos($link, 'ucp.')));
$this->assertEquals(0, $crawler->filter('#notification_list_button strong')->text());
$this->assertCount(0, $crawler->filter('#notification_list_button strong'));
}
}