Apsdehal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108204
Change subject: Go to original image link added, as well the zoom
......................................................................
Go to original image link added, as well the zoom
Bug: 59936
Change-Id: Ide5279e7ae48714e73bd5bbdc7e4a07da76582ca
---
M MultimediaViewer.i18n.php
M MultimediaViewer.php
M resources/ext.multimediaViewer/ext.multimediaViewer.css
M resources/ext.multimediaViewer/ext.multimediaViewer.js
M resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
A resources/ext.multimediaViewer/img/zoom.svg
6 files changed, 49 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/04/108204/1
diff --git a/MultimediaViewer.i18n.php b/MultimediaViewer.i18n.php
index eac7346..731f82b 100644
--- a/MultimediaViewer.i18n.php
+++ b/MultimediaViewer.i18n.php
@@ -31,6 +31,7 @@
'multimediaviewer-pref' => 'Media Viewer',
'multimediaviewer-pref-desc' => 'Improve your multimedia viewing
experience with this new tool. It displays images in larger size on pages that
have thumbnails. Images are shown in a nicer fullscreen interface overlay, and
can also be viewed in full-size.',
'multimediaviewer-file-page' => 'Go to corresponding file page',
+ 'multimediaviewer-file-zoom' => 'Closer look at Image',
'multimediaviewer-repository' => 'Learn more on $1',
'multimediaviewer-repository-local' => 'Learn more',
'multimediaviewer-datetime-created' => 'Created on $1',
@@ -81,6 +82,7 @@
'multimediaviewer-pref' => 'Preference title',
'multimediaviewer-pref-desc' => 'Description of preference',
'multimediaviewer-file-page' => 'Text for a link to the file page for
an image.',
+ 'multimediaviewer-file-zoom' => 'Description for link to image zoom
page',
'multimediaviewer-repository' => 'Link to the repository where the
image is hosted. Parameters:
* $1 - the display name of that site
See also:
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index b9001f5..690e26d 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -131,6 +131,7 @@
'messages' => array(
'multimediaviewer-file-page',
+ 'multimediaviewer-file-zoom',
'multimediaviewer-repository',
'multimediaviewer-repository-local',
'multimediaviewer-datetime-created',
diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.css
b/resources/ext.multimediaViewer/ext.multimediaViewer.css
index 7ed0428..e549ff2 100644
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.css
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.css
@@ -219,6 +219,10 @@
background-image: url(img/use-ltr.svg);
}
+.mw-mlb-image-links li.mw-mlb-zoom-li:before {
+ /* @embed */
+ background-image: url(img/zoom.svg);
+}
.mw-mlb-image-links li.empty:before {
background-image: none !important;
}
diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.js
b/resources/ext.multimediaViewer/ext.multimediaViewer.js
index 740153a..4093509 100755
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.js
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.js
@@ -487,6 +487,9 @@
ui.initUseFileData( fileTitle, imageData.url, repoData.isLocal
);
ui.$useFileLi.removeClass( 'empty' );
+ ui.initZoomData( imageData.url, repoData.isLocal );
+ ui.$zoomLi.removeClass( 'empty' );
+
ui.setRepoDisplay( repoData.displayName, repoData.favIcon,
repoData.isLocal );
ui.setFilePageLink( imageData.descriptionUrl );
@@ -608,6 +611,7 @@
this.setLocationData( imageData );
ui.$locationLi.toggleClass( 'empty', !imageData.hasCoords() );
+
};
/**
diff --git
a/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
b/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
index ffc2bda..d578da3 100644
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
@@ -53,6 +53,9 @@
this.$location.empty();
this.$locationLi.addClass( 'empty' );
+ this.$zoom.empty();
+ this.$zoomLi.addClass( 'empty' );
+
this.$useFile.data( 'title', null );
this.$useFile.data( 'link', null );
this.$useFile.data( 'src', null );
@@ -269,6 +272,7 @@
this.initializeUploader();
this.initializeLocation();
this.initializeFileUsage();
+ this.initializeZoom();
};
LIP.initializeRepoLink = function () {
@@ -327,6 +331,16 @@
this.$location = $( '<a>' )
.addClass( 'mw-mlb-location' )
.appendTo( this.$locationLi );
+ };
+
+ LIP.initializeZoom = function () {
+ this.$zoomLi = $( '<li>' )
+ .addClass( 'mw-mlb-zoom-li empty' )
+ .appendTo( this.$imageLinks );
+
+ this.$zoom = $( '<a>' )
+ .addClass( 'mw-mlb-zoom' )
+ .appendTo( this.$zoomLi );
};
LIP.initializeFileUsage = function () {
@@ -626,6 +640,23 @@
this.$useFile.data( 'isLocal', isLocal );
};
+ /*
+ * @method
+ * Sets the link to original image
+ * @param {string} src The URL for the full-size image
+ * @param {boolean} isLocal Whether the file is on this wiki or not
+ */
+
+ LIP.initZoomData = function ( src, isLocal ){
+ var linkPrefix = isLocal ? mw.config.get( 'wgServer' ) : '',
+ pattern = /^\/[^\/]/,
+ finalLink = pattern.test(src) ? linkPrefix +src: src;
+
+ this.$zoom.prop( 'href', finalLink )
+ .text( mw.message( 'multimediaviewer-file-zoom'
).text() );
+
+ };
+
/**
* @method
* Sets the link to the user page where possible
diff --git a/resources/ext.multimediaViewer/img/zoom.svg
b/resources/ext.multimediaViewer/img/zoom.svg
new file mode 100644
index 0000000..da02aa0
--- /dev/null
+++ b/resources/ext.multimediaViewer/img/zoom.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="64" height="64" viewBox="0 0 64 64"
xmlns="http://www.w3.org/2000/svg";>
+ <g>
+ <path fill="none" stroke="#888" stroke-width="5" d="M
36.138193,34.724716 53.329637,57.889139 M 42.448642,22 c 0,8.775329
-7.11381,15.889139 -15.889139,15.889139 -8.775329,0 -15.88914,-7.11381
-15.88914,-15.889139 0,-8.775329 7.113811,-15.8891392 15.88914,-15.8891392
8.775329,0 15.889139,7.1138102 15.889139,15.8891392 z"/>
+ <path fill="none" stroke="#888" stroke-width="1" d="m
30.600004,21.752839 -7.978811,0 m 3.989405,-3.989405 0,7.978811"/>
+ </g>
+</svg>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/108204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide5279e7ae48714e73bd5bbdc7e4a07da76582ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Apsdehal <amanpreet.iitr2...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
