Commit graph

184 commits

Author SHA1 Message Date
jenkins-bot 7eb57c25bf Merge "Updating Talk notification icon" 2013-07-06 00:19:39 +00:00
Bsitu f5c9a828c4 Merge "Revert "Bug 49269: Echo markup adjustments"" 2013-07-02 22:11:42 +00:00
Bsitu 6231a712e3 Revert "Bug 49269: Echo markup adjustments"
This reverts commit 8ff2c4dec3.

Change-Id: I3936c574854640c49689d42586fbddde6a9e45bb
2013-07-02 22:07:16 +00:00
jenkins-bot 66007528f6 Merge "Bug 49269: Echo markup adjustments" 2013-07-02 18:38:59 +00:00
jrobson 8ff2c4dec3 Bug 49269: Echo markup adjustments
separate into multiple ul elements with headings dividing them
This removes need for unnecessary styling rules in mobile web

Change-Id: I8acaef726ea0cc639054cf36d6c3649c7ab25bee
2013-07-02 11:36:02 -07:00
bsitu 8817b53fe9 Fix two typos + one js integer casting
Change-Id: Ie5c4c39e94e5531dbfa48e8cde7b608967cec0c8
2013-07-02 10:37:31 -07:00
kaldari c3badbfd08 Updating Talk notification icon
Change-Id: I9f41c361cf6249afbf115d98c7ac4f2dcab2f9f9
2013-06-28 11:56:07 -07:00
kaldari 972e14672f New primary and secondary link behavior for Echo
See https://www.mediawiki.org/wiki/Echo/Feature_requirements#Flyout
and https://www.mediawiki.org/wiki/Echo/Feature_requirements#HTML_single_email_notifications

Also includes some related style changes per Vibha

Also removing feedback link from overlay since it's no longer needed

Change-Id: I94aed697e87126ed8ad6d1d416c99bafaa53ac53
2013-06-27 16:12:16 -07:00
Krenair ab592dad6f Cleanup JS
* Add missing spaces after 'function'
* Remove underscores from identifiers
* Don't use typeof for undefined with local variables and object properties
* API ok/err is deprecated since MediaWiki 1.20 (< 1.22-alpha), use .done and .fail

Change-Id: I5ca3403ee263a0c3e6709618e48e896340952337
2013-06-23 01:25:29 +01:00
Krenair 7da252eec4 Use mediawiki.api instead of $.ajax
Change-Id: Iea98b6cb338c8b7ebbf244073bb8fe481e5e7655
2013-06-19 21:31:38 +01:00
jenkins-bot eb84e56e65 Merge "Never underline the badge" 2013-06-14 23:04:13 +00:00
Matthew Flaschen ecf7f1f261 Add overlay hook for user scripts.
Bug: 48502
Change-Id: I720d4fe65a6501b552dbef21cb258c027dc18867
2013-06-13 21:27:26 -04:00
bsitu 01e244c8a3 Remove quote around javascript object property name
Change-Id: I5cc7f4179066ab694a67d4c578ed4a562f533ade
2013-06-12 10:51:55 -07:00
kaldari 0558ab1571 Calling functions explicitly due to context
When I changed mw.echo.special.initialize to be called as a
callback from $( document ).ready(), rather than being called
explicitly from the closure, it changed the context, which got
assigned to _this. This broke some of the function calls.

Change-Id: I602a58a82ee91646901d0ab1c8b7bb4b22b3437a
2013-06-11 18:01:41 -07:00
kaldari 902ce9cc04 Don't run mw.echo.special.initialize until DOM is ready
To fix rare race condition in Safari

Change-Id: I2ae556ff6e44f291e761d2937203a3376f4a3177
2013-06-11 14:20:08 -07:00
bsitu 6ffc1cac4b Add clickthrough eventlogging to Echo
Change-Id: I3d05d1aeca92f9a0265a522cc5027ae18394c5b4
2013-06-11 10:46:41 -07:00
jenkins-bot 738d816a6c Merge "Fix some JS issues" 2013-06-10 21:57:13 +00:00
Amir E. Aharoni 5631117ca2 Never underline the badge
If link underlining is on, then the number in the badge
will be underlined. This is probably never needed, even
if the user wants to underline regular links.
Set text-decoration to none in all cases.

