r93395 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r93394‎ | r93395 | r93396 >
Date:15:44, 28 July 2011
Author:jeroendedauw
Status:ok (Comments)
Tags:lamecommitsummary 
Comment:
fu r93392; made new config appear in campaign admin ui
Modified paths:
  • /trunk/extensions/UploadWizard/UploadWizard.i18n.php (modified) (history)
  • /trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php (modified) (history)

Diff [purge]

Index: trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
@@ -150,19 +150,20 @@
151151 * @return array
152152 */
153153 public static function getConfigTypes() {
 154+ $globalConfig = UploadWizardConfig::getConfig();
 155+
154156 $config = array(
155157 'skipTutorial' => array(
156158 'type' => 'check'
157159 ),
158 - 'autoCategories' => array(
159 - 'type' => 'text'
 160+ 'tutorialTemplate' => array(
 161+ 'type' => 'text',
160162 ),
161 - 'defaultCategories' => array(
162 - 'type' => 'text'
 163+ 'tutorialWidth' => array(
 164+ 'type' => 'int',
163165 ),
164 - 'autoWikiText' => array(
165 - 'type' => 'textarea',
166 - 'rows' => 4
 166+ 'tutorialHelpdeskCoords' => array(
 167+ 'type' => 'text',
167168 ),
168169 'ownWorkOption' => array(
169170 'type' => 'radio',
@@ -172,16 +173,23 @@
173174 wfMsg( 'mwe-upwiz-campaign-owner-notown' ) => 'notown'
174175 )
175176 ),
 177+ 'licensesOwnWork' => array(
 178+ 'type' => 'multiselect',
 179+ 'options' => array(),
 180+ 'default' => $globalConfig['licensesOwnWork']['licenses']
 181+ ),
 182+ 'defaultCategories' => array(
 183+ 'type' => 'text'
 184+ ),
 185+ 'autoCategories' => array(
 186+ 'type' => 'text'
 187+ ),
 188+ 'autoWikiText' => array(
 189+ 'type' => 'textarea',
 190+ 'rows' => 4
 191+ ),
176192 );
177193
178 - $globalConfig = UploadWizardConfig::getConfig();
179 -
180 - $config['licensesOwnWork'] = array(
181 - 'type' => 'multiselect',
182 - 'options' => array(),
183 - 'default' => $globalConfig['licensesOwnWork']['licenses']
184 - );
185 -
186194 foreach ( $globalConfig['licensesOwnWork']['licenses'] as $license ) {
187195 $licenceMsg = wfMsg( $globalConfig['licenses'][$license]['msg'] );
188196 $config['licensesOwnWork']['options'][$licenceMsg] = $license;
Index: trunk/extensions/UploadWizard/UploadWizard.i18n.php
@@ -307,6 +307,10 @@
308308 'mwe-upwiz-campaign-owner-own' => 'Only allow for own work uploads',
309309 'mwe-upwiz-campaign-owner-notown' => 'Only allow for non-own work uploads',
310310 'mwe-upwiz-campaign-conf-licensesOwnWork' => 'The licences that should be choosable for own-work',
 311+ 'mwe-upwiz-campaign-conf-tutorialTemplate' => 'Name of the tutorial on Wikimedia Commons. The $1 is replaced with the language',
 312+ 'mwe-upwiz-campaign-conf-tutorialWidth' => 'The width to scale the tutorial to',
 313+ 'mwe-upwiz-campaign-conf-tutorialHelpdeskCoords' => 'Imagemap coordinates of the tutorial "helpdesk" button',
 314+
311315
312316 // Coolcats
313317 'mw-coolcats-confirm-new-title' => 'Confirm new category',

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r93392made tutorial template, tutorial with and tutorial image map configurable per...jeroendedauw15:34, 28 July 2011

Comments

#Comment by NeilK (talk | contribs)   13:19, 22 August 2011

it would be nice to explain what you mean by 'multiselect'. I used 'and' and 'or', which at least in my mind map to the functional characteristics desired. But I think I know what you are trying to say.

Status & tagging log