http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76288
Revision: 76288
Author: neilk
Date: 2010-11-08 06:28:06 +0000 (Mon, 08 Nov 2010)
Log Message:
-----------
moved initial HTML of page from JS to PHP, including tutorial generation (much
faster now!)
Modified Paths:
--------------
trunk/extensions/UploadWizard/SpecialUploadWizard.php
trunk/extensions/UploadWizard/resources/combined.js
trunk/extensions/UploadWizard/resources/combined.min.js
trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
Modified: trunk/extensions/UploadWizard/SpecialUploadWizard.php
===================================================================
--- trunk/extensions/UploadWizard/SpecialUploadWizard.php 2010-11-08
06:21:20 UTC (rev 76287)
+++ trunk/extensions/UploadWizard/SpecialUploadWizard.php 2010-11-08
06:28:06 UTC (rev 76288)
@@ -11,6 +11,8 @@
class SpecialUploadWizard extends SpecialPage {
+ const TUTORIAL_NAME_TEMPLATE = 'Licensing_tutorial_$1.svg';
+
private $simpleForm;
// $request is the request (usually wgRequest)
@@ -56,6 +58,7 @@
$this->simpleForm->show();
$wgOut->addHTML('</noscript>');
+
// global javascript variables
$this->addJsVars( $subPage );
@@ -76,10 +79,8 @@
// where the uploadwizard will go
// TODO import more from UploadWizard's createInterface call.
- $wgOut->addHTML(
- '<div id="upload-wizard" class="upload-section"><div
class="loadingSpinner"></div></div>'
- );
-
+ $wgOut->addHTML( self::getWizardHtml() );
+
}
/**
@@ -168,6 +169,129 @@
return true;
}
+ /**
+ * Fetches appropriate HTML for the tutorial portion of the wizard.
+ * Looks up an image on the current wiki. This will work as is on
Commons, and will also work
+ * on test wikis that enable instantCommons.
+ * @param {String} $langCode language code as used by MediaWiki,
similar but not identical to ISO 639-1.
+ * @return {String} html that will display the tutorial.
+ */
+ function getTutorialHtml() {
+ global $wgLanguageCode;
+
+ // assume failure (this will be replaced if we're successful)
+ $tutorialHtml = '<p class="errorbox">' . wfMsg(
'mwe-upwiz-tutorial-error' ) . '</p>';
+
+ // get a valid language code, even if the global is wrong
+ $langCode = $wgLanguageCode;
+ if ( !isset( $langCode) or $langCode === '' ) {
+ $langCode = 'en';
+ }
+
+ $tutorialName = str_replace( '$1', $langCode,
self::TUTORIAL_NAME_TEMPLATE );
+ $tutorialTitle = Title::newFromText( $tutorialName, NS_FILE );
+
+ // wfFindFile() returns a File object, or false
+ if ( $tutorialFile = wfFindFile( $tutorialTitle ) ) {
+ // XXX TODO if the client can handle SVG, we could also
just send it the unscaled thumb, client-scaled into a DIV or something.
+ // if ( client can handle SVG ) {
+ // $tutorialThumbnailImage->getUnscaledThumb();
+ // }
+ // put it into a div of appropriate dimensions.
+
+ // n.b. File::transform() returns false if failed,
MediaTransformOutput otherwise
+ if ( $tutorialThumbnailImage =
$tutorialFile->transform( array( 'width' => '720' ) ) ) {
+ $tutorialHtml =
$tutorialThumbnailImage->toHtml();
+ }
+ }
+
+ return $tutorialHtml;
+ }
+
+ /**
+ * Return the basic HTML structure for the entire page
+ * Will be enhanced by the javascript to actually do stuff
+ * @return {String} html
+ */
+ function getWizardHtml() {
+ // TODO loading spinner, hide these by default till enhanced?
+ return
+ '<div id="upload-wizard" class="upload-section">'
+
+ // the arrow steps
+ . '<ul id="mwe-upwiz-steps">'
+ . '<li id="mwe-upwiz-step-tutorial"><div>' .
wfMsg('mwe-upwiz-step-tutorial') . '</div></li>'
+ . '<li id="mwe-upwiz-step-file"><div>' .
wfMsg('mwe-upwiz-step-file') . '</div></li>'
+ . '<li id="mwe-upwiz-step-deeds"><div>' .
wfMsg('mwe-upwiz-step-deeds') . '</div></li>'
+ . '<li id="mwe-upwiz-step-details"><div>' .
wfMsg('mwe-upwiz-step-details') . '</div></li>'
+ . '<li id="mwe-upwiz-step-thanks"><div>' .
wfMsg('mwe-upwiz-step-thanks') . '</div></li>'
+ . '</ul>'
+
+ // the individual steps, all at once
+ . '<div id="mwe-upwiz-content">'
+
+ . '<div class="mwe-upwiz-stepdiv"
id="mwe-upwiz-stepdiv-tutorial">'
+ . '<div id="mwe-upwiz-tutorial">'
+ . self::getTutorialHtml()
+ . '</div>'
+ . '<div class="mwe-upwiz-buttons">'
+ . '<button class="mwe-upwiz-button-next" />'
+ . '</div>'
+ . '</div>'
+
+ . '<div class="mwe-upwiz-stepdiv ui-helper-clearfix"
id="mwe-upwiz-stepdiv-file">'
+ . '<div id="mwe-upwiz-intro">' . wfMsg('mwe-upwiz-intro')
. '</div>'
+ . '<div id="mwe-upwiz-files">'
+ . '<div id="mwe-upwiz-upload-ctrls"
class="mwe-upwiz-file">'
+ . '<div id="mwe-upwiz-add-file-container"
class="mwe-upwiz-add-files-0">'
+ . '<a id="mwe-upwiz-add-file">' .
wfMsg("mwe-upwiz-add-file-0") . '</a>'
+ . '</div>'
+ . '</div>'
+ . '<div id="mwe-upwiz-progress"
class="ui-helper-clearfix"></div>'
+ . '</div>'
+ . '<div class="mwe-upwiz-buttons" style="display: none"/>'
+ . '<button class="mwe-upwiz-button-next" />'
+ . '</div>'
+ . '</div>'
+
+ . '<div class="mwe-upwiz-stepdiv"
id="mwe-upwiz-stepdiv-deeds">'
+ . '<div id="mwe-upwiz-deeds-intro"></div>'
+ . '<div id="mwe-upwiz-deeds-thumbnails"
class="ui-helper-clearfix"></div>'
+ . '<div id="mwe-upwiz-deeds"
class="ui-helper-clearfix"></div>'
+ . '<div id="mwe-upwiz-deeds-custom"
class="ui-helper-clearfix"></div>'
+ . '<div class="mwe-upwiz-buttons"/>'
+ . '<button class="mwe-upwiz-button-next" />'
+ . '</div>'
+ . '</div>'
+
+ . '<div class="mwe-upwiz-stepdiv"
id="mwe-upwiz-stepdiv-details">'
+ . '<div id="mwe-upwiz-macro">'
+ . '<div id="mwe-upwiz-macro-progress"
class="ui-helper-clearfix"></div>'
+ . '<div id="mwe-upwiz-macro-choice">'
+ . '<div>' . wfMsg( 'mwe-upwiz-details-intro' ) .
'</div>'
+ . '</div>'
+ . '<div id="mwe-upwiz-macro-files"></div>'
+ . '</div>'
+ . '<div class="mwe-upwiz-buttons"/>'
+ . '<button class="mwe-upwiz-button-next" />'
+ . '</div>'
+ . '</div>'
+
+ . '<div class="mwe-upwiz-stepdiv"
id="mwe-upwiz-stepdiv-thanks">'
+ . '<div id="mwe-upwiz-thanks"></div>'
+ . '<div class="mwe-upwiz-buttons"/>'
+ . '<button class="mwe-upwiz-button-begin"></button>'
+ . '<br/><button
class="mwe-upwiz-button-home"></button>'
+ . '</div>'
+ . '</div>'
+
+ . '</div>'
+
+ . '<div class="mwe-upwiz-clearing"></div>'
+
+ . '</div>';
+ }
+
}
Modified: trunk/extensions/UploadWizard/resources/combined.js
===================================================================
--- trunk/extensions/UploadWizard/resources/combined.js 2010-11-08 06:21:20 UTC
(rev 76287)
+++ trunk/extensions/UploadWizard/resources/combined.js 2010-11-08 06:28:06 UTC
(rev 76288)
@@ -9924,80 +9924,7 @@
*/
createInterface: function( selector ) {
var _this = this;
- var div = $j( selector ).get(0);
-
- div.innerHTML =
- // the arrow steps
- '<ul id="mwe-upwiz-steps">'
- + '<li id="mwe-upwiz-step-tutorial"><div>' +
gM('mwe-upwiz-step-tutorial') + '</div></li>'
- + '<li id="mwe-upwiz-step-file"><div>' +
gM('mwe-upwiz-step-file') + '</div></li>'
- + '<li id="mwe-upwiz-step-deeds"><div>' +
gM('mwe-upwiz-step-deeds') + '</div></li>'
- + '<li id="mwe-upwiz-step-details"><div>' +
gM('mwe-upwiz-step-details') + '</div></li>'
- + '<li id="mwe-upwiz-step-thanks"><div>' +
gM('mwe-upwiz-step-thanks') + '</div></li>'
- + '</ul>'
- // the individual steps, all at once
- + '<div id="mwe-upwiz-content">'
-
- + '<div class="mwe-upwiz-stepdiv"
id="mwe-upwiz-stepdiv-tutorial">'
- + '<div id="mwe-upwiz-tutorial">' // this is
hardcoded badness
- + '</div>'
- + '<div class="mwe-upwiz-buttons">'
- + '<button class="mwe-upwiz-button-next" />'
- + '</div>'
- + '</div>'
-
- + '<div class="mwe-upwiz-stepdiv ui-helper-clearfix"
id="mwe-upwiz-stepdiv-file">'
- + '<div id="mwe-upwiz-intro">' +
gM('mwe-upwiz-intro') + '</div>'
- + '<div id="mwe-upwiz-files">'
- + '<div id="mwe-upwiz-upload-ctrls"
class="mwe-upwiz-file">'
- + '<div id="mwe-upwiz-add-file-container"
class="mwe-upwiz-add-files-0">'
- + '<a id="mwe-upwiz-add-file">' +
gM("mwe-upwiz-add-file-0") + '</a>'
- + '</div>'
- + '</div>'
- + '<div id="mwe-upwiz-progress"
class="ui-helper-clearfix"></div>'
- + '</div>'
- + '<div class="mwe-upwiz-buttons" style="display:
none"/>'
- + '<button class="mwe-upwiz-button-next" />'
- + '</div>'
- + '</div>'
-
- + '<div class="mwe-upwiz-stepdiv"
id="mwe-upwiz-stepdiv-deeds">'
- + '<div id="mwe-upwiz-deeds-intro"></div>'
- + '<div id="mwe-upwiz-deeds-thumbnails"
class="ui-helper-clearfix"></div>'
- + '<div id="mwe-upwiz-deeds"
class="ui-helper-clearfix"></div>'
- + '<div id="mwe-upwiz-deeds-custom"
class="ui-helper-clearfix"></div>'
- + '<div class="mwe-upwiz-buttons"/>'
- + '<button class="mwe-upwiz-button-next" />'
- + '</div>'
- + '</div>'
-
- + '<div class="mwe-upwiz-stepdiv"
id="mwe-upwiz-stepdiv-details">'
- + '<div id="mwe-upwiz-macro">'
- + '<div id="mwe-upwiz-macro-progress"
class="ui-helper-clearfix"></div>'
- + '<div id="mwe-upwiz-macro-choice">'
- + '<div>' + gM( 'mwe-upwiz-details-intro' ) +
'</div>'
- + '</div>'
- + '<div id="mwe-upwiz-macro-files"></div>'
- + '</div>'
- + '<div class="mwe-upwiz-buttons"/>'
- + '<button class="mwe-upwiz-button-next" />'
- + '</div>'
- + '</div>'
-
- + '<div class="mwe-upwiz-stepdiv"
id="mwe-upwiz-stepdiv-thanks">'
- + '<div id="mwe-upwiz-thanks"></div>'
- + '<div class="mwe-upwiz-buttons"/>'
- + '<button
class="mwe-upwiz-button-begin"></button>'
- + '<br/><button
class="mwe-upwiz-button-home"></button>'
- + '</div>'
- + '</div>'
-
- + '</div>'
-
- + '<div class="mwe-upwiz-clearing"></div>';
-
- this.setTutorialImage( $j( '#mwe-upwiz-tutorial' ) );
$j( '#mwe-upwiz-steps' )
.addClass( 'ui-helper-clearfix ui-state-default
ui-widget ui-helper-reset ui-helper-clearfix' )
.arrowSteps();
@@ -10139,57 +10066,6 @@
},
/**
- * Using the API, fetch the appropriate HTML for the licensing
tutorial, and append it to $element
- * @param {jQuery} jQuery instance initialized with selector
- */
- setTutorialImage: function( $el ) {
- var title = new mw.Title( 'WikimediaCommonsUploadTutorial-' +
mw.UploadWizard.config.userLanguage + '.png', 'file' );
- var params = {
- 'prop': 'imageinfo',
- 'titles': title.toString(),
- 'iiurlwidth': '722', // determined to be the correct
size for the tutorial, such that body text is the similar in size to our normal
HTML text
- 'iiprop': 'url|size'
- };
- var tutorialError = function( code, result ) {
- $el.append(
- $j( '<p/>' ).append( gM(
'mwe-upwiz-tutorial-error' ) ),
- /* make it hidden or grey or small something...
*/
- $j( '<p/>' ).append( gM(
'mwe-upwiz-api-error-code', code ) )
- );
- };
- var tutorialOk = function( data ) {
- if ( !data || !data.query || !data.query.pages ) {
- return;
- }
- var thumbnail;
- $j.each( data.query.pages, function( id, page ) {
- if ( page.imageinfo && page.imageinfo.length ) {
- var imageinfo = page.imageinfo[0];
- if ( imageinfo.thumburl &&
imageinfo.thumbwidth && imageinfo.thumbheight ) {
- thumbnail = page.imageinfo[0];
- return false;
- }
- }
- } );
- if ( ! mw.isDefined( thumbnail ) ) {
- tutorialError( data );
- } else {
- $el.append(
- $j( '<img/>' ).attr( {
- 'src': thumbnail.thumburl,
- 'width': thumbnail.thumbwidth,
- 'height': thumbnail.thumbheight
- } )
- );
- }
- };
-
- //var commonsApi = new mw.Api( { 'url':
'http://commons.wikimedia.org/w/api.php' } );
- this.api.get( params, { ok: tutorialOk, err: tutorialError } );
- },
-
-
- /**
* Advance one "step" in the wizard interface.
* It is assumed that the previous step to the current one was selected.
* We do not hide the tabs because this messes up certain calculations
we'd like to make about dimensions, while elements are not
Modified: trunk/extensions/UploadWizard/resources/combined.min.js
===================================================================
--- trunk/extensions/UploadWizard/resources/combined.min.js 2010-11-08
06:21:20 UTC (rev 76287)
+++ trunk/extensions/UploadWizard/resources/combined.min.js 2010-11-08
06:28:06 UTC (rev 76288)
@@ -9924,80 +9924,7 @@
createInterface:function(selector){
var _this=this;
-var div=$j(selector).get(0);
-div.innerHTML=
-
-'<ul id="mwe-upwiz-steps">'
-+'<li
id="mwe-upwiz-step-tutorial"><div>'+gM('mwe-upwiz-step-tutorial')+'</div></li>'
-+'<li id="mwe-upwiz-step-file"><div>'+gM('mwe-upwiz-step-file')+'</div></li>'
-+'<li id="mwe-upwiz-step-deeds"><div>'+gM('mwe-upwiz-step-deeds')+'</div></li>'
-+'<li
id="mwe-upwiz-step-details"><div>'+gM('mwe-upwiz-step-details')+'</div></li>'
-+'<li
id="mwe-upwiz-step-thanks"><div>'+gM('mwe-upwiz-step-thanks')+'</div></li>'
-+'</ul>'
-
-
-+'<div id="mwe-upwiz-content">'
-
-+'<div class="mwe-upwiz-stepdiv" id="mwe-upwiz-stepdiv-tutorial">'
-+'<div id="mwe-upwiz-tutorial">'
-+'</div>'
-+'<div class="mwe-upwiz-buttons">'
-+'<button class="mwe-upwiz-button-next" />'
-+'</div>'
-+'</div>'
-
-+'<div class="mwe-upwiz-stepdiv ui-helper-clearfix"
id="mwe-upwiz-stepdiv-file">'
-+'<div id="mwe-upwiz-intro">'+gM('mwe-upwiz-intro')+'</div>'
-+'<div id="mwe-upwiz-files">'
-+'<div id="mwe-upwiz-upload-ctrls" class="mwe-upwiz-file">'
-+'<div id="mwe-upwiz-add-file-container" class="mwe-upwiz-add-files-0">'
-+'<a id="mwe-upwiz-add-file">'+gM("mwe-upwiz-add-file-0")+'</a>'
-+'</div>'
-+'</div>'
-+'<div id="mwe-upwiz-progress" class="ui-helper-clearfix"></div>'
-+'</div>'
-+'<div class="mwe-upwiz-buttons" style="display: none"/>'
-+'<button class="mwe-upwiz-button-next" />'
-+'</div>'
-+'</div>'
-
-+'<div class="mwe-upwiz-stepdiv" id="mwe-upwiz-stepdiv-deeds">'
-+'<div id="mwe-upwiz-deeds-intro"></div>'
-+'<div id="mwe-upwiz-deeds-thumbnails" class="ui-helper-clearfix"></div>'
-+'<div id="mwe-upwiz-deeds" class="ui-helper-clearfix"></div>'
-+'<div id="mwe-upwiz-deeds-custom" class="ui-helper-clearfix"></div>'
-+'<div class="mwe-upwiz-buttons"/>'
-+'<button class="mwe-upwiz-button-next" />'
-+'</div>'
-+'</div>'
-
-+'<div class="mwe-upwiz-stepdiv" id="mwe-upwiz-stepdiv-details">'
-+'<div id="mwe-upwiz-macro">'
-+'<div id="mwe-upwiz-macro-progress" class="ui-helper-clearfix"></div>'
-+'<div id="mwe-upwiz-macro-choice">'
-+'<div>'+gM('mwe-upwiz-details-intro')+'</div>'
-+'</div>'
-+'<div id="mwe-upwiz-macro-files"></div>'
-+'</div>'
-+'<div class="mwe-upwiz-buttons"/>'
-+'<button class="mwe-upwiz-button-next" />'
-+'</div>'
-+'</div>'
-
-+'<div class="mwe-upwiz-stepdiv" id="mwe-upwiz-stepdiv-thanks">'
-+'<div id="mwe-upwiz-thanks"></div>'
-+'<div class="mwe-upwiz-buttons"/>'
-+'<button class="mwe-upwiz-button-begin"></button>'
-+'<br/><button class="mwe-upwiz-button-home"></button>'
-+'</div>'
-+'</div>'
-
-+'</div>'
-
-+'<div class="mwe-upwiz-clearing"></div>';
-
-this.setTutorialImage($j('#mwe-upwiz-tutorial'));
$j('#mwe-upwiz-steps')
.addClass('ui-helper-clearfix ui-state-default ui-widget ui-helper-reset
ui-helper-clearfix')
.arrowSteps();
@@ -10142,61 +10069,10 @@
-setTutorialImage:function($el){
-var title=new
mw.Title('WikimediaCommonsUploadTutorial-'+mw.UploadWizard.config.userLanguage+'.png','file');
-var params={
-'prop':'imageinfo',
-'titles':title.toString(),
-'iiurlwidth':'722',
-'iiprop':'url|size'
-};
-var tutorialError=function(code,result){
-$el.append(
-$j('<p/>').append(gM('mwe-upwiz-tutorial-error')),
-$j('<p/>').append(gM('mwe-upwiz-api-error-code',code))
-);
-};
-var tutorialOk=function(data){
-if(!data||!data.query||!data.query.pages){
-return;
-}
-var thumbnail;
-$j.each(data.query.pages,function(id,page){
-if(page.imageinfo&&page.imageinfo.length){
-var imageinfo=page.imageinfo[0];
-if(imageinfo.thumburl&&imageinfo.thumbwidth&&imageinfo.thumbheight){
-thumbnail=page.imageinfo[0];
-return false;
-}
-}
-});
-if(!mw.isDefined(thumbnail)){
-tutorialError(data);
-}else{
-$el.append(
-$j('<img/>').attr({
-'src':thumbnail.thumburl,
-'width':thumbnail.thumbwidth,
-'height':thumbnail.thumbheight
-})
-);
-}
-};
-this.api.get(params,{ok:tutorialOk,err:tutorialError});
-},
-
-
-
-
-
-
-
-
-
moveToStep:function(selectedStepName,callback){
var _this=this;
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizard.js 2010-11-08
06:21:20 UTC (rev 76287)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizard.js 2010-11-08
06:28:06 UTC (rev 76288)
@@ -1476,80 +1476,7 @@
*/
createInterface: function( selector ) {
var _this = this;
- var div = $j( selector ).get(0);
-
- div.innerHTML =
- // the arrow steps
- '<ul id="mwe-upwiz-steps">'
- + '<li id="mwe-upwiz-step-tutorial"><div>' +
gM('mwe-upwiz-step-tutorial') + '</div></li>'
- + '<li id="mwe-upwiz-step-file"><div>' +
gM('mwe-upwiz-step-file') + '</div></li>'
- + '<li id="mwe-upwiz-step-deeds"><div>' +
gM('mwe-upwiz-step-deeds') + '</div></li>'
- + '<li id="mwe-upwiz-step-details"><div>' +
gM('mwe-upwiz-step-details') + '</div></li>'
- + '<li id="mwe-upwiz-step-thanks"><div>' +
gM('mwe-upwiz-step-thanks') + '</div></li>'
- + '</ul>'
- // the individual steps, all at once
- + '<div id="mwe-upwiz-content">'
-
- + '<div class="mwe-upwiz-stepdiv"
id="mwe-upwiz-stepdiv-tutorial">'
- + '<div id="mwe-upwiz-tutorial">' // this is
hardcoded badness
- + '</div>'
- + '<div class="mwe-upwiz-buttons">'
- + '<button class="mwe-upwiz-button-next" />'
- + '</div>'
- + '</div>'
-
- + '<div class="mwe-upwiz-stepdiv ui-helper-clearfix"
id="mwe-upwiz-stepdiv-file">'
- + '<div id="mwe-upwiz-intro">' +
gM('mwe-upwiz-intro') + '</div>'
- + '<div id="mwe-upwiz-files">'
- + '<div id="mwe-upwiz-upload-ctrls"
class="mwe-upwiz-file">'
- + '<div id="mwe-upwiz-add-file-container"
class="mwe-upwiz-add-files-0">'
- + '<a id="mwe-upwiz-add-file">' +
gM("mwe-upwiz-add-file-0") + '</a>'
- + '</div>'
- + '</div>'
- + '<div id="mwe-upwiz-progress"
class="ui-helper-clearfix"></div>'
- + '</div>'
- + '<div class="mwe-upwiz-buttons" style="display:
none"/>'
- + '<button class="mwe-upwiz-button-next" />'
- + '</div>'
- + '</div>'
-
- + '<div class="mwe-upwiz-stepdiv"
id="mwe-upwiz-stepdiv-deeds">'
- + '<div id="mwe-upwiz-deeds-intro"></div>'
- + '<div id="mwe-upwiz-deeds-thumbnails"
class="ui-helper-clearfix"></div>'
- + '<div id="mwe-upwiz-deeds"
class="ui-helper-clearfix"></div>'
- + '<div id="mwe-upwiz-deeds-custom"
class="ui-helper-clearfix"></div>'
- + '<div class="mwe-upwiz-buttons"/>'
- + '<button class="mwe-upwiz-button-next" />'
- + '</div>'
- + '</div>'
-
- + '<div class="mwe-upwiz-stepdiv"
id="mwe-upwiz-stepdiv-details">'
- + '<div id="mwe-upwiz-macro">'
- + '<div id="mwe-upwiz-macro-progress"
class="ui-helper-clearfix"></div>'
- + '<div id="mwe-upwiz-macro-choice">'
- + '<div>' + gM( 'mwe-upwiz-details-intro' ) +
'</div>'
- + '</div>'
- + '<div id="mwe-upwiz-macro-files"></div>'
- + '</div>'
- + '<div class="mwe-upwiz-buttons"/>'
- + '<button class="mwe-upwiz-button-next" />'
- + '</div>'
- + '</div>'
-
- + '<div class="mwe-upwiz-stepdiv"
id="mwe-upwiz-stepdiv-thanks">'
- + '<div id="mwe-upwiz-thanks"></div>'
- + '<div class="mwe-upwiz-buttons"/>'
- + '<button
class="mwe-upwiz-button-begin"></button>'
- + '<br/><button
class="mwe-upwiz-button-home"></button>'
- + '</div>'
- + '</div>'
-
- + '</div>'
-
- + '<div class="mwe-upwiz-clearing"></div>';
-
- this.setTutorialImage( $j( '#mwe-upwiz-tutorial' ) );
$j( '#mwe-upwiz-steps' )
.addClass( 'ui-helper-clearfix ui-state-default
ui-widget ui-helper-reset ui-helper-clearfix' )
.arrowSteps();
@@ -1691,57 +1618,6 @@
},
/**
- * Using the API, fetch the appropriate HTML for the licensing
tutorial, and append it to $element
- * @param {jQuery} jQuery instance initialized with selector
- */
- setTutorialImage: function( $el ) {
- var title = new mw.Title( 'WikimediaCommonsUploadTutorial-' +
mw.UploadWizard.config.userLanguage + '.png', 'file' );
- var params = {
- 'prop': 'imageinfo',
- 'titles': title.toString(),
- 'iiurlwidth': '722', // determined to be the correct
size for the tutorial, such that body text is the similar in size to our normal
HTML text
- 'iiprop': 'url|size'
- };
- var tutorialError = function( code, result ) {
- $el.append(
- $j( '<p/>' ).append( gM(
'mwe-upwiz-tutorial-error' ) ),
- /* make it hidden or grey or small something...
*/
- $j( '<p/>' ).append( gM(
'mwe-upwiz-api-error-code', code ) )
- );
- };
- var tutorialOk = function( data ) {
- if ( !data || !data.query || !data.query.pages ) {
- return;
- }
- var thumbnail;
- $j.each( data.query.pages, function( id, page ) {
- if ( page.imageinfo && page.imageinfo.length ) {
- var imageinfo = page.imageinfo[0];
- if ( imageinfo.thumburl &&
imageinfo.thumbwidth && imageinfo.thumbheight ) {
- thumbnail = page.imageinfo[0];
- return false;
- }
- }
- } );
- if ( ! mw.isDefined( thumbnail ) ) {
- tutorialError( data );
- } else {
- $el.append(
- $j( '<img/>' ).attr( {
- 'src': thumbnail.thumburl,
- 'width': thumbnail.thumbwidth,
- 'height': thumbnail.thumbheight
- } )
- );
- }
- };
-
- //var commonsApi = new mw.Api( { 'url':
'http://commons.wikimedia.org/w/api.php' } );
- this.api.get( params, { ok: tutorialOk, err: tutorialError } );
- },
-
-
- /**
* Advance one "step" in the wizard interface.
* It is assumed that the previous step to the current one was selected.
* We do not hide the tabs because this messes up certain calculations
we'd like to make about dimensions, while elements are not
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