Change-Id: Ifaca38a8f0a6a3c8df39502a3da582f639ec6333
2013-06-07 19:44:20 -07:00
Derk-Jan Hartman c638d44190 Echo: Better support for non-default skins, as well as no Javascript
This provides some rudimentary styling support to make Echo usable
with the Modern skin.
It also fixes the Notifications special page so it is styled
correctly in Modern, CologneBlue, or with Javascript turned off.
Also some more tweaks for Monobook skin.
Retiring the 'feedback' link from the special page, per PM.

Bug: 47932
Change-Id: I633a93a78f5a78d0642a3a059fa6f7208f99cec4
2013-06-07 11:36:19 -07:00
Krenair 745330367b Fix some JS issues
Brought up by Krinkle in Icebfe86b (PS4):
    * 'ok' and 'err' properties of Api are deprecated, use promise interface
    * Use 'api' instead of 'Api'
    * $( '<a>' ) instead of $( '<a/>' )
    * Expected space after 'function' keyword

Change-Id: I0199db902174551bcf9269edafb1fef1df118b13
2013-06-06 00:09:28 +01:00
kaldari 5ca8b8f1c7 Suppressing underline on hover for notification badge
Change-Id: I663c5f0d1f03bc8159579892a7d313a535ec48d3
2013-05-30 15:45:16 -07:00
kaldari 43d95d153e Slightly reducing badge and alert sizes
Change-Id: If3c93582dbbdcab14b10ad9fe2926dcc94186756
2013-05-23 11:59:20 -07:00
kaldari f9481040d5 Switch to using our own badge instead of jQuery.badge
With this change we will no longer be relying on JS for the badge
functionality. This will prevent the flash of unstyled content,
and allow wikis to locally override the styling (since the unread
class is now applied immediately).

I also went ahead and made the badge styling more closely match the
talk page message alert styling per Vibha.

Also removed the old full link optional behavior since we weren't
using it, and it would have been a pain to maintain.

Bug: 48165
Bug: 48001
Change-Id: Ie85d66afd5181d487d0bb2776ae14b121ea50d88
2013-05-23 10:34:47 -07:00
kaldari 383a81811d Adding new talk page message alert for logged in users
Includes new ext.echo.alert module and new preference

Change-Id: I7a4e78b033aa5e1ea18d1bfa2b6b0187930a6611
2013-05-14 10:39:49 -07:00
jenkins-bot 9a2f91e18f Merge "(bug 48054) Echo API should use a standard continue parameter" 2013-05-13 23:23:04 +00:00
bsitu 97e5e0a92b (bug 48304) Add 'Feedback' link to the Notifications flyout
Change-Id: I86e7b5e6762557743752e433a6e2a007596b1891
2013-05-09 16:13:38 -07:00
bsitu a70208e8fe (bug 48054) Echo API should use a standard continue parameter
Change-Id: I1d5333db4a4d58a1ecfa8dfe562cda5a35093f8b
2013-05-03 18:15:46 -07:00
kaldari 509f7bccc3 Merge "Make sure footer links don't break in Chrome when zooming" 2013-04-30 22:30:39 +00:00
kaldari 4d03af1d9a Merge "Making sure Echo flyout appears above CentralNotice content" 2013-04-30 22:29:22 +00:00
Jorm 83fccf44bc Merge "Making sure moreinfo id is unique on archive page" 2013-04-30 22:12:11 +00:00
kaldari a61592465e Make sure footer links don't break in Chrome when zooming
Bug: 47897
Change-Id: I05041231b69035c12b0898176eb37d311186043d
2013-04-30 14:21:18 -07:00
kaldari 888d2c1239 Making sure Echo flyout appears above CentralNotice content
Bug: 47896
Change-Id: Ife534c013fc2a643043fb495cdaafd57fee7b7de
2013-04-30 13:51:16 -07:00
kaldari cd7ef2a52d Making sure moreinfo id is unique on archive page
Also adjusting position by 1 pixel!

