MarkTraceur has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86172
Change subject: Put username into title div
......................................................................
Put username into title div
Now we have a byline!
Change-Id: I38940782dc5d2d56c8aea608b1fe72e04f397c00
---
M MultimediaViewer.i18n.php
M MultimediaViewer.php
M css/ext.multimediaViewer.css
M js/ext.multimediaViewer.js
4 files changed, 29 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/72/86172/1
diff --git a/MultimediaViewer.i18n.php b/MultimediaViewer.i18n.php
index 3a106a5..d1f6b63 100644
--- a/MultimediaViewer.i18n.php
+++ b/MultimediaViewer.i18n.php
@@ -28,6 +28,7 @@
'multimediaviewer-pref' => 'Enable nicer image viewing',
'multimediaviewer-pref-desc' => 'Enables a nicer-looking multimedia
viewer for images on pages that have thumbnails. Uses a third party lightbox
library and JavaScript.',
'multimediaviewer-file-page' => 'Go to corresponding file page',
+ 'multimediaviewer-byline' => 'uploaded by $1',
);
/**
@@ -39,4 +40,5 @@
'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-byline' => 'Byline for an image - $1 is the username
of the uploader.',
);
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index 27d6990..d8f136f 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -71,6 +71,7 @@
'messages' => array(
'multimediaviewer-file-page',
+ 'multimediaviewer-byline',
),
), $moduleInfo );
diff --git a/css/ext.multimediaViewer.css b/css/ext.multimediaViewer.css
index e2490ea..68b775c 100644
--- a/css/ext.multimediaViewer.css
+++ b/css/ext.multimediaViewer.css
@@ -64,12 +64,18 @@
right: 0px;
}
-.mw-mlb-file-title {
+.mw-mlb-title-div {
color: #FFFFFF;
vertical-align: middle;
margin-left: 10px;
}
+.mw-mlb-title-div p {
+ margin-bottom: 1px;
+ margin-top: 0px;
+ padding: 0px;
+}
+
.mw-mlb-image-metadata {
margin-top: 30px;
width: 100%;
diff --git a/js/ext.multimediaViewer.js b/js/ext.multimediaViewer.js
index c48342d..64c01eb 100644
--- a/js/ext.multimediaViewer.js
+++ b/js/ext.multimediaViewer.js
@@ -63,24 +63,18 @@
viewer.lightbox.currentIndex = index;
viewer.fetchImageInfo( filename, function (
imageInfo ) {
- var $title, title;
+ var title;
viewer.lightbox.images[index].src =
imageInfo.imageinfo[0].url;
viewer.lightbox.open();
- $title = $( '.mw-mlb-file-title' );
-
title = new mw.Title( imageInfo.title );
- if ( $title.length === 0 ) {
- $( '.mlb-controls' ).append(
- $( '<span>' )
- .addClass(
'mw-mlb-file-title' )
- .text(
title.getNameText() )
- );
- } else {
- $title.text(
title.getNameText() );
- }
+ $( '.mw-mlb-title' ).text(
title.getNameText() );
+
+ $( '.mw-mlb-byline' ).text(
+ mw.message(
'multimediaviewer-byline', imageInfo.imageinfo[0].user ).text()
+ );
} );
return false;
@@ -117,6 +111,19 @@
.append( this.$imageLinkDiv );
this.$wrapper.append( this.$imageMetadata );
+
+ this.$title = $( '<p>' )
+ .addClass( 'mw-mlb-title' );
+
+ this.$byline = $( '<p>' )
+ .addClass( 'mw-mlb-byline' );
+
+ this.$titleDiv = $( '<div>' )
+ .addClass( 'mw-mlb-title-div' )
+ .html( this.$title )
+ .append( this.$byline );
+
+ this.$controlBar.append( this.$titleDiv );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/86172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38940782dc5d2d56c8aea608b1fe72e04f397c00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
