jenkins-bot has submitted this change and it was merged.
Change subject: Only the 'Notifications' part of the header should be bold
......................................................................
Only the 'Notifications' part of the header should be bold
When there are more new notifications than can fit in the overly
it shows a message in the header alerting the user. This message
should be in regular text, while 'Notifications' should stay bold.
Changed per Fabrice.
Change-Id: I21dc0ed516e5656c6d1965970d7a5f313e317aa9
---
M Echo.i18n.php
M modules/overlay/ext.echo.overlay.css
M modules/overlay/ext.echo.overlay.js
3 files changed, 6 insertions(+), 9 deletions(-)
Approvals:
Alex Monk: Looks good to me, but someone else must approve
Lwelling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Echo.i18n.php b/Echo.i18n.php
index c884825..2d741b6 100644
--- a/Echo.i18n.php
+++ b/Echo.i18n.php
@@ -143,8 +143,8 @@
'echo-link-new' => '$1 new {{PLURAL:$1|notification|notifications}}',
'echo-link' => 'Notifications',
'echo-overlay-link' => 'All notifications',
- 'echo-overlay-title' => 'Notifications',
- 'echo-overlay-title-overflow' => 'Notifications (showing $1 of $2
unread)',
+ 'echo-overlay-title' => '<b>Notifications</b>',
+ 'echo-overlay-title-overflow' => '<b>Notifications</b> (showing $1 of
$2 unread)',
'echo-mark-all-as-read' => 'Mark all as read',
// Special page
@@ -481,12 +481,10 @@
{{Identical|Notification}}',
'echo-overlay-link' => 'Link to "all notifications" at the bottom of
the overlay.
{{Identical|All notifications}}',
- 'echo-overlay-title' => 'Title at the top of the notifications overlay.
-{{Identical|Notification}}',
+ 'echo-overlay-title' => 'Title at the top of the notifications overlay.
Should include bold tags.',
'echo-overlay-title-overflow' => 'Title at the top of the notifications
overlay when there are additional unread notifications that are not being
shown. Parameters:
* $1 - the number of unread notifications being shown
-* $2 - the total number of unread notifications that exist
-{{Identical|Notification}}',
+* $2 - the total number of unread notifications that exist',
'echo-mark-all-as-read' => 'Text for button that marks all unread
notifications as read. Keep this short as possible.
{{Identical|Mark all as read}}',
'echo-date-today' => "The header text for today's notification section.
diff --git a/modules/overlay/ext.echo.overlay.css
b/modules/overlay/ext.echo.overlay.css
index 8fd69a5..62f0c22 100644
--- a/modules/overlay/ext.echo.overlay.css
+++ b/modules/overlay/ext.echo.overlay.css
@@ -62,7 +62,6 @@
height: 15px;
padding: 15px 15px 15px 28px;
border-bottom: 1px solid #DDDDDD;
- font-weight: bold;
position: relative;
}
#mw-echo-overlay-title-text {
diff --git a/modules/overlay/ext.echo.overlay.js
b/modules/overlay/ext.echo.overlay.js
index 76049c7..8301fb5 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -113,7 +113,7 @@
count = result.query.notifications.count;
mw.echo.overlay.updateCount( count );
// Reset header to 'Notifications'
-
$( '#mw-echo-overlay-title-text').text( mw.msg( 'echo-overlay-title' ) );
+
$( '#mw-echo-overlay-title-text').msg( 'echo-overlay-title' );
}
}
} );
@@ -135,7 +135,7 @@
// Add the header to the title area
$( '<div/>' )
.attr( 'id',
'mw-echo-overlay-title-text' )
- .text( titleText )
+ .html( titleText )
.appendTo( $title );
// Add help button
--
To view, visit https://gerrit.wikimedia.org/r/60791
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21dc0ed516e5656c6d1965970d7a5f313e317aa9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Kaldari <rkald...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Lwelling <lwell...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