Bug: 47889
Change-Id: I6e3dee7b5ce16c5de8ee564383d353a032623d25
2013-04-30 12:33:59 -07:00
Matthew Flaschen 0eff0b6fdb Remove unused W icon, now configured outside extension.
Bug: 46585
Change-Id: Ic0e29cf8284efc87e2ce67434a5d7984ee760659
2013-04-29 02:41:53 -04:00
Matthew Flaschen d3b67e2122 Change icons to use img tags, allowing easier customization:
* Icon can be defined using a path or a URL
* Extensions don't need custom CSS, but add icon through BeforeCreateEchoEvent
* Sites set their notification icon in LocalSettings.php or equivalent

Bug: 46585
Change-Id: Ifc02b653d07de19229dfb2604305e32f3bd595fe
2013-04-29 06:05:40 +00:00
kaldari 5ad9f2a96e More fixes for Monobook and adding a missing message key
Bug: 47652
Change-Id: I3199af6aef0ceab2380fb1de7b74cc21541e2886
2013-04-26 16:58:03 -07:00
kaldari 35797064c4 Hedging my bets
Making monobook's text-transform not apply to notification flyout.
Unfortunately, 2 overrides are needed since the monobook selector
is applied weakly to the overlay in general (as an inherited style)
and strongly to the notifications themselves (since they're in a ul)

Bug: 47652
Change-Id: I2600b5836ea7bca59d9089d8bb7e69a6aaeca6a4
2013-04-26 14:52:44 -07:00
jenkins-bot 9a6a74208c Merge "Override text color for monobook skin." 2013-04-26 21:19:38 +00:00
kaldari c52cc48aed Override text color for monobook skin.
Bug: 47652
Change-Id: I29562fa75ec4af1128f69865d0500fc13a92eec8
2013-04-26 14:00:59 -07:00
jenkins-bot f89a7b2c88 Merge "Only the 'Notifications' part of the header should be bold" 2013-04-26 00:43:11 +00:00
jenkins-bot 897e450c5b Merge "Adding help button to flyout. Fixing ID name per conventions." 2013-04-25 18:36:34 +00:00
kaldari b3391e42ff 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
2013-04-24 21:51:27 -07:00
kaldari 24b00328b6 Adding help button to flyout. Fixing ID name per conventions.
Change-Id: Id7243ba8e8599e1413203f951e96b73e2a6ceb9c
2013-04-24 21:36:03 -07:00
kaldari 9febd46267 New red heart icon for Echo gratitude notifications
Change-Id: If2905985b6e7ceb4acf59313b60e6c92ab7fc599
2013-04-24 16:02:08 -07:00
kaldari 9448c6cab0 Add 'Mark all as read' button to overlay
Button is only shown if there are more unread notifications than
fit in the overlay.

To avoid performance issues, this version only works for cases where
the number of unread notifications is less than the maximum count
(99 currently). Otherwise the button to mark all as read isn't
displayed (it's also limited on the server-side for good measure).

Bug: 47092
Change-Id: Ifcb0a436e2b31062741c441cca239d35ddefa0e1
2013-04-18 00:29:36 -07:00
jenkins-bot 057e86286d Merge "Lots of UI changes per Vibha" 2013-04-18 04:49:48 +00:00
Siebrand Mazeland d440540cf8 Add .jshintrc
Per https://www.mediawiki.org/wiki/CC/JS#Linting. Update a few files to
bring the tests closer to passing.

Change-Id: I08b190e8b44dbdbeb56de5c380d0ed4a8394aca2
2013-04-18 00:36:08 +02:00
kaldari d6fa2b4851 Lots of UI changes per Vibha
Changing highlighting behavior for archive. Now unread notifications
are highlighted with bold text in the archive rather than with a
background color.

Bug: 47149
Change-Id: I03b2a2968db6d067041c2618c5b4f878d8dc548f
2013-04-15 16:39:01 -07:00
kaldari 74fdc01fe6 Adding Help link to Echo archive page
Also fixing feedback link for Safari and Chrome

Change-Id: Icc9f2c66f983e95c1564f6981e952d1d99160111
2013-04-15 16:27:27 -07:00
kaldari ac9425aa8f Mostly reverting change Ifb9a287e since it isn't rendering correctly
For Chrome and Safari

Change-Id: I954a33a1a218d2b6f3996a78d9c244ca6b57042a
2013-04-11 13:02:06 -07:00
jenkins-bot b342f475fa Merge "(bug 46678) Adding feedback link. Temporarily removing Learn more link." 2013-04-11 17:27:07 +00:00
kaldari 7effc4808f (bug 46678) Adding feedback link. Temporarily removing Learn more link.
Change-Id: Ifb9a287e2dc11067efac48bdbf700fe7997d19f0
2013-04-11 10:23:47 -07:00
jenkins-bot 7485666776 Merge "RTL tweak for "All notifications" and "Preferences"" 2013-04-11 14:42:16 +00:00
nischayn22 f7c0a803ac RTL tweak for "All notifications" and "Preferences"
Some thanks to the following blog post
http://snook.ca/archives/html_and_css/background-position-x-y

Tested on Chrome and FF latest. Please test on more browsers!

Bug: 46215
Change-Id: I0b92b04f3a48dbd85c7e871a75a6973ea9760367
2013-04-11 10:27:31 +05:30
jenkins-bot 83bf52dff7 Merge "Better limits on number of notifications in the flyout" 2013-04-10 00:49:29 +00:00
kaldari 3800103c1c Better limits on number of notifications in the flyout
Change-Id: Ic53f6ebe530a73ef89204a96b22194a17d034a12
2013-04-09 17:43:57 -07:00
kaldari 4ee07f2a2e Making 'More...' link in archive more prominent per Vibha
Change-Id: Ibbed21c5efd7ce1f6893c92a7f98ba60a63e98ab
2013-04-09 15:52:35 -07:00
jenkins-bot ed6950d854 Merge "Making some changes to the flyout links per Vibha" 2013-04-03 11:33:47 +00:00
kaldari 47f720b81b Making some changes to the flyout links per Vibha
Entire link areas should be clickable

No longer a need for conditional link to archive

Change-Id: If4954f7da91ed823e7714cccb541e4f2e64b16b1
2013-04-02 17:47:40 -07:00
jenkins-bot 7fcaf9b57e Merge "A bunch of Echo style tweaks per Vibha" 2013-03-28 17:20:50 +00:00
kaldari 5b10fdf14b A bunch of Echo style tweaks per Vibha
Change-Id: I1317b1dd670c8f7a33b62bb7d86a6d25d841c6a1
2013-03-26 18:03:46 -07:00
kaldari da331a5bbc Fixing text alignment of Echo flyout in Monobook skin
Change-Id: I43a0560dcc6550ac01445755cf0f000018fc2e34
2013-03-26 14:34:14 -07:00
Bsitu f41e6fd81a Merge "Adding Gratitude icon" 2013-03-21 19:01:11 +00:00
Kaldari 98f4b2cc06 CSS tweak to line everything up.
Change-Id: I63af4e9106082d77f7cd6fa42fc0be95843f1214
2013-03-19 17:27:59 -07:00
Kaldari e6b4133e50 Adding Gratitude icon
Change-Id: Icce2d992d3b5c0bf911077bd0ccd413b29b11469
2013-03-18 13:48:15 -07:00
Kaldari 28fa282a65 Fixing issue with RTL display of badge and pokey
Change-Id: I49ab97ef062fd9a58da80ff0f5fbd21a72770855
2013-03-14 10:41:59 -07:00
Kaldari 4bd3ab66a4 Changing flyout title to be a non-linking header per discussion
Having two links to the archive page is redundant and the meaning
of the title as a header for the list is lost.

Change-Id: I8dce36309e10854b9ff799c82501b6d59df0c621
2013-03-08 21:18:32 +00:00
Bsitu 18f9b513d2 Merge "Fixing dismiss functionality for new checkmatrix system and categories" 2013-03-07 23:21:29 +00:00
Kaldari fcb5d99b37 Fixing dismiss functionality for new checkmatrix system and categories
Change-Id: I3b64c4853587d4d2d8f04fc97c9b3ddb15b520ed
2013-03-07 15:11:46 -08:00
Kaldari 1f88af134b Echo style tweaks per Vibha
Change-Id: I4111092e32213b50ccb0e8dee849a2edfb645827
2013-03-07 10:40:54 -08:00
bsitu 9f62f5fe36 Remove trailing comma from javascript object literal
Change-Id: I629a21eeeae810fe7d6bf805cfbaa61225e00963
2013-03-05 17:14:32 -08:00
Kaldari 8357f4bd75 Implementing new prefs system for Echo
Change-Id: Id745ed6cf1c92695569597fab6ea662bac8c76c0
2013-03-05 12:20:17 -08:00
Kaldari 35cf44e4a6 (bug 45016) make sure dismiss works across all supported types
Change-Id: Id9bf0c785a8fe429c6ec04c427330395d30bf68c
2013-02-15 14:09:39 -08:00
Kaldari 16331eab92 Adding dismiss functionality to flyout overlay.
Change-Id: Ibfbdb2a9f170e1d9b30b50e8639aee25101e71d6
2013-02-14 11:01:03 -08:00
Kaldari af06e26de6 Adding dismiss functionality to special page
Includes new web preferences for Echo

Also adding ability to set dismissability per notification type

Still need to arrange subscription options into a friendly format

Still need to add dismiss functionality to flyout

Change-Id: I484a24b424e69be3640e63b76f82735edae6f13a
2013-02-12 11:33:50 -08:00
Kaldari d0ddc2a3eb Fixing unread state for flyout - CSS tweak
Change-Id: I08bae800758247bc01abeeb59cb4a2873f37b964
2013-02-11 12:05:55 -08:00
Kaldari 31258ba23e (bug 43974) making sure that badge is only applied to immediate child
Change-Id: I7039695e36d5641a605a25d1fa714d845b0be383
2013-01-15 17:29:06 -08:00
Bsitu 571edaafc5 Merge "Docking overley to notifications link rather than side of window" 2013-01-11 19:35:41 +00:00
Kaldari 17cbe366c1 Docking overley to notifications link rather than side of window
Also adding okie dokie pokey

Change-Id: I7d37c2bfa622746d7f153653988c1eb800d0c261
2013-01-10 16:33:11 -08:00
Kaldari 1897b18823 Setting the line-height for the notification content area
Change-Id: If874ed9638d9d5b6c18e10013a46a932c905e2c9
2013-01-08 17:10:59 -08:00
Kaldari bc45a664d2 Determine number of notifications to display based on height of the window
Change-Id: Ib26182a543050e20a3dbc2975c8b6ff762d0a19c
2013-01-08 15:05:22 -08:00
Kaldari 320d044b90 Adding More Info link to Special:Notifications
Also revising some of the formatting, per Vibha.

Change-Id: Id8415c898e81f98c3eb1599ef5980d74ba509081
2013-01-08 14:23:24 -08:00
Kaldari 05e186c7a3 Setting up flyout formatting as a separate formatting option
This is replacing the implementation I did for 'html-light'.
The reason html-light doesn't work is that we don't have any way
of reliably determining which parameter should be the one that is
linked to in the notification title (flyout notifications are only
supposed to have one link). With this system, the notification
definer can specify a separate message/params combination to use
specifically for the notification flyout. If they don't specify
these, it falls back to the normal title message/params.

Change-Id: I35394849cf99307eba4a76e079333d19514fdb5d
2013-01-08 09:53:31 -08:00
Kaldari 486813026d (bug 43432) Dock links bar at bottom of Echo flyout
Change-Id: I79d76929746b6ee7a788e1b4e363425781d5687e
2013-01-03 19:04:15 +00:00
Bsitu f94654389d Merge changes I388b8bbc,I85146f7e
* changes:
  Separating html and html-light formatting for notifications
  More work on our custom edit summary parsing
2013-01-03 18:51:40 +00:00
Kaldari d6ad22ed81 Separating html and html-light formatting for notifications
Change-Id: I388b8bbcce741005b34b87d7331e22d442ef1c9b
2013-01-02 17:52:07 -08:00
Kaldari a5dbc1e000 Merge "(bug 43441) Show preferences icon on Special:Notifications without label except as title" 2013-01-02 05:49:36 +00:00
Krenair 7d13364507 (bug 43441) Show preferences icon on Special:Notifications without label except as title
Change-Id: I2bf4b5ba444157464c7c9070411b663485af8935
2013-01-01 21:48:44 -08:00
Kaldari 69e4d5f9a2 More formatting tweaks per Vibha
Change-Id: Id8c536fabe2151031eeafba697c16e0141710741
2013-01-01 01:28:11 +00:00
Bsitu 4f9d3efb07 Merge "(bug 43431) Link the flyout title" 2012-12-31 23:31:17 +00:00
Krenair 66c93904f1 Try to fix jenkins lint tests
From
https://integration.mediawiki.org/ci/job/mwext-Echo-jslint/142/console
18:54:22 >> modules/overlay/ext.echo.overlay.js: line 56, col 49, ['list']
is better written in dot notation.
18:54:22 >> modules/overlay/ext.echo.overlay.js: line 37, col 44, 'window'
is not defined.
18:54:22 >> modules/overlay/ext.echo.overlay.js: line 127, col 21,
'window' is not defined.
18:54:22 >> modules/special/ext.echo.special.js: line 58, col 49, ['list']
is better written in dot notation.
18:54:22 >> modules/special/ext.echo.special.js: line 112, col 25, Bad
line breaking before '&&'.

Change-Id: I2676a3e07d9d5f7419dd9030dbf218b2c0094cf1
2012-12-27 22:06:20 +00:00
Krenair da58d50b5b (bug 43431) Link the flyout title
Change-Id: I7bad541ee1f05f9135fd1ba23aecab7e864d8652
2012-12-27 16:50:00 +00:00
Bsitu 5199fa4936 Merge "Reworking overlay for edge cases - no notifications, or too many to show at once." 2012-12-18 03:09:57 +00:00
Kaldari cb63eb5b45 Merge "Various fixes to the special page" 2012-12-18 02:43:42 +00:00
Kaldari d42b1db8cc Reworking overlay for edge cases - no notifications, or too many to show at once.
Change-Id: I6af535bf35c5594ed0c4dfad92defffff8b0e02e
2012-12-17 18:40:07 -08:00
Kaldari 7dd7545c4c Fixing line height for the notification titles
Change-Id: I0c2e38ac59ce55043ed55b02dd6b6737db6ab012
2012-12-17 13:35:37 -08:00
bsitu af8b434f11 Various fixes to the special page
1. EchoNotificationController::resetNotificationCount() does not reset count, it has misleading name (should fix the name in another patch)
2. Prevent multiple concurrent API calls resulting from multiple clicks on more link within very short amount of time

Change-Id: I4aeeadddd4fed833c2ae4308c1a0e94e6644f5e7
2012-12-14 17:52:04 -08:00
bsitu 41139e43a4 Remove redundant 'mark as read' API call for read items
Change-Id: I95677fe378d8b1b6dcf90e22886670391aa7d451
2012-12-13 17:04:37 -08:00
Kaldari 65255f7c6b Formatting for Special:Notifications
Change-Id: I891542bf8b6a883e7ff9f78d2b33ddd61c345aa7
2012-12-13 14:08:20 -08:00
Kaldari 704147d1d2 Fixes to the toolbar link for notifications per Vibha
New badge behavior - Show badge even if zero notifications
Enable long and short links - i.e. 'Notification (X)' or just '(X)'

Depends on core change https://gerrit.wikimedia.org/r/#/c/38258/

Change-Id: Idc2288a4ddd0bf788ccdadb96d4744d223edaf0a
2012-12-13 14:07:32 -08:00