Commit graph

694 commits

Author SHA1 Message Date
Gergő Tisza c1b2b1bb2c Show 'view terms' when we can't figure out the license
...since there probably still is one, and our failure to parse it
just makes it more important that we direct the user to the file
page.

Change-Id: Id31f95021f059ccf4bf9893b1146f3807dcabdcb
2014-04-19 00:42:47 +00:00
Gergő Tisza b00eca6ade Collect license handling code, remove unused data attribute
This just shuffles code around, should not change behavior.

Change-Id: Ieb0102300c8444f18444fae38e5ea813d8f682e5
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/472
2014-04-19 00:39:21 +00:00
jenkins-bot 119bdad504 Merge "Show scrollbars in survey window in Firefox" 2014-04-18 21:44:57 +00:00
jenkins-bot 29d58d7642 Merge "Link to creativecommons.org for CC licenses" 2014-04-18 21:37:18 +00:00
Mark Holmquist bfcbf06f80 Show scrollbars in survey window in Firefox
Change-Id: I6bf4838df86ad73a2aa4eeca3c9b3a4269ea0eae
2014-04-18 14:27:19 -07:00
Translation updater bot 85032874e0 Localisation updates from https://translatewiki.net.
Change-Id: I7e7d85187cee301c7b26c5100f9fae81075dbe69
2014-04-18 19:36:22 +00:00
Mark Holmquist a6619cb1ce Link to creativecommons.org for CC licenses
Change-Id: Ifdbb0d835b0eb6950eca3403bb486bbdd34651c6
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/221
2014-04-18 11:27:00 -07:00
Translation updater bot 3c00f7b3b7 Localisation updates from https://translatewiki.net.
Change-Id: Ie06b52a1ebb3cf7dc6cb2fe2149b17f0df3e348c
2014-04-17 18:59:40 +00:00
jenkins-bot 29a241ae36 Merge "Test to compare the performance of MMV and the Commons File: page" 2014-04-17 10:51:10 +00:00
Gilles Dubuc bf213ed978 Test to compare the performance of MMV and the Commons File: page
- Runs combinations of cold/warm browser cache and average/large window size
- Sends events with EventLogging that will allow us to generate limn graphs

This should run separately from the other cucumber test we already
have. This one needs different environment variables  because it needs
to run against production wikis instead of beta wikipedia

Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/378
Change-Id: I53b521ca2759c493aae6fe6e59be8d448e0f15d7
2014-04-17 12:32:15 +02:00
Gergő Tisza dd9a9718c3 Use thumbnail guessing
Change-Id: I2335af257fd23c9367b6839dfc6050840a905aa2
2014-04-17 10:35:33 +02:00
Gergő Tisza e03b9345c2 Guess thumbnail URLs without extra API call
Given a sample thumbnail URL and the original width/height
this provider tries to guess the thumbnail url for a given
size.

Change-Id: I2966b60978ab763864475851d8a79370bd422dc4
2014-04-17 01:21:35 +00:00
jenkins-bot 67f0272f1e Merge "Add history back button test to E2E" 2014-04-16 22:16:08 +00:00
jenkins-bot bd9b268107 Merge "Fix E2E scroll assertion logic" 2014-04-16 22:10:44 +00:00
jenkins-bot fff6c55695 Merge "Fix bug when exiting Media Viewer while image is loading" 2014-04-16 20:39:23 +00:00
jenkins-bot 8217b97462 Merge "Load moment.js on demand" 2014-04-16 20:32:21 +00:00
Translation updater bot e0b6ae7d59 Localisation updates from https://translatewiki.net.
Change-Id: Ie97b3f50bc526e36987a1b6d1179c8390f69b130
2014-04-16 17:41:51 +00:00
Translation updater bot dc6159f747 Localisation updates from https://translatewiki.net.
Change-Id: I6fe284a0bc37b098947e9698568f9ee5c1ab7ce2
2014-04-16 17:01:39 +00:00
Translation updater bot 9b8f1bc456 Localisation updates from https://translatewiki.net.
Change-Id: Ib37147c4ed30bb261a4715fbbd63aa1189a654b9
2014-04-16 15:42:44 +00:00
Gilles Dubuc 9d51e534da Fix bug when exiting Media Viewer while image is loading
Which would cause the image to never appear, even when reopening
Media Viewer. The source of the issue was an uncaught exception in
ThumbnailWidth.

