https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113591
Revision: 113591
Author: jeroendedauw
Date: 2012-03-11 21:40:10 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
adderss bug 33341
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/SpecialUploadWizard.php
trunk/extensions/UploadWizard/resources/mw.UploadWizardDescription.js
trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
Modified: trunk/extensions/UploadWizard/UploadWizard.config.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizard.config.php 2012-03-11
21:14:13 UTC (rev 113590)
+++ trunk/extensions/UploadWizard/UploadWizard.config.php 2012-03-11
21:40:10 UTC (rev 113591)
@@ -78,6 +78,18 @@
// Initial value for the id field.
'idFieldInitialValue' => '',
+ // Initial value for the description field.
+ 'defaultDescription' => '',
+
+ // Initial value for the latitude field.
+ 'defaultLat' => '',
+
+ // Initial value for the longitude field.
+ 'defaultLon' => '',
+
+ // Initial value for the altitude field.
+ 'defaultAlt' => '',
+
// '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 2012-03-11 21:14:13 UTC
(rev 113590)
+++ trunk/extensions/UploadWizard/UploadWizard.i18n.php 2012-03-11 21:40:10 UTC
(rev 113591)
@@ -327,6 +327,10 @@
'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-defaultLat' => 'Default latitude',
+ 'mwe-upwiz-campaign-conf-defaultLon' => 'Default longitude',
+ 'mwe-upwiz-campaign-conf-defaultAlt' => 'Default altitude',
+ 'mwe-upwiz-campaign-conf-defaultDescription' => 'Default description',
// Coolcats
'mw-coolcats-confirm-new-title' => 'Confirm new category',
Modified: trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
===================================================================
--- trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
2012-03-11 21:14:13 UTC (rev 113590)
+++ trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
2012-03-11 21:40:10 UTC (rev 113591)
@@ -214,6 +214,18 @@
'thanksLabelPage' => array(
'type' => 'text'
),
+ 'defaultLat' => array(
+ 'type' => 'text'
+ ),
+ 'defaultLon' => array(
+ 'type' => 'text'
+ ),
+ 'defaultAlt' => array(
+ 'type' => 'text'
+ ),
+ 'defaultDescription' => array(
+ 'type' => 'text'
+ ),
);
foreach ( $globalConfig['licenses'] as $licenseName =>
$licenseDate ) {
Modified:
trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
===================================================================
--- trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
2012-03-11 21:14:13 UTC (rev 113590)
+++ trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
2012-03-11 21:40:10 UTC (rev 113591)
@@ -58,10 +58,24 @@
UploadWizardConfig::setUrlSetting( 'skipTutorial',
$skip );
}
- if ( $wgRequest->getCheck( 'id' ) ) {
- UploadWizardConfig::setUrlSetting(
'idFieldInitialValue', $wgRequest->getText( 'id' ) );
+ if ( $wgRequest->getCheck( 'categories' ) ) {
+ UploadWizardConfig::setUrlSetting( 'defaultCategories',
explode( '|', $wgRequest->getText( 'categories' ) ) );
}
-
+
+ $ulrArgs = array(
+ 'id' => 'idFieldInitialValue',
+ 'description' => 'defaultDescription',
+ 'lat' => 'defaultLat',
+ 'lon' => 'defaultLon',
+ 'alt' => 'defaultAlt',
+ );
+
+ foreach ( $ulrArgs as $arg => $setting ) {
+ if ( $wgRequest->getCheck( $arg ) ) {
+ UploadWizardConfig::setUrlSetting( $setting,
$wgRequest->getText( $arg ) );
+ }
+ }
+
$this->handleCampaign();
$out = $this->getOutput();
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizardDescription.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizardDescription.js
2012-03-11 21:14:13 UTC (rev 113590)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizardDescription.js
2012-03-11 21:40:10 UTC (rev 113591)
@@ -4,7 +4,7 @@
* @param languageCode -- string
* @param firstRequired -- boolean -- the first description is required and
should be validated and displayed a bit differently
*/
-mw.UploadWizardDescription = function( languageCode, required ) {
+mw.UploadWizardDescription = function( languageCode, required, initialValue ) {
var _this = this;
mw.UploadWizardDescription.prototype.count++;
_this.id = 'description' + mw.UploadWizardDescription.prototype.count;
@@ -37,6 +37,10 @@
.attr( 'title', gM(
'mwe-upwiz-tooltip-description' ) )
.growTextArea();
+ if ( initialValue !== undefined ) {
+ _this.input.val( initialValue );
+ }
+
// descriptions
_this.div = $j('<div class="mwe-upwiz-details-descriptions-container
ui-helper-clearfix"></div>' )
.append( errorLabelDiv, fieldnameDiv,
_this.languageMenu, _this.input );
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
2012-03-11 21:14:13 UTC (rev 113590)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
2012-03-11 21:40:10 UTC (rev 113591)
@@ -170,7 +170,11 @@
_this.latInput = $j( '<input type="text" id="' + latId + '" name="' +
latId + '" class="mwe-loc-lat" size="10"/>' );
_this.lonInput = $j( '<input type="text" id="' + lonId + '" name="' +
lonId + '" class="mwe-loc-lon" size="10"/>' );
_this.altInput = $j( '<input type="text" id="' + altId + '" name="' +
altId + '" class="mwe-loc-alt" size="10"/>' );
-
+
+ _this.latInput.val( mw.UploadWizard.config.defaultLat );
+ _this.lonInput.val( mw.UploadWizard.config.defaultLon );
+ _this.altInput.val( mw.UploadWizard.config.defaultAlt );
+
var latDiv = $j( '<div class="mwe-location-lat"></div>' )
.append( $j ( '<div class="mwe-location-lat-label"></div>'
).append( gM( 'mwe-upwiz-location-lat' ) ) )
.append( _this.latInput );
@@ -331,7 +335,13 @@
mw.UploadWizardUtil.makeToggler( moreDetailsCtrlDiv, moreDetailsDiv );
- _this.addDescription( !mw.UploadWizard.config.idField, mw.config.get(
'wgUserLanguage' ), false );
+ _this.addDescription(
+ !mw.UploadWizard.config.idField,
+ mw.config.get( 'wgUserLanguage' ),
+ false,
+ mw.UploadWizard.config.defaultDescription
+ );
+
$j( containerDiv ).append( _this.div );
if ( mw.config.get( 'UploadWizardConfig' ).useTitleBlacklistApi ) {
@@ -544,7 +554,7 @@
/**
* Add a new description
*/
- addDescription: function( required, languageCode, allowRemove ) {
+ addDescription: function( required, languageCode, allowRemove,
initialValue ) {
var _this = this;
if ( required === undefined ) {
required = false;
@@ -558,7 +568,7 @@
allowRemove = true;
}
- var description = new mw.UploadWizardDescription( languageCode,
required );
+ var description = new mw.UploadWizardDescription( languageCode,
required, initialValue );
if ( !required && allowRemove ) {
$j( description.div ).append(
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
