Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/58444
Change subject: (bug 46678) Adding feedback link. Temporarily removing Learn
more link.
......................................................................
(bug 46678) Adding feedback link. Temporarily removing Learn more link.
Change-Id: Ifb9a287e2dc11067efac48bdbf700fe7997d19f0
---
M Echo.php
M modules/special/ext.echo.special.css
M modules/special/ext.echo.special.js
M special/SpecialNotifications.php
4 files changed, 40 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/44/58444/1
diff --git a/Echo.php b/Echo.php
index b3c68ca..9f831c2 100644
--- a/Echo.php
+++ b/Echo.php
@@ -199,6 +199,9 @@
// URL for more information about the Echo notification system
$wgEchoHelpPage =
'//www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:Echo';
+// URL for a feedback/survey page
+$wgEchoFeedbackPage = '//www.surveymonkey.com/s/notifications1';
+
// Whether to use job queue to process web and email notifications, bypass the
queue for now
// since it's taking more than an hour to run in mediawiki.org, this is not
acceptable for the
// purpose of testing notification.
diff --git a/modules/special/ext.echo.special.css
b/modules/special/ext.echo.special.css
index 00f1969..090fabb 100644
--- a/modules/special/ext.echo.special.css
+++ b/modules/special/ext.echo.special.css
@@ -14,12 +14,17 @@
margin-left: 45px;
}
+.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: 18px;
width: 18px;
- display: block;
- float: right;
/* @embed */
background-image: url(Preferences.png);
background-repeat: no-repeat;
@@ -33,8 +38,6 @@
margin: 5px 3px;
height: 18px;
width: 18px;
- display: block;
- float: right;
/* @embed */
background-image: url(MoreInfo.png);
background-repeat: no-repeat;
@@ -45,6 +48,15 @@
background-image: url(MoreInfoHover.png);
}
+#mw-echo-feedback-link {
+ margin: 10px 7px;
+ cursor: pointer;
+}
+#mw-echo-link-separator {
+ color: #AAAAAA;
+ margin: 10px 3px;
+}
+
.mw-echo-date-section {
font-weight: 800;
font-size: 1.1em;
diff --git a/modules/special/ext.echo.special.js
b/modules/special/ext.echo.special.js
index 751791d..8185c63 100644
--- a/modules/special/ext.echo.special.js
+++ b/modules/special/ext.echo.special.js
@@ -35,15 +35,32 @@
}
} );
+ $( '#mw-echo-pref-link' )
+ .appendTo( $( '#firstHeading' ) );
+
+ $( '<div></div>' )
+ .attr( 'id', 'mw-echo-link-separator' )
+ .attr( 'class', 'mw-echo-special-header-link' )
+ .text( '|' )
+ .appendTo( $( '#firstHeading' ) );
+
+ $( '<a/>' )
+ .attr( 'href', mw.config.get(
'wgEchoFeedbackPage' ) )
+ .attr( 'id', 'mw-echo-feedback-link' )
+ .attr( 'class', 'mw-echo-special-header-link' )
+ .prop( 'target', '_blank' )
+ .text( 'Feedback' )
+ .appendTo( $( '#firstHeading' ) );
+
+ /* This is going to be changed and re-added soon
--kaldari 04/2013
$( '<a/>' )
.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' )
.appendTo( $( '#firstHeading' ) );
-
- $( '#mw-echo-pref-link' )
- .appendTo( $( '#firstHeading' ) );
+ */
},
/**
diff --git a/special/SpecialNotifications.php b/special/SpecialNotifications.php
index 4702d7f..56a53b7 100644
--- a/special/SpecialNotifications.php
+++ b/special/SpecialNotifications.php
@@ -37,6 +37,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/58444
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb9a287e2dc11067efac48bdbf700fe7997d19f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
