From a6619cb1ce183f490db30c7d3192e5c9aaed3fee Mon Sep 17 00:00:00 2001 From: Mark Holmquist Date: Fri, 18 Apr 2014 11:27:00 -0700 Subject: [PATCH] Link to creativecommons.org for CC licenses Change-Id: Ifdbb0d835b0eb6950eca3403bb486bbdd34651c6 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/221 --- resources/mmv/ui/mmv.ui.metadataPanel.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js b/resources/mmv/ui/mmv.ui.metadataPanel.js index 26782a752..53b9ed2eb 100644 --- a/resources/mmv/ui/mmv.ui.metadataPanel.js +++ b/resources/mmv/ui/mmv.ui.metadataPanel.js @@ -405,7 +405,6 @@ */ MPP.setFilePageLink = function ( url ) { this.$repo.prop( 'href', url ); - this.$license.prop( 'href', url ); }; /** @@ -552,12 +551,14 @@ /** * Sets the license display in the panel * @param {string} license The human-readable name of the license + * @param {string} url The URL to the license deed. * @param {boolean} isCc Whether this is a CC license */ - MPP.setLicense = function ( license, isCc ) { + MPP.setLicense = function ( license, url, isCc ) { this.$license .text( license ) - .toggleClass( 'cc-license', isCc ); + .toggleClass( 'cc-license', isCc ) + .prop( 'href', url ); this.$license.removeClass( 'empty' ); }; @@ -700,7 +701,11 @@ } if ( imageData.license ) { - this.setLicense( mw.message( msgname ).text(), imageData.isCcLicensed() ); + this.setLicense( + mw.message( msgname ).text(), + imageData.license.deedUrl || imageData.descriptionUrl, + imageData.isCcLicensed() + ); } if ( imageData.permission ) {