Add description to the DOM

This is all getting really real, really fast!

Depends on:

* core
:* I77303d8e535fc1c42e14cfb853814e5c434a81ec
* CommonsMetadata
:* I5e6bc45f9751641e16426231dabcc8277b86fee0

Change-Id: I203852358fc6f7592832e48c562b24c5d9f046f5
This commit is contained in:
Mark Holmquist 2013-10-11 10:55:10 -07:00
parent c9bd8416ec
commit bfc58e4533
2 changed files with 21 additions and 2 deletions

View file

@ -91,7 +91,8 @@
.mw-mlb-image-metadata {
margin-top: 30px;
width: 100%;
width: 64%;
margin: 30px auto;
position: relative;
}
@ -106,6 +107,10 @@
left: 0px;
}
.mw-mlb-image-desc {
color: #6f7073;
}
.mw-mlb-image-links-div {
right: 0px;
}

View file

@ -117,6 +117,7 @@
var extmeta,
repoInfo, articlePath,
desc,
ui = viewer.lightbox.iface,
innerInfo = imageInfo.imageinfo[0] || {};
@ -153,6 +154,17 @@
ui.$repoLi.toggleClass( 'empty', !Boolean( repoInfo ) );
extmeta = innerInfo.extmetadata;
if ( extmeta ) {
desc = extmeta.ImageDescription;
if ( desc ) {
desc = desc.value;
ui.$imageDesc.html(
whitelistHtml( $( desc ) )
);
}
}
} );
return false;
@ -316,7 +328,9 @@
format: 'json',
titles: filename,
prop: 'imageinfo',
iiprop: iiprops.join( '|' )
iiprop: iiprops.join( '|' ),
// Short-circuit, don't fallback, to save some tiny amount of time
iiextmetadatalanguage: mw.config.get( 'wgUserLanguage', false ) || mw.config.get( 'wgContentLanguage', 'en' )
},
viewer = this;