[MediaWiki-commits] [Gerrit] Show permission - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/113312 Change subject: Show permission .. Show permission Change-Id: I0b8b0626b36baba9732f7350213d8b53ec2cca95 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/118 --- M MultimediaViewer.i18n.php M MultimediaViewer.php M resources/mmv/mmv.less M resources/mmv/model/mmv.model.Image.js M resources/mmv/provider/mmv.provider.ImageInfo.js M resources/mmv/ui/mmv.ui.fileUsage.less A resources/mmv/ui/mmv.ui.less M resources/mmv/ui/mmv.ui.metadataPanel.js A resources/mmv/ui/mmv.ui.metadataPanel.less A resources/mmv/ui/mmv.ui.permission.js A resources/mmv/ui/mmv.ui.permission.less M tests/qunit/mmv.model.test.js M tests/qunit/mmv.ui.metadataPanel.test.js A tests/qunit/mmv.ui.permission.test.js M tests/qunit/provider/mmv.provider.ImageInfo.test.js 15 files changed, 346 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/12/113312/1 diff --git a/MultimediaViewer.i18n.php b/MultimediaViewer.i18n.php index c041b02..4f650af 100644 --- a/MultimediaViewer.i18n.php +++ b/MultimediaViewer.i18n.php @@ -57,6 +57,9 @@ 'multimediaviewer-license-pd' => 'Public Domain', 'multimediaviewer-license-default' => 'View license', + 'multimediaviewer-permission-title' => 'License details', + 'multimediaviewer-permission-link' => 'see terms', + 'multimediaviewer-use-file' => 'Use this file', 'multimediaviewer-use-file-owt' => 'Use this file on a wiki page, as a thumbnail', 'multimediaviewer-use-file-own' => 'Use this file on a wiki page, inline', @@ -152,6 +155,8 @@ 'multimediaviewer-license-pd' => 'Very short label for Public Domain images, used in a link to the file information page that has more licensing information. {{Identical|Public domain}}', 'multimediaviewer-license-default' => 'Short label for a link to generic license information.', + 'multimediaviewer-permission-title' => 'Title of the box containing additional license terms', + 'multimediaviewer-permission-link' => 'Text of the link which shows additional license terms', 'multimediaviewer-use-file' => 'Link that opens a dialog with options for sharing the file, e.g. onwiki or on another site. Similar to the Commons gadget stockPhoto.', 'multimediaviewer-use-file-owt' => 'Label for input box which has wikitext used to show an image with the thumb option and a helpful caption. diff --git a/MultimediaViewer.php b/MultimediaViewer.php index 700aeb0..dd3e9b0 100644 --- a/MultimediaViewer.php +++ b/MultimediaViewer.php @@ -235,6 +235,10 @@ 'mmv.ui.js', ), + 'styles' => array( + 'mmv.ui.less', + ), + 'dependencies' => array( 'mmv.base', ), @@ -283,18 +287,43 @@ ), ), $moduleInfo( 'mmv/ui' ) ); + $wgResourceModules['mmv.ui.permission'] = array_merge( array( + 'scripts' => array( + 'mmv.ui.permission.js', + ), + + 'styles' => array( + 'mmv.ui.permission.less', + ), + + 'messages' => array( + 'multimediaviewer-permission-title', + ), + + 'dependencies' => array( + 'jquery.color', + 'mediawiki.jqueryMsg', + 'mmv.ui', + 'oojs', + ), + ), $moduleInfo( 'mmv/ui' ) ); + $wgResourceModules['mmv.ui.metadataPanel'] = array_merge( array( 'scripts' => array( 'mmv.ui.metadataPanel.js', ), - // Note: We should pull these styles out, but the LESS patch should get merged first. -// 'styles' => array( -// 'mmv.ui.metadataPanel.less', -// ), + + 'styles' => array( + 'mmv.ui.metadataPanel.less', + ), 'dependencies' => array( 'mmv.ui', 'mmv.ui.fileReuse', + 'mmv.ui.fileUsage', + 'mmv.ui.permission', + 'mmv.ui.description', + 'mmv.ui.categories', 'oojs', 'momentjs', ), @@ -310,6 +339,9 @@ 'multimediaviewer-datetime-created', 'multimediaviewer-datetime-uploaded', + // for license messages see end of file + 'multimediaviewer-permission-link', + 'multimediaviewer-geoloc-north',
[MediaWiki-commits] [Gerrit] Show permission - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged. Change subject: Show permission .. Show permission Change-Id: I0b8b0626b36baba9732f7350213d8b53ec2cca95 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/118 --- M MultimediaViewer.i18n.php M MultimediaViewer.php M MultimediaViewerHooks.php M resources/mmv/mmv.bootstrap.js M resources/mmv/mmv.less M resources/mmv/model/mmv.model.Image.js M resources/mmv/provider/mmv.provider.ImageInfo.js A resources/mmv/ui/img/x_gray.svg M resources/mmv/ui/mmv.ui.fileUsage.less A resources/mmv/ui/mmv.ui.less M resources/mmv/ui/mmv.ui.metadataPanel.js A resources/mmv/ui/mmv.ui.metadataPanel.less A resources/mmv/ui/mmv.ui.permission.js A resources/mmv/ui/mmv.ui.permission.less M tests/qunit/mmv.bootstrap.test.js M tests/qunit/mmv.model.test.js M tests/qunit/mmv.ui.metadataPanel.test.js A tests/qunit/mmv.ui.permission.test.js M tests/qunit/provider/mmv.provider.ImageInfo.test.js 19 files changed, 490 insertions(+), 18 deletions(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/MultimediaViewer.i18n.php b/MultimediaViewer.i18n.php index 104c9a2..4a13048 100644 --- a/MultimediaViewer.i18n.php +++ b/MultimediaViewer.i18n.php @@ -57,6 +57,9 @@ 'multimediaviewer-license-pd' => 'Public Domain', 'multimediaviewer-license-default' => 'View license', + 'multimediaviewer-permission-title' => 'License details', + 'multimediaviewer-permission-link' => 'view terms', + 'multimediaviewer-use-file' => 'Use this file', 'multimediaviewer-use-file-owt' => 'Use this file on a wiki page, as a thumbnail', 'multimediaviewer-use-file-own' => 'Use this file on a wiki page, inline', @@ -152,6 +155,8 @@ 'multimediaviewer-license-pd' => 'Very short label for Public Domain images, used in a link to the file information page that has more licensing information. {{Identical|Public domain}}', 'multimediaviewer-license-default' => 'Short label for a link to generic license information.', + 'multimediaviewer-permission-title' => 'Title of the box containing additional license terms', + 'multimediaviewer-permission-link' => 'Text of the link which shows additional license terms', 'multimediaviewer-use-file' => 'Link that opens a dialog with options for sharing the file, e.g. onwiki or on another site. Similar to the Commons gadget stockPhoto.', 'multimediaviewer-use-file-owt' => 'Label for input box which has wikitext used to show an image with the thumb option and a helpful caption. diff --git a/MultimediaViewer.php b/MultimediaViewer.php index 7ea99c8..704a28f 100644 --- a/MultimediaViewer.php +++ b/MultimediaViewer.php @@ -236,6 +236,10 @@ 'mmv.ui.js', ), + 'styles' => array( + 'mmv.ui.less', + ), + 'dependencies' => array( 'mmv.base', ), @@ -284,18 +288,43 @@ ), ), $moduleInfo( 'mmv/ui' ) ); + $wgResourceModules['mmv.ui.permission'] = array_merge( array( + 'scripts' => array( + 'mmv.ui.permission.js', + ), + + 'styles' => array( + 'mmv.ui.permission.less', + ), + + 'messages' => array( + 'multimediaviewer-permission-title', + ), + + 'dependencies' => array( + 'jquery.color', + 'mediawiki.jqueryMsg', + 'mmv.ui', + 'oojs', + ), + ), $moduleInfo( 'mmv/ui' ) ); + $wgResourceModules['mmv.ui.metadataPanel'] = array_merge( array( 'scripts' => array( 'mmv.ui.metadataPanel.js', ), - // Note: We should pull these styles out, but the LESS patch should get merged first. -// 'styles' => array( -// 'mmv.ui.metadataPanel.less', -// ), + + 'styles' => array( + 'mmv.ui.metadataPanel.less', + ), 'dependencies' => array( 'mmv.ui', 'mmv.ui.fileReuse', + 'mmv.ui.fileUsage', + 'mmv.ui.permission', + 'mmv.ui.description', + 'mmv.ui.categories', 'oojs', 'moment', ), @@ -311,6 +340,9 @@ 'multimediaviewer-datetime-created', 'multimediaviewer-datetime-uploaded', + // for license messages see end of file + 'multimediaviewer-permission-link', +