MarkTraceur has uploaded a new change for review. https://gerrit.wikimedia.org/r/108876
Change subject: A bunch of description fixes ...................................................................... A bunch of description fixes * Move description and caption to both be in the bottom left * Make empty description grey and italic * Fix problem where description was sometimes appended twice Change-Id: Ibc8c576cd8a41c2e3cf7e13f1b9e093384fb4655 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/120 --- M resources/ext.multimediaViewer/ext.multimediaViewer.css M resources/ext.multimediaViewer/ext.multimediaViewer.js M resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js 3 files changed, 17 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/76/108876/1 diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.css b/resources/ext.multimediaViewer/ext.multimediaViewer.css index 7ed0428..d20b5b6 100644 --- a/resources/ext.multimediaViewer/ext.multimediaViewer.css +++ b/resources/ext.multimediaViewer/ext.multimediaViewer.css @@ -277,10 +277,20 @@ .mw-mlb-title-para, .mw-mlb-credit, .mw-mlb-image-desc, +.mw-mlb-description-backup, .mw-mlb-mmv-about-links { padding-left: 20px; } +.mw-mlb-image-desc-div.empty .mw-mlb-image-desc { + color: rgb(136, 136, 136); + font-style: italic; +} + +.mw-mlb-description-backup.empty { + display: none; +} + .mw-mlb-mmv-about-links { font-size: 0.8em; padding: 20px; diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.js b/resources/ext.multimediaViewer/ext.multimediaViewer.js index e7cf6ce..0b17e54 100755 --- a/resources/ext.multimediaViewer/ext.multimediaViewer.js +++ b/resources/ext.multimediaViewer/ext.multimediaViewer.js @@ -542,12 +542,6 @@ ui.$datetimeLi.toggleClass( 'empty', !imageData.uploadDateTime && !imageData.creationDateTime ); - if ( imageData.description ) { - this.whitelistHtml( ui.$imageDesc.empty().append( $.parseHTML( imageData.description ) ) ); - } else { - ui.$imageDesc.append( mw.message( 'multimediaviewer-desc-nil' ).text() ); - } - ui.$imageDescDiv.toggleClass( 'empty', !imageData.description ); if ( imageData.source ) { @@ -578,6 +572,7 @@ ui.$credit.toggleClass( 'empty', !imageData.source && !imageData.author ); ui.$imageDescDiv.toggleClass( 'empty', !imageData.description && !caption ); + ui.$imageBackupDesc.toggleClass( 'empty', !imageData.description || !caption ); if ( caption ) { this.whitelistHtml( ui.$imageDesc.append( $.parseHTML( caption ) ) ); @@ -587,6 +582,8 @@ } } else if ( imageData.description ) { this.whitelistHtml( ui.$imageDesc.append( $.parseHTML( imageData.description ) ) ); + } else { + ui.$imageDesc.append( mw.message( 'multimediaviewer-desc-nil' ).text() ); } msgname = 'multimediaviewer-license-' + ( imageData.license || '' ); diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js b/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js index 27ab9de..f4f1f60 100644 --- a/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js +++ b/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js @@ -255,6 +255,10 @@ this.$imageDesc = $( '<p>' ) .addClass( 'mw-mlb-image-desc' ) .appendTo( this.$imageDescDiv ); + + this.$imageBackupDesc = $( '<p>' ) + .addClass( 'mw-mlb-description-backup empty' ) + .appendTo( this.$imageDescDiv ); }; LIP.initializeImageLinks = function () { @@ -264,10 +268,6 @@ this.$imageLinks = $( '<ul>' ) .addClass( 'mw-mlb-image-links' ) - .appendTo( this.$imageLinkDiv ); - - this.$imageBackupDesc = $( '<p>' ) - .addClass( 'mw-mlb-description-backup' ) .appendTo( this.$imageLinkDiv ); this.initializeRepoLink(); -- To view, visit https://gerrit.wikimedia.org/r/108876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc8c576cd8a41c2e3cf7e13f1b9e093384fb4655 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
