Commit graph

374 commits

Author SHA1 Message Date
jenkins-bot 2cea09b588 Merge "Choose feedback survey based on user language" 2014-04-16 10:08:52 +00:00
Gergő Tisza 35eb14f837 Choose feedback survey based on user language
Change-Id: Ia9d53b6a3caedecd05429e5285765b1c5098342e
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/420
2014-04-16 00:52:40 +00:00
Mark Holmquist 68bb702eaa Fix issues with file page link
TIL about setup/teardown in qunit

Change-Id: Ib283285bea401be251ec3f46a2dbd01623fe895e
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/452
2014-04-15 15:42:11 -07:00
jenkins-bot a3cb95e2d2 Merge "Restore article scroll after closing Media Viewer" 2014-04-14 19:23:15 +00:00
Gilles Dubuc 09374fc9dd Restore article scroll after closing Media Viewer
There used to be a CSS trick with the order we added things to the
page and removed them from it, but it doesn't seem possible anymore
with the new order of execution, with the overlay appearing
immediately and being taken care of inside bootstrap.

The main cause of the bug, however, was the hash reset happening
after the interface was closed.

Doing the scroll restore with jQuery.scrollTo is more future-proof
and testable in QUnit.

Additions were also made to the cucumber E2E test because QUnit
alone wouldn't have caught the hash issue.

This also cleans up custom events a little and reintroduces
pushState on browsers that support the history API.

Change-Id: I63187383b632a2e8793f05380c18db2713856865
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/439
Bug: 63892
2014-04-14 18:04:30 +00:00
jenkins-bot e4e68115f5 Merge "Load oojs-ui on demand when "use this file" is clicked" 2014-04-14 17:29:58 +00:00
Mark Holmquist 244a5e70b0 Miscellaneous fixes to truncatable text fields
Should make the e2e tests pass again.

Change-Id: I2a610468837f53d10fd9e7f2fa6d0937407e6f26
2014-04-14 17:19:59 +02:00
Gilles Dubuc eb6386bb5b Load oojs-ui on demand when "use this file" is clicked
Change-Id: Ia3b6b91c7ff0cb223f5f312eb901726fb6adcf35
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/426
2014-04-14 11:50:05 +02:00
jenkins-bot 5a570186d1 Merge "Adjust OOjs UI TextInputWidget text style" 2014-04-14 09:41:43 +00:00
Gergő Tisza a6c279042c Adjust OOjs UI TextInputWidget text style
White text shadow looked bad on Chrome/Linux where selected text
color is white.

Change-Id: I6723bc8ee0f6e2f77bb299216d56a844ac17a9f1
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/443
2014-04-11 22:55:50 +00:00
Gergő Tisza b0fc56f039 Fix icon positioning for secondary repo link
The last change did not work so well for small (non-Commons) links,
adjusting.

Change-Id: I50bb25f4311715d93ebb12603b1b2546273efa31
2014-04-11 21:02:12 +00:00
Pau Giner e250a45eb3 Spacing adjustment for repository link
Spacing of the whole element and the Commons logo has been
adjusted to provide visual clarity.

Change-Id: I601a1d5c847199dc734911dc9e90c0fe7931bca8
2014-04-11 15:30:19 +00:00
Gergő Tisza 2bb6c48ee2 Show a fallback repo icon for the "go to file page" button
...if the real icon is not available.

Change-Id: I36b79beb1867deb86b0a1d986db672854c3b839e
2014-04-10 19:09:28 +00:00
jenkins-bot 6dae43b0cf Merge "Fix commons icon to avoid pixelation" 2014-04-10 18:12:34 +00:00
jenkins-bot 228539fc03 Merge "Fix overlap of info box and right sidebar" 2014-04-10 16:32:28 +00:00
jenkins-bot a433c43556 Merge "Split button line adjustment" 2014-04-10 12:58:30 +00:00
Pau Giner bb70c70431 Split button line adjustment
The download button used a dashed black line to separate options.
It has been changed to a dark green line to better fit the style.

