http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97369
Revision: 97369
Author: neilk
Date: 2011-09-17 04:56:49 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
reverted r96988
Modified Paths:
--------------
trunk/extensions/UploadWizard/UploadWizard.config.php
trunk/extensions/UploadWizard/UploadWizard.i18n.php
trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
trunk/extensions/UploadWizard/includes/specials/SpecialUploadCampaign.php
trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
trunk/extensions/UploadWizard/resources/mw.UploadWizardDeed.js
trunk/extensions/UploadWizard/resources/mw.UploadWizardLicenseInput.js
Modified: trunk/extensions/UploadWizard/UploadWizard.config.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizard.config.php 2011-09-17
04:51:48 UTC (rev 97368)
+++ trunk/extensions/UploadWizard/UploadWizard.config.php 2011-09-17
04:56:49 UTC (rev 97369)
@@ -68,13 +68,6 @@
// The maximum length of the id field.
'idFieldMaxLength' => 25,
- // Wikitext for a custom own-work license.
- // Leave empty for no such license.
- 'wikitextLicense' => '',
-
- // Templates to add when choosing the custom in wikitext defined
license.
- 'wikitextLicenseTemplates' => array(),
-
// 'licenses' is a list of licenses you could possibly use elsewhere,
for instance in
// licensesOwnWork or licensesThirdParty.
// It just describes what licenses go with what wikitext, and how to
display them in
Modified: trunk/extensions/UploadWizard/UploadWizard.i18n.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizard.i18n.php 2011-09-17 04:51:48 UTC
(rev 97368)
+++ trunk/extensions/UploadWizard/UploadWizard.i18n.php 2011-09-17 04:56:49 UTC
(rev 97369)
@@ -322,7 +322,6 @@
'uploadcampaign-text' => 'You are modifying an Upload Wizard campaign.',
'mwe-upwiz-campaign-name' => 'Campaign name:',
'mwe-upwiz-campaign-enabled' => 'Campaign enabled',
- 'mwe-upwiz-campaign-customLicense' => 'Custom license',
'mwe-upwiz-campaign-conf-skipTutorial' => 'Skip the licensing tutorial',
'mwe-upwiz-campaign-conf-autoCategories' => 'Categories to add the
files to automatically and silently (pipe separated):',
'mwe-upwiz-campaign-conf-defaultCategories' => 'Default categories to
list in the describe tab (pipe separated):',
@@ -342,8 +341,6 @@
'mwe-upwiz-campaign-conf-headerLabelPage' => 'Page containing text to
display above the UploadWizard interface. $1 is replaced with the language
code:',
'mwe-upwiz-campaign-conf-thanksLabelPage' => 'Page containing text to
display on top of the "Use" page. $1 is replaced with the language code:',
'mwe-upwiz-campaign-conf-idFieldMaxLength' => 'Maximum length of the
text in the ID field',
- 'mwe-upwiz-campaign-conf-wikitextLicense' => 'Wikitext for a custom
own-work license. Empty for no such custom license. $1 is replaced with the
language code:',
- 'mwe-upwiz-campaign-conf-wikitextLicenseTemplates' => 'Templates to add
when the user chooses the custom license (pipe separated):',
// Coolcats
'mw-coolcats-confirm-new-title' => 'Confirm new category',
Modified: trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
===================================================================
--- trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
2011-09-17 04:51:48 UTC (rev 97368)
+++ trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
2011-09-17 04:56:49 UTC (rev 97369)
@@ -198,12 +198,6 @@
'options' => array(),
'default' =>
$globalConfig['licensesOwnWork']['defaults'][0]
),
- 'wikitextLicense' => array(
- 'type' => 'text'
- ),
- 'wikitextLicenseTemplates' => array(
- 'type' => 'text'
- ),
'defaultCategories' => array(
'type' => 'text'
),
@@ -219,6 +213,13 @@
),
);
+ foreach ( $globalConfig['licensesOwnWork']['licenses'] as
$license ) {
+ $licenceMsg = wfMsg(
$globalConfig['licenses'][$license]['msg'] );
+ $config['licensesOwnWork']['options'][$licenceMsg] =
$license;
+ }
+
+ $config['defaultOwnWorkLicence']['options'] =
$config['licensesOwnWork']['options'];
+
return $config;
}
Modified:
trunk/extensions/UploadWizard/includes/specials/SpecialUploadCampaign.php
===================================================================
--- trunk/extensions/UploadWizard/includes/specials/SpecialUploadCampaign.php
2011-09-17 04:51:48 UTC (rev 97368)
+++ trunk/extensions/UploadWizard/includes/specials/SpecialUploadCampaign.php
2011-09-17 04:56:49 UTC (rev 97369)
@@ -94,12 +94,7 @@
// show _ALL_ the licenses!
$standardConfig = UploadWizardConfig::getConfig();
- $licences = array_merge(
- $standardConfig['licenses'],
- array( 'wikitextLicense' => array( 'msg' =>
'mwe-upwiz-campaign-customLicense' ) )
- );
-
- foreach ( $licences as $key => $license ) {
+ foreach ( $standardConfig['licenses'] as $key => $license ) {
$configFields['licensesOwnWork']['options'][ wfMsg(
$license['msg'] ) ] = $key;
$configFields['defaultOwnWorkLicence']['options'][
wfMsg( $license['msg'] ) ] = $key;
}
Modified:
trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
===================================================================
--- trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
2011-09-17 04:51:48 UTC (rev 97368)
+++ trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
2011-09-17 04:56:49 UTC (rev 97369)
@@ -168,15 +168,6 @@
$config['thanksLabel'] = $this->getPageContent(
$config['thanksLabelPage'], true );
- if ( in_array( 'wikitextLicense',
$config['licensesOwnWork']['licenses'] ) ) {
- $config['wikitextLicense'] = str_replace( '$1',
$this->getLang()->getCode(), $config['wikitextLicense'] );
-
- $config['licenses']['wikitextLicense'] = array(
- 'html' => $this->getOutput()->parse(
$config['wikitextLicense'], false ),
- 'templates' =>
$config['wikitextLicenseTemplates'],
- );
- }
-
$this->getOutput()->addScript(
Skin::makeVariablesScript(
array(
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizardDeed.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizardDeed.js
2011-09-17 04:51:48 UTC (rev 97368)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizardDeed.js
2011-09-17 04:56:49 UTC (rev 97369)
@@ -55,14 +55,16 @@
.attr( { name: "author" } )
.addClass( 'mwe-upwiz-sign' );
- _this.showCustomDiv =
mw.UploadWizard.config.licensesOwnWork.licenses.length > 1;
+ var ownWork = mw.UploadWizard.config.licensesOwnWork;
+ var licenseIsNotDefault = ( ownWork.licenses.length === 1 &&
ownWork.licenses[0] !== ownWork.defaults[0] );
+ _this.showCustomDiv = ownWork.licenses.length > 1 ||
licenseIsNotDefault;
if ( _this.showCustomDiv ) {
var licenseInputDiv = $j( '<div
class="mwe-upwiz-deed-license"></div>' );
_this.licenseInput = new mw.UploadWizardLicenseInput(
licenseInputDiv,
- undefined,
+ undefined,
mw.UploadWizard.config.licensesOwnWork,
_this.uploadCount
);
@@ -89,9 +91,8 @@
return this.licenseInput.getWikiText();
}
else {
- var defLicensename =
mw.UploadWizard.config.licensesOwnWork.defaults[0];
return '{{' +
mw.UploadWizard.config.licensesOwnWork.filterTemplate
- + '|' +
mw.UploadWizard.config.licenses[defLicensename]['templates'].join( '' ) + '}}';
+ + '|' +
mw.UploadWizard.config.licensesOwnWork.defaults[0] + '}}';
}
},
@@ -118,29 +119,15 @@
_this.$form = $j( '<form />' );
_this.$authorInput2 = $j( '<input type="text" />'
).attr( { name: "author2" } ).addClass( 'mwe-upwiz-sign' );
-
- var $assertNote = $j( '<p class="mwe-small-print"></p>'
);
-
- var defLicense =
mw.UploadWizard.config.licensesOwnWork.defaults[0];
- defLicense =
mw.UploadWizard.config.licenses[defLicense];
-
- if ( mw.isDefined( defLicense.html ) ) {
- $assertNote.text( gM(
'mwe-upwiz-source-ownwork-assert-note', '' ) )
- .append( defLicense.html )
- }
- else {
- $assertNote.msg(
- 'mwe-upwiz-source-ownwork-assert-note',
- gM( defLicense.msg )
- )
- }
-
var $standardDiv = $j( '<div />' ).append(
$j( '<label for="author2" generated="true"
class="mwe-validator-error" style="display:block;" />' ),
$j( '<p></p>' ).msg(
'mwe-upwiz-source-ownwork-assert',
uploadCount,
_this.$authorInput2 ),
- $assertNote
+ $j( '<p class="mwe-small-print"></p>' ).msg(
+ 'mwe-upwiz-source-ownwork-assert-note',
+ gM( 'mwe-upwiz-license-' +
mw.UploadWizard.config.licensesOwnWork.defaults[0] )
+ )
);
var $crossfader = $j( '<div />' ).append( $standardDiv
);
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizardLicenseInput.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizardLicenseInput.js
2011-09-17 04:51:48 UTC (rev 97368)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizardLicenseInput.js
2011-09-17 04:56:49 UTC (rev 97369)
@@ -83,28 +83,16 @@
$input.data( 'licenseName', name );
_this.inputs.push( $input );
+ var messageKey = mw.isDefined(
license.props['msg'] ) ? license.props.msg : '[missing msg for ' + license.name
+ ']';
var $icons = $j( '<span></span>' );
if ( mw.isDefined( license.props['icons'] ) ) {
$j.each( license.props.icons, function(
i, icon ) {
$icons.append( $j(
'<span></span>' ).addClass( 'mwe-upwiz-license-icon mwe-upwiz-' + icon +
'-icon' ) );
} );
}
-
- var $label = $j( '<label />' ).attr( { 'for':
id } ).append( $icons );
-
- if ( mw.isDefined( license.props['html'] ) ) {
- $label.html( license.props['html'] );
- }
- else if ( mw.isDefined( license.props['msg'] )
) {
- $label.msg( license.props['msg'],
_this.count );
- }
- else {
- $label.text( '[missing msg for ' +
license.name + ']' );
- }
-
$el.append(
$input,
- $label,
+ $j( '<label />' ).attr( { 'for': id }
).msg( messageKey, _this.count ).append( $icons ),
$j( '<br/>' )
// XXX help?
);
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
