jenkins-bot has submitted this change and it was merged.
Change subject: Adding Help link to Echo archive page
......................................................................
Adding Help link to Echo archive page
Also fixing feedback link for Safari and Chrome
Change-Id: Icc9f2c66f983e95c1564f6981e952d1d99160111
---
M Echo.i18n.php
M Echo.php
A modules/special/Help.png
M modules/special/Preferences.png
D modules/special/PreferencesHover.png
M modules/special/ext.echo.special.css
M modules/special/ext.echo.special.js
M special/SpecialNotifications.php
8 files changed, 50 insertions(+), 16 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Echo.i18n.php b/Echo.i18n.php
index 7cd8821..b57eb89 100644
--- a/Echo.i18n.php
+++ b/Echo.i18n.php
@@ -51,6 +51,7 @@
'echo-anon' => 'To receive notifications,
[[Special:Userlogin/signup|create an account]] or [[Special:UserLogin|log
in]].',
'echo-none' => 'You have no notifications.',
'echo-more-info' => 'More info',
+ 'echo-feedback' => 'Feedback',
// Notification
'echo-quotation-marks' => '"$1"',
@@ -249,6 +250,7 @@
'echo-anon' => 'Error message shown to users who try to visit
Special:Notifications as an anon.',
'echo-none' => 'Message shown to users who have no notifications. Also
shown in the overlay.',
'echo-more-info' => 'This is used for the title (mouseover text) of an
icon that links to a page with more information about the Echo extension.',
+ 'echo-feedback' => 'Text for a link that goes to a feedback survey',
'echo-quotation-marks' => 'Puts the edit summary in quotation marks.
Only translate if different than English.',
'notification-edit-talk-page2' => "Format for displaying notifications
of a user talk page being edited
* $1 is the username of the person who edited, plain text. Can be used for
GENDER.
diff --git a/Echo.php b/Echo.php
index 60868e9..37370ed 100644
--- a/Echo.php
+++ b/Echo.php
@@ -153,6 +153,7 @@
'messages' => array(
'echo-load-more-error',
'echo-more-info',
+ 'echo-feedback',
),
),
'ext.echo.icons' => $echoResourceTemplate + array(
diff --git a/modules/special/Help.png b/modules/special/Help.png
new file mode 100644
index 0000000..e3de9a5
--- /dev/null
+++ b/modules/special/Help.png
Binary files differ
diff --git a/modules/special/Preferences.png b/modules/special/Preferences.png
index 21daa69..ff89242 100644
--- a/modules/special/Preferences.png
+++ b/modules/special/Preferences.png
Binary files differ
diff --git a/modules/special/PreferencesHover.png
b/modules/special/PreferencesHover.png
deleted file mode 100644
index 2405f21..0000000
--- a/modules/special/PreferencesHover.png
+++ /dev/null
Binary files differ
diff --git a/modules/special/ext.echo.special.css
b/modules/special/ext.echo.special.css
index 65b114c..2bf54e1 100644
--- a/modules/special/ext.echo.special.css
+++ b/modules/special/ext.echo.special.css
@@ -14,35 +14,52 @@
max-width: 600px;
}
-#mw-echo-pref-link {
- margin: 5px 3px;
- height: 18px;
- width: 18px;
+.mw-echo-special-header-link {
display: block;
float: right;
+ font-size: 13px;
+ font-weight: normal;
+ line-height: 14px;
+}
+#mw-echo-pref-link {
+ margin: 5px 3px;
+ height: 19px;
+ width: 19px;
/* @embed */
background-image: url(Preferences.png);
background-repeat: no-repeat;
background-position: 0 0;
+ filter: alpha(opacity=50);
+ opacity: 0.5;
}
#mw-echo-pref-link:hover {
- /* @embed */
- background-image: url(PreferencesHover.png);
+ filter: alpha(opacity=100);
+ opacity: 1.0;
}
#mw-echo-moreinfo-link {
- margin: 5px 3px;
- height: 18px;
- width: 18px;
- display: block;
- float: right;
+ display: inline-block;
+ margin: 0px 3px;
+ height: 19px;
+ width: 19px;
/* @embed */
- background-image: url(MoreInfo.png);
+ background-image: url(Help.png);
background-repeat: no-repeat;
background-position: 0 0;
+ filter: alpha(opacity=50);
+ opacity: 0.5;
}
#mw-echo-moreinfo-link:hover {
- /* @embed */
- background-image: url(MoreInfoHover.png);
+ filter: alpha(opacity=100);
+ opacity: 1.0;
+}
+
+#mw-echo-feedback-link {
+ margin: 10px 7px;
+ cursor: pointer;
+}
+#mw-echo-link-separator {
+ color: #AAAAAA;
+ margin: 10px 3px;
}
.mw-echo-date-section {
diff --git a/modules/special/ext.echo.special.js
b/modules/special/ext.echo.special.js
index 67ad0f6..b817efe 100644
--- a/modules/special/ext.echo.special.js
+++ b/modules/special/ext.echo.special.js
@@ -44,13 +44,26 @@
.attr( 'href', mw.config.get( 'wgEchoHelpPage'
) )
.attr( 'title', mw.msg( 'echo-more-info' ) )
.attr( 'id', 'mw-echo-moreinfo-link' )
- .attr( 'class', 'mw-echo-special-header-link' )
- .prop( 'target', '_blank' )
+ .attr( 'target', '_blank' )
.appendTo( $( '#firstHeading' ) );
$( '#mw-echo-pref-link' )
.appendTo( $( '#firstHeading' ) );
+ $( '<span/>' )
+ .attr( 'id', 'mw-echo-link-separator' )
+ .addClass( 'mw-echo-special-header-link' )
+ .text( '|' )
+ .appendTo( $( '#firstHeading' ) );
+
+ $( '<a/>' )
+ .attr( 'href', mw.config.get(
'wgEchoFeedbackPage' ) )
+ .attr( 'id', 'mw-echo-feedback-link' )
+ .addClass( 'mw-echo-special-header-link' )
+ .attr( 'target', '_blank' )
+ .text( mw.msg( 'echo-feedback' ) )
+ .appendTo( $( '#firstHeading' ) );
+
},
/**
diff --git a/special/SpecialNotifications.php b/special/SpecialNotifications.php
index 82d0f93..44e9aa8 100644
--- a/special/SpecialNotifications.php
+++ b/special/SpecialNotifications.php
@@ -39,6 +39,7 @@
$html = Html::rawElement( 'a', array(
'href' => SpecialPage::getTitleFor( 'Preferences'
)->getLinkURL() . '#mw-prefsection-echo',
'id' => 'mw-echo-pref-link',
+ 'class' => 'mw-echo-special-header-link',
'title' => wfMessage( 'preferences' )->text()
) );
--
To view, visit https://gerrit.wikimedia.org/r/58985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc9f2c66f983e95c1564f6981e952d1d99160111
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Bsitu <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: Lwelling <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