Change-Id: I3224027b69c4c1e5cf2568aed8f4f50ee351c369
2014-04-10 14:35:13 +02:00
jenkins-bot 911e87adde Merge "Add truncatable text field, use for some fields" 2014-04-10 12:13:46 +00:00
Gilles Dubuc 779b91d405 Fix commons icon to avoid pixelation
The CSS to make the favico twice as big was looking horrible in
Firefox and possibly other browsers. Since we're already
special-casing commons, let's apply a proper SVG instead of the
favico.

Change-Id: Ie32302342eba7aa37bd310c013a9f4d7f9ae187e
2014-04-10 13:20:39 +02:00
Pau Giner 808b6cb848 Removed white background from SVG assets
Two images contained a white background that was limiting their
use over other background colours.

Change-Id: Ic61e0d223ed927968344b132dbe67952c80bbe28
2014-04-10 11:55:27 +02:00
Gilles Dubuc ebeaf5cc5d Fix overlap of info box and right sidebar
Seen in Firefox: https://www.dropbox.com/s/a4d2ltanx343kh0/Screenshot%202014-04-10%2009.57.51.png

Change-Id: I8ae755eb1008078a94face60efee53c11d9ce3b9
2014-04-10 09:59:31 +02:00
jenkins-bot 642eb25e3b Merge "Open MMV on hash change on file pages, add link" 2014-04-10 07:36:54 +00:00
Mark Holmquist 1ae138c9e7 Open MMV on hash change on file pages, add link
Change-Id: I4aa53d50bcd4880f341dfb59b7a451e2d5bda2ad
2014-04-10 09:34:01 +02:00
jenkins-bot 141580d9a7 Merge "Shuffle things around so original file sizes are easier to access" 2014-04-10 07:13:52 +00:00
jenkins-bot f106af19d0 Merge "Workaround for OOJS ES3 incompatibility" 2014-04-10 06:51:55 +00:00
Gergő Tisza 7da686cb2f Shuffle things around so original file sizes are easier to access
Make original file width/height part of LightboxImage, and pass it
to the image loading function.

This adds a bit to the big steaming pile of technical debt that is
mmv.js. To be cleaned up later.

Change-Id: I84b8ae75cd1cc3e94c6cf03d174473764cfbf86f
2014-04-10 01:56:38 +00:00
jenkins-bot 9375c63958 Merge "Clean up issues left c/121064" 2014-04-10 01:32:43 +00:00
jenkins-bot ea5b135d80 Merge "Fix tipsy bug, part 2" 2014-04-10 01:27:12 +00:00
Gergő Tisza d8bf56bf89 Fix tipsy bug, part 2
Change-Id: Ie3bf54c1f5e550b86bf29151ed14be36ad63bee0
2014-04-10 01:24:21 +00:00
Aaron Arcos be76d4b5db Clean up issues left c/121064
Change-Id: I5daa3c8f75c93dbbd6a8f748a6c869d73d3959f6
2014-04-09 18:23:42 -07:00
jenkins-bot 02735e3431 Merge "Fix tipsy bug" 2014-04-10 01:13:36 +00:00
Gergő Tisza 005d15568f Fix tipsy bug
maybeDisplayThumbnail is invoked even when the survey is disabled,
which results in calling functions of a null object.

Change-Id: If7a48349e22069f91af20d8c4bb6a82b7339bd66
2014-04-10 01:09:07 +00:00
Gilles Dubuc 0fd2007923 Fix z-index bug in Firefox that would make navigation buttons appear on top of the metadata panel
Also fixes other issues:
- Some code in mmv.lightboxinterface.js wasn't doing anything
- Canvas buttons were being added to the wrong element
- Several CSS rules were being declared twice, a remnant of the multilightbox days

Change-Id: I6ffa1f6a989964d3863aa9dbeb332c0e59dff2e6
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/409
2014-04-09 17:37:14 -07:00
Gilles Dubuc a7778cb799 Selects html embed by default for logged-out users
Change-Id: Ie472905f0188637157632050ad0571043f04b324
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/379
2014-04-10 00:06:54 +00:00
jenkins-bot 0be102d9b2 Merge "Make Commons link more prominent" 2014-04-10 00:02:46 +00:00
Mark Holmquist 40feb61dbe Add truncatable text field, use for some fields
Source + author are one such field, title is another.

Loads of the mingle card will be split out.

