jenkins-bot has submitted this change and it was merged.
Change subject: Add creation time to list
......................................................................
Add creation time to list
Fallback to upload time for now.
Helps to have:
* core
:* I77303d8e535fc1c42e14cfb853814e5c434a81ec
* CommonsMetadata
:* I5e6bc45f9751641e16426231dabcc8277b86fee0
Change-Id: I822b48cebbace51cd8f68adc45a68a1c93ec29db
---
M MultimediaViewer.i18n.php
M MultimediaViewer.php
M css/ext.multimediaViewer.css
A img/time.svg
M js/ext.multimediaViewer.js
5 files changed, 42 insertions(+), 0 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MultimediaViewer.i18n.php b/MultimediaViewer.i18n.php
index d7f9338..19d14ad 100644
--- a/MultimediaViewer.i18n.php
+++ b/MultimediaViewer.i18n.php
@@ -31,6 +31,8 @@
'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 lightbox overlay, and can also be
viewed in full-size.',
'multimediaviewer-file-page' => 'Go to corresponding file page',
'multimediaviewer-repository' => 'Learn more on $1',
+ 'multimediaviewer-datetime-created' => 'Created on $1',
+ 'multimediaviewer-datetime-uploaded' => 'Uploaded on $1',
);
/** Message documentation (Message documentation)
@@ -42,6 +44,8 @@
'multimediaviewer-pref-desc' => 'Description of preference',
'multimediaviewer-file-page' => 'Text for a link to the file page for
an image.',
'multimediaviewer-repository' => 'Link to the repository where the
image is hosted. $1 is the display name of that site.',
+ 'multimedia-datetime-created' => 'Date and time the image or work was
created. $1 is always a date string, no need to translate.',
+ 'multimedia-datetime-uploaded' => 'Date and time the image was uploaded
- fallback in case there is no data for creation date. $1 is always a date
string, no need to translate.',
);
/** Arabic (العربية)
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index dcb7da9..a48a648 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -72,6 +72,8 @@
'messages' => array(
'multimediaviewer-file-page',
'multimediaviewer-repository',
+ 'multimediaviewer-datetime-created',
+ 'multimediaviewer-datetime-uploaded',
),
), $moduleInfo );
diff --git a/css/ext.multimediaViewer.css b/css/ext.multimediaViewer.css
index f981da6..b3e84f6 100644
--- a/css/ext.multimediaViewer.css
+++ b/css/ext.multimediaViewer.css
@@ -136,3 +136,11 @@
.mw-mlb-image-links li.empty:before {
background-image: none !important;
}
+
+.mw-mlb-image-links li.mw-mlb-datetime-li:before {
+ background-image: url( '../img/time.svg' );
+}
+
+.mw-mlb-image-links li.mw-mlb-datetime-li.empty:before {
+ background-image: none;
+}
diff --git a/img/time.svg b/img/time.svg
new file mode 100644
index 0000000..149cfb8
--- /dev/null
+++ b/img/time.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC
"-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";><svg version="1.1"
id="Layer_1" xmlns="http://www.w3.org/2000/svg"; width="32px"
height="32px"><circle fill="#939598" cx="16" cy="16" r="15" /><path d="M 16,3.5
L 16,16 L 23,23" stroke="white" stroke-width="3px" fill="none" /></svg>
diff --git a/js/ext.multimediaViewer.js b/js/ext.multimediaViewer.js
index 9a77fa9..7c4aec5 100644
--- a/js/ext.multimediaViewer.js
+++ b/js/ext.multimediaViewer.js
@@ -118,6 +118,7 @@
var extmeta,
repoInfo, articlePath,
desc,
+ datetime, dtmsg,
ui = viewer.lightbox.iface,
innerInfo =
imageInfo.imageinfo[0] || {};
@@ -164,6 +165,22 @@
whitelistHtml(
$( desc ) )
);
}
+
+ datetime =
extmeta.DateTimeOriginal || extmeta.DateTime;
+
+ if ( datetime ) {
+ dtmsg = (
+
'multimediaviewer-datetime-' +
+ (
extmeta.DateTimeOriginal ? 'created' : 'uploaded' )
+ );
+ datetime =
datetime.value;
+
+ ui.$datetime.text(
+ mw.message(
dtmsg, datetime ).text()
+ );
+ }
+
+ ui.$datetimeLi.toggleClass(
'empty', !Boolean( datetime ) );
}
} );
@@ -217,6 +234,16 @@
this.$imageLinks.append( this.$repoLi );
+ this.$datetime = $( '<span>' )
+ .addClass( 'mw-mlb-datetime' );
+
+ this.$datetimeLi = $( '<li>' )
+ .addClass( 'mw-mlb-datetime-li' )
+ .addClass( 'empty' )
+ .html( this.$datetime );
+
+ this.$imageLinks.append( this.$datetimeLi );
+
this.$title = $( '<p>' )
.addClass( 'mw-mlb-title' );
--
To view, visit https://gerrit.wikimedia.org/r/90040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I822b48cebbace51cd8f68adc45a68a1c93ec29db
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <[email protected]>
Gerrit-Reviewer: Gergő Tisza <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