Unfortunately this cannot be covered by E2E because the image
loads too fast in that context, and cucumber/selenium doesn't
have time to catch the placeholder.

Change-Id: I9386f6e857a7974166ddb5eeb7ea731d943eddcf
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/450
2014-04-16 13:59:45 +02:00
Gergő Tisza 9b1e756c3b Replace current URL generation logic with routing classes
* deduplicates URL generating/parsing code
* gets rid of spaces in URLs
* fixes error for file names with / in them (in case they exist;
  current MediaWiki seems to disallow such names anyway)

Change-Id: I5aad43f6af1b99523c597c39befcc9db1ecab83a
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/371
2014-04-16 12:51:38 +02:00
jenkins-bot e78d391037 Merge "Add routing classes" 2014-04-16 10:51:02 +00:00
Gergő Tisza 0b614c78e3 Add routing classes
Adds a Route class hierarchy for various URL schemes and a Router
class to convert Route classes to and from URLs.

Right now we only have two(-ish) schemes, but in the future we want
to be able to show related images which are not present on the current
page and need shareable URLs for those as well; also we might want
to specify other things in the URL than the current image (the reuse
box being open was one thing discussed); this will be a good framework
to add features like that.

The MainFileRoute class will be used by #416.

Change-Id: I489126a0ada37f91a22a2f48a4e686140a28d162
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/371
2014-04-16 12:40:17 +02:00
jenkins-bot ffdc63aa4c Merge "Do not load too-big thumbnails for SVGs" 2014-04-16 10:23:40 +00:00
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
Translation updater bot 9a8e67040a Localisation updates from https://translatewiki.net.
Change-Id: Ie50f3aef3e1d7fa6ce125055fec40d20901bb200
2014-04-15 20:08:21 +00:00
Mark Holmquist 0ed174a306 Do not load too-big thumbnails for SVGs
Change-Id: Iae75105151bfcd0e974fc292794802c77eb26ea4
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/448
2014-04-15 11:21:05 -07:00
Gilles Dubuc ac9f5d8c96 Add history back button test to E2E
The scrolling logic has broken specifically when navigating with the
back button (as opposed to pressing the "close" button). This change
aims to test that scenario.

Change-Id: Ibe31b319c882b7de2a84ae143652144093c50f1c
2014-04-15 16:25:22 +02:00
Gilles Dubuc fe399fc71c Fix E2E scroll assertion logic
It turns out that cucumber/selenium will automatically scroll
to the element you want it to click on. As a result we have to do
the same in order for the assertion to be correct when coming back to
the article.

Change-Id: I7d3b6609cfe7cdae9c08a6d723d652ad1a6a7055
2014-04-15 16:09:18 +02:00
Gilles Dubuc 7ff5b22873 Load moment.js on demand
Change-Id: I881d38ea201f314fcf364766bb589f56c9e6b057
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/444
2014-04-15 14:13:27 +02:00
Translation updater bot 201f97cf28 Localisation updates from https://translatewiki.net.
Change-Id: I1c2a23b144672507c88b8f86ca3a748821fb3ac3
2014-04-14 19:44:43 +00: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
Translation updater bot 5a13953913 Localisation updates from https://translatewiki.net.
Change-Id: I3296fc9ed3cba2d79e3995b535838dc24557f288
2014-04-13 19:16:05 +00:00
jenkins-bot b73c39a6d4 Merge "update test to pass with new locator" 2014-04-12 00:02:31 +00:00
cmcmahon 6ec33facf6 update test to pass with new locator
Change-Id: I49aec9bbfd590cc6111bed73fa1150e0f93d5bc6
2014-04-11 16:00:13 -07: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
Translation updater bot d9bf36db45 Localisation updates from https://translatewiki.net.
Change-Id: Ic8b4fc6349dde84009a41a907d3a6a052c6edddd
2014-04-11 19:48:33 +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
Translation updater bot 0d9c3aa545 Localisation updates from https://translatewiki.net.
Change-Id: I7e7e1accf167cbbd094ba599e369f696c643ac2b
2014-04-10 20:30:15 +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