Commit graph

64 commits

Author SHA1 Message Date
gladoscc 84a8df8808 Show (tm) symbol if applicable
ImageData will now parse for restrictions (this part has not been
implemented in CommonsMetadata yet), and an orange trademark label
will be displayed next to the license label if there is a 'trademarked'
restriction.

Bug: T77717
Change-Id: Ib03f9708d1e4ff0b5befddc2688b274e2c7ce1f7
2015-01-15 18:21:30 +11:00
m4tx 9a6039b580 Improve error messages UI for Media Viewer
Bug: T77272
Change-Id: I97ffa70903da32c66697c52969cfec2df03c1d57
2015-01-14 08:24:27 +01:00
m4tx dac77cafc4 Change "view terms" to "hide terms" once clicked
metadataPanel overrides the grow() and shrink() methods in Permission
class instance, so the text is changed also when user clicks the
"view more" link inside the box.

Bug: T71233
Change-Id: I66fe57980c6f469d86e3d52b67d01e06a3a14270
2014-12-29 23:23:07 +01:00
Namit 50391b6a01 Permission title changed to "Permission details"
It is not about the license but the permission why Commons may keep this file.
Other permission messages also changed accordingly.

Bug: T66804
Change-Id: Ic3f1f1f8280022f4c0d1b48502cac1709b5c14a1
2014-12-19 12:49:52 -06:00
Gergő Tisza b5d3f9ef6c Make "and X more" message more flexible for translators
Also make sure part of it is not a link to avoid two links
ending up next to each other + fix a small documentation bug.

Bug: T76465
Change-Id: I128ec7034b0bb9784fb78d1a5ce90d195555848e
2014-12-02 22:49:29 +00:00
Gergő Tisza 485944ba9d Show "and X more authors" when a file has multiple info templates
Bug: T74082
Change-Id: If53e3e364d07ef35a93b3b24430441d390aaf66e
2014-11-27 07:24:26 +00:00
Gergő Tisza 05d803e17a Text changes for better handling of PD and nonfree licenses
Bug: T70687
Change-Id: I84e0094559e5b438fcb33b8511dc0184435c1a37
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/1004
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/631
2014-11-26 02:21:50 +00:00
Gergő Tisza af508f066a Make the ellipsis of truncated texts more prominent
Also fixes popup texts which should have been updated in the parent commit
and the panel opening mechanism which did not work when the below-the-fold
description box was display:none-d.

Change-Id: I5fc37429a7dc7a8f1517fa42375cd140d7d11674
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/589
2014-11-11 15:37:14 +00:00
Gergő Tisza 3a18515163 Replace filename with caption/description
* when the caption is available, use it as the image title
* otherwise, fall back to description if available
* otherwise, fall back to filename
* if both caption and description are available, show caption as
  title and show description below the fold; otherwise don't show anything
  below the fold.

Change-Id: I9738ca46620d7cf3b30f6e46790a37966d4b9eaf
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/589
2014-11-11 15:33:15 +00:00
Gergő Tisza b0bac10627 Display a placeholder text when author and source are missing
Change-Id: I38478956c5a0b5f204e5caa43e54db651f297887
2014-10-29 15:38:56 +00:00
jenkins-bot fb7a04f5a2 Merge "Change above-the-fold layout - step 1" 2014-10-28 21:18:48 +00:00
Gergő Tisza a6adad35ed Change above-the-fold layout - step 1
* remove chevron
* adjust colors

Change-Id: I443fd757f5df18d099e42a81f1f323fadea77987
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/833
2014-10-28 20:02:22 +00:00
Gilles Dubuc 0d743977dd Fix issue with options dialog when media viewer has been reopened
- Fixes the bug where the options menu wouldn't open if media
viewer was reopened
- Adds human-readable console messages for the options actions
- Makes the tooltip a tipsy one like all the other buttons
- Fixes the tooltip copy, it was referring to "previews", which we
said we wouldn't do anymore, in favour of "Media Viewer"

