| Index: trunk/extensions/UploadWizard/UploadWizard.config.php |
| — | — | @@ -15,12 +15,15 @@ |
| 16 | 16 | // The default api url is for the current wiki ( can override at run time ) |
| 17 | 17 | 'apiUrl' => $wgServer . $wgScriptPath . '/api.php', |
| 18 | 18 | |
| 19 | | - // Categories to automatically add all uploaded images into. |
| | 19 | + // Categories to automatically (and silently) add all uploaded images into. |
| 20 | 20 | 'autoCategories' => array(), |
| 21 | 21 | |
| 22 | 22 | // Deprecated: use autoCategories |
| 23 | 23 | 'autoCategory' => '', |
| 24 | 24 | |
| | 25 | + // Categories to list by default in the list of cats to add. |
| | 26 | + 'defaultCategories' => array( 'Foobar', 'Locations' ), |
| | 27 | + |
| 25 | 28 | // 'licenses' is a list of licenses you could possibly use elsewhere, for instance in |
| 26 | 29 | // licensesOwnWork or licensesThirdParty. |
| 27 | 30 | // It just describes what licenses go with what wikitext, and how to display them in |
| Index: trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php |
| — | — | @@ -153,6 +153,7 @@ |
| 154 | 154 | return array( |
| 155 | 155 | 'skipTutorial' => 'check', |
| 156 | 156 | 'autoCategories' => 'text', |
| | 157 | + 'defaultCategories' => 'text', |
| 157 | 158 | ); |
| 158 | 159 | } |
| 159 | 160 | |
| Index: trunk/extensions/UploadWizard/UploadWizard.i18n.php |
| — | — | @@ -299,7 +299,8 @@ |
| 300 | 300 | 'mwe-upwiz-campaign-name' => 'Campaign name', |
| 301 | 301 | 'mwe-upwiz-campaign-enabled' => 'Campaign enabled', |
| 302 | 302 | 'mwe-upwiz-campaign-conf-skipTutorial' => 'Skip the licensing tutorial', |
| 303 | | - 'mwe-upwiz-campaign-conf-autoCategories' => 'Categories to add the images to automatically', |
| | 303 | + 'mwe-upwiz-campaign-conf-autoCategories' => 'Categories to add the files to automatically and silently', |
| | 304 | + 'mwe-upwiz-campaign-conf-defaultCategories' => 'Default categories to list in the describe tab', |
| 304 | 305 | |
| 305 | 306 | // Coolcats |
| 306 | 307 | 'mw-coolcats-confirm-new-title' => 'Confirm new category', |
| Index: trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js |
| — | — | @@ -275,7 +275,8 @@ |
| 276 | 276 | .mwCoolCats( { |
| 277 | 277 | api: _this.upload.api, |
| 278 | 278 | hiddenCats: hiddenCats, |
| 279 | | - buttontext: gM( 'mwe-upwiz-categories-add' ) |
| | 279 | + buttontext: gM( 'mwe-upwiz-categories-add' ) , |
| | 280 | + cats: mw.isDefined( mw.UploadWizard.config.defaultCategories ) ? mw.UploadWizard.config.defaultCategories : [] |
| 280 | 281 | } ); |
| 281 | 282 | |
| 282 | 283 | }; |