Change-Id: Ib2937cc55304118f82e5b2e87b822b2b2811ef2b
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/243
2014-04-09 15:53:37 -07:00
Gergő Tisza 8951f6f2e0 Notify user about early errors via mw.notify
Errors which were early enough in the life cycle to completely
block the lightbox from displaying were so far invisible to the user.
We display them in a small popup using the core messaging functionality.

Change-Id: Id04fe5d3b54703e24cd216910b15cc8bae786434
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/414
2014-04-09 21:57:58 +00:00
Gergő Tisza ee113af8f5 Make Commons link more prominent
Change-Id: Id546de9671fdc00ba73b01a1bc6398f2da2a6a2b
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/270
2014-04-09 21:45:39 +00:00
jenkins-bot 8065fad8a5 Merge "Clean up, get rid of leftover comment" 2014-04-09 20:01:04 +00:00
Aaron Arcos 0eb9270c20 Clean up, get rid of leftover comment
Follow up on https://gerrit.wikimedia.org/r/#/c/124772/

Change-Id: Ie3a8c327c2a30f34f39379be51d0be42a8692376
2014-04-09 12:03:02 -07:00
jenkins-bot 4c08160eb3 Merge "Fix issues with size menus after oojs-ui update" 2014-04-09 18:54:15 +00:00
Aaron Arcos 71fec37579 Fix issues with size menus after oojs-ui update
These should fix all the issues we have now with the size menus.

Change-Id: Ief2e5e653330b01c9787e04a10b1b2c425da705e
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/407
2014-04-09 11:46:51 -07:00
jenkins-bot 8f38e499b0 Merge "Quick fix for black screen of death" 2014-04-09 18:31:02 +00:00
jenkins-bot e9fa58c135 Merge "Adjustments to the Commons icon in Media Viewer To achieve consistency with the icons in the Media Viewer panel, the following has been adjusted: - Colors onf the "share" icon to match the rest of the icons (updated to the new gray values of Agora). - Size of the Commons icon has been adjusted both in the SVG file and when it is added in the LESS/CSS. Due to the different aspect ratio of this icon, extra spacing has been added to make it visually fit." 2014-04-09 15:46:31 +00:00
Pau Giner a5c146dc19 Adjustments to the Commons icon in Media Viewer
To achieve consistency with the icons in the Media Viewer panel,
the following has been adjusted:
- Colors onf the "share" icon to match the rest of the icons (updated to the new gray values of Agora).
- Size of the Commons icon has been adjusted both in the SVG file and when it is added in the LESS/CSS. Due to the different aspect ratio of this icon, extra spacing has been added to make it visually fit.

Change-Id: Ic14a869ea96ea1a8202c9988f0c5d330ba3e9a70
2014-04-09 14:52:54 +02:00
Pau Giner 8cd21e3c82 Adjust text style for size indications
For download button and size drop-downs, the size labels
have been set to small and normal weight (in the download button, 
other rules made it to be bold if no weight was specified).

Change-Id: I7511b307a8459d6e4a01f0b9540528046ad2be8e
2014-04-09 12:15:52 +00:00
jenkins-bot c42f5425f9 Merge "Show tooltip when all sorts of conditions are met" 2014-04-09 09:40:53 +00:00
Gergő Tisza d4bf2188b1 Quick fix for black screen of death
This fixes three issues:
* the overlay way multiplied during history navigation, but only
  the last one was cleaned up on exit
* the overlay was not cleaned up when loading a #mediaviewer URL
  with an invalid file name
* the overlay was not cleaned up when there was an error creating
  the viewer object

This is a quick fix, and does not change the fact that
bootstrapping is an unmaintainable mess which should be cleaned up.

Change-Id: I2838e5e709e7c7308b0a5b27eca24a2584d0a01e
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/414
2014-04-09 00:37:06 +00:00
Gergő Tisza 404bcd3989 Make categories behave
The way categories were handled made it impossible to add anything
after them (they always ended up as the last child of the parent
container). This commit fixes that, and also moves the repo link
behind them (as required by #270).

Change-Id: I7c561c43897054e60028bd524d8ad5ea85f39e36
2014-04-08 19:58:13 +00:00
Gilles Dubuc 22bdbd4041 Show tooltip when all sorts of conditions are met
Change-Id: I987d5d517c3db2409e138b85b90115260d9116bd
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/261
2014-04-08 18:33:24 +00:00