Change-Id: I1590f9501cc6c406cc1f466b414062d4d6435c1b
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/963
2014-10-23 15:29:44 +02:00
Gergő Tisza 62133bab3c Update URLs of renamed pages
Change-Id: I6547855881a86616a9df52ad38e97136ee16eae0
2014-10-22 15:44:23 +00:00
Gergő Tisza 2c578e6dc3 Show popup when the user visits a file page the first time after disabling MMV
Change-Id: Id2b121c930115373a8a81dc1091c4124807db053
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/719
2014-10-21 14:28:20 +00:00
Gilles Dubuc 90042a5a02 Cog icon & mw.ui styling for expand button
Includes some small refactoring of the bootstrap code to open
MediaViewer so it can be used in a more controller-like fashion, and
removing the .mw-mmv-filepage-menu class which was added in the parent
commit but had no effect since the module was not loaded by default.

Change-Id: I2e7405e694af96e8eca4fcc839b60306232ead01
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/719
2014-10-21 15:16:33 +02:00
Mark Holmquist 1853540cd3 Add viewing options panel
Enable, disable, and get confirmations.

Lots of UI work on this one.

Change-Id: I1f731992bd240e7ea403592872f7c7e270158753
2014-10-19 00:27:15 +02:00
Gilles Dubuc 58d0d45730 Lowercase tooltip wording
Change-Id: I4b74981190084c43c5d3b608cfcb3de1d358eae6
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/914
2014-09-30 13:50:19 +02:00
jenkins-bot 1181870ae7 Merge "Change tooltip wording" 2014-09-29 15:02:33 +00:00
Gilles Dubuc 2f1cfc0403 Change tooltip wording
Change-Id: I3c4ed1306fe355ef787bbfdc771b6df43854159b
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/914
2014-09-29 16:59:33 +02:00
Mark Holmquist 9187148b01 Remove duplicate details link in metadata panel
Change-Id: I2eaa221fa505e9f106fa8611adfe99677a24009b
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/909
2014-09-28 21:45:55 +00:00
jenkins-bot 18beee316e Merge "Make the download pane into its own dialog" 2014-09-24 21:12:20 +00:00
jenkins-bot 24e2487d7e Merge "Make "more details" button bigger 'n' prettier" 2014-09-24 21:12:18 +00:00
Mark Holmquist 0d4863dd91 Make the download pane into its own dialog
Change-Id: Ia92545ed1ef7f2e4ba7934c682eef684a22ca17f
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/841
2014-09-24 17:05:50 +02:00
Mark Holmquist 7d7cd3a8e6 Make "more details" button bigger 'n' prettier
Change-Id: I81a370a910c0cec269a000c9dcaac8461d3421b0
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/830
2014-09-23 10:41:00 -07:00
Gilles Dubuc 89800caedb Rename file page button
Change-Id: Ic3c2b2b7201c4870e1548597a4309483983ae431
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/870
2014-09-23 16:17:43 +02:00
Mark Holmquist a82dfd6eb0 Remove tooltip for view-file
Change-Id: I89b2dfd43ea18a2e1fe9d2214b76218b24ce88cb
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/886
2014-09-11 10:41:45 -07:00
Gilles Dubuc caa624d711 Remove file usage
Change-Id: I538f7734e1c06a179ee98a5cd843ccee4d91349f
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/835
2014-09-05 08:14:52 +02:00
Thiemo Mättig 8ef7dad28b Remove misleading "now" from message
Bug: 69282
Change-Id: I339f9386bf543b95cd5c710d919186cd0a0662ff
2014-08-15 13:50:43 +00:00
Gergő Tisza f14d08fd75 Reveal full text when user clicks on title or credit
Reveal the full title + author + source when the user clicks one
of these, and make some related changes:
* expand the above-the-fold part of the metadata panel so they fit
* make the stripe buttons smaller and hide their text
* scroll the panel up if necessary
* modify tooltip texts when there is more text to show

Change-Id: I304297bc5e7be7b16e2fc4bde66ac19641b00029
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/396
2014-07-17 09:42:12 -04:00
Gilles Dubuc b0d885e4dc Remove all survey-related code
Change-Id: I67285260c13a1e8d3c37365bb80a7156c0fecd4e
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/794
2014-07-16 21:27:53 +00:00
Gergő Tisza a57a606ee5 Transclude expand button text in help message instead of copying it
Per translatewiki.net request at
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Multimediaviewer-optout-help/ar

Change-Id: I2bff044ad6d5b2fb3f72cba2cb1f6add181da5f1
2014-07-15 22:12:47 +00:00
jenkins-bot 116d29a651 Merge "Remove trainling dot from download attibution text to not break URLs" 2014-07-07 16:30:56 +00:00
jenkins-bot 06b772d92f Merge "Make description page link and reuse widget more prominent" 2014-07-04 06:45:34 +00:00
Gergő Tisza 4a05b97dc9 Remove trainling dot from download attibution text to not break URLs
When formatting the attribution as plain text, make sure that the
source parameter (which typically ends with an URL) is not followed
by a '.', which could break autolinking when e.g. the text is
copied into a mail.

Change-Id: I5406fe3a55bc4ef6802b32d5a3d533ce9f49b361
2014-07-02 01:11:02 +00:00
jenkins-bot 02216b5ed3 Merge "Add section for attribution of downloads" 2014-06-30 18:36:07 +00:00
Mark Holmquist 532819b5a0 Remove next/prev tooltips
Change-Id: I978914bd57d7fdc260dbc0422915e6b766c35a66
2014-06-30 14:20:41 -04:00
Mark Holmquist a4e6bc22d9 Add section for attribution of downloads
Click on the button to expand, click the X to collapse again.

Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/598
Change-Id: I6d2512cca0184437273329e6553c6524d6953404
2014-06-30 10:38:11 -04:00
Gergő Tisza 8d05dd8a6d Make description page link and reuse widget more prominent
Rearrange the above-the-fold part of the metadata panel so that
the link to the file descriprion page and the button for the
download/share/embed widgets are easier to find.

One gotcha is that favicons are blown up to 32x32px (a small icon
in the middle of a big empty space would really look ridiculous)
so if a site uses 16x16px favicons it will look pixelated.
None of the WMF sites do that though, and if anyone else does, they
should just fix it, 16px favicons suck anyway (e.g. not retina friendly).

Change-Id: Icce12174b6ed89731fe75f8069c0b4a2b7161a34
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/732
2014-06-28 00:28:11 +00:00
Gilles Dubuc 9caf00e944 Fix typo in i18n
Change-Id: Ib161e71d8f7ee00c48cd697b21c7442a815d4be6
2014-06-19 11:05:52 +02:00
jenkins-bot 0c80fcd992 Merge "Make optout link more AJAXy" 2014-06-19 09:01:54 +00:00
Gergő Tisza c01cb55f4d Make optout link more AJAXy
Make it grey, unclickable and change text while waiting for the
AJAX request.

Change-Id: Ic5c2923944658d5be04217cdfe62e1d8608a478f
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/723
2014-06-19 10:42:04 +02:00
jenkins-bot 30a1940737 Merge "Change "learn more" to "more details about this file"" 2014-06-19 08:17:53 +00:00
Gergő Tisza 2616546468 Change "learn more" to "more details about this file"
Several people complained that "Learn more on Wikimedia Commons"
is not clear: it can be interpreted as a link to the Commons
main page, the text does not suggest that the link will be related
to this specific file. The new wording tries to address this.

Change-Id: Ia605cc30c4ca57598f7cebdde60061800a10b6e7
2014-06-18 19:10:11 +00:00
Gergő Tisza f557dc6968 Tweak optout popup texts
Change-Id: I0478a7945db8b8bc5063e8385644a6ac7c228b79
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/720
2014-06-17 23:39:16 +00:00
jenkins-bot b8b475c77c Merge "Make preview link more prominent" 2014-06-13 23:39:15 +00:00
Amir E. Aharoni 76f179ffdc Simplifying the 'Esc' message
The current message is:
Close this tool. Or press 'Esc' to exit

It has several problems:
* No full stop.
* Very long.
* Strange grammar: beginning a sentence with "Or" is unusual.

I simply put the Esc in parentheses, which is a common practice
with keyboard shortcuts.

Change-Id: Ib79ba8020885200ae2aaf7830ab337936c436752
2014-06-13 13:13:21 +03:00
Mark Holmquist ea610f8256 Tooltips for loads of things
Change-Id: I993bf60909024453a14de85af6239bded02eb8a6
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/546
2014-06-12 12:27:04 -07:00
Mark Holmquist f308c9f7b0 Make preview link more prominent
Also cleaned up the SVG. I hate Illustrator so much for what it does to
SVGs.

Change-Id: I3c1b8b812ed50ad65a8c2f53835e440bfd2e77ac
2014-06-12 11:07:47 -07:00
jenkins-bot 76d40a0189 Merge "Change "Created on X" and "Uploaded on X" to "Created: X" etc." 2014-06-11 22:53:27 +00:00