| Index: trunk/extensions/Configure/Configure.page.php |
| — | — | @@ -295,7 +295,7 @@ |
| 296 | 296 | if ( !$this->mRequireWebConf ) |
| 297 | 297 | return true; |
| 298 | 298 | |
| 299 | | - global $wgConf, $wgOut, $wgRequest; |
| | 299 | + global $wgConf, $wgOut, $wgRequest, $wgLang; |
| 300 | 300 | |
| 301 | 301 | if ( $version = $wgRequest->getVal( 'version' ) ) { |
| 302 | 302 | $versions = $wgConf->listArchiveVersions(); |
| — | — | @@ -315,7 +315,7 @@ |
| 316 | 316 | $this->conf[$name] += $current[$name]; |
| 317 | 317 | } |
| 318 | 318 | } |
| 319 | | - $wgOut->addWikiMsg( 'configure-edit-old' ); |
| | 319 | + $wgOut->addWikiMsg( 'configure-edit-old', $wgLang->timeAndDate( $version ) ); |
| 320 | 320 | } else { |
| 321 | 321 | $wgOut->addWikiText( '<div class="errorbox">$1</div>', |
| 322 | 322 | array( 'configure-old-not-available', $version ) ); |
| — | — | @@ -913,12 +913,12 @@ |
| 914 | 914 | $text .= '<tr><td>'; |
| 915 | 915 | $text .= Xml::element( 'input', array( |
| 916 | 916 | 'name' => 'wp' . $conf . "-key-0", |
| 917 | | - 'type' => 'text', 'value' => '', 'size' => 45, |
| | 917 | + 'type' => 'text', 'value' => '', 'size' => 20, |
| 918 | 918 | ) ) . "<br/>\n"; |
| 919 | 919 | $text .= '</td><td>'; |
| 920 | 920 | $text .= Xml::element( 'input', array( |
| 921 | 921 | 'name' => 'wp' . $conf . "-val-0", |
| 922 | | - 'type' => 'text', 'value' => '', 'size' => 45, |
| | 922 | + 'type' => 'text', 'value' => '', 'size' => 20, |
| 923 | 923 | ) ) . "<br/>\n"; |
| 924 | 924 | $text .= '</td></tr>'; |
| 925 | 925 | } else { |
| — | — | @@ -987,7 +987,7 @@ |
| 988 | 988 | $text .= '<tr><td>' . $name . '</td><td>'; |
| 989 | 989 | if ( $allowed ) |
| 990 | 990 | $text .= Xml::element( 'input', array( |
| 991 | | - 'size' => 45, |
| | 991 | + 'size' => 20, |
| 992 | 992 | 'name' => "wp{$conf}-ns{$ns}", |
| 993 | 993 | 'type' => 'text', 'value' => isset( $default[$ns] ) ? $default[$ns] : '' |
| 994 | 994 | ) ) . "\n"; |
| Index: trunk/extensions/Configure/Configure.settings.i18n.php |
| — | — | @@ -99,7 +99,7 @@ |
| 100 | 100 | 'configure-setting-wgExtraLanguageNames-key' => "Language code", |
| 101 | 101 | 'configure-setting-wgExtraLanguageNames-value' => "Name", |
| 102 | 102 | 'configure-setting-wgExtraRandompageSQL' => "Filter for Special:Random (in a WHERE clause)", |
| 103 | | - 'configure-setting-wgExtraSubtitle' => "The subtitle of a page appears under every page title", |
| | 103 | + 'configure-setting-wgExtraSubtitle' => "Subtitle (appears under every page title)", |
| 104 | 104 | 'configure-setting-wgHideInterlanguageLinks' => "Hide interlanguage links from the sidebar", |
| 105 | 105 | 'configure-setting-wgLegalTitleChars' => "Characters permitted in page titles (regex character class)", |
| 106 | 106 | 'configure-setting-wgMaxArticleSize' => "Maximum page size (kB)", |
| Index: trunk/extensions/Configure/CHANGELOG |
| — | — | @@ -7,6 +7,7 @@ |
| 8 | 8 | * Introduced explicit whitelisting of settings, rather than blacklisting |
| 9 | 9 | of other settings. |
| 10 | 10 | * Some usability cleanup. |
| | 11 | + * Fixed javascript bug with 'Delete this entry' buttons in previous version. |
| 11 | 12 | |
| 12 | 13 | 0.10.7 - 25 November 2008 |
| 13 | 14 | * Added diff links for the versions at the top of Special:Configure and |
| Index: trunk/extensions/Configure/Configure.i18n.php |
| — | — | @@ -33,7 +33,7 @@ |
| 34 | 34 | 'configure-db-table-error' => 'The database you specified does not have the required tables. Please apply configure.sql in that database.', |
| 35 | 35 | 'configure-directory-not-writable' => 'The directory used to store the settings, <tt>$1</tt>, is not writable. |
| 36 | 36 | Please make it writable by PHP to use this extension.', |
| 37 | | - 'configure-edit-old' => "'''Warning''': you are editing an <strong>old</strong> version of the configuration.", |
| | 37 | + 'configure-edit-old' => "'''Warning''': you are editing an <strong>old</strong> version of the configuration (as at $1).", |
| 38 | 38 | 'configure-compare' => "Below are the changes between the revisions as at $1 and $2", |
| 39 | 39 | 'configure-error' => 'The configuration could not be saved', |
| 40 | 40 | 'configure-js-add' => 'Add a new entry', |
| Index: trunk/extensions/Configure/Configure.js |
| — | — | @@ -167,6 +167,7 @@ |
| 168 | 168 | button.value = wgConfigureGetImageUrl; |
| 169 | 169 | button.onclick = createImageUrlCallback( textbox ); |
| 170 | 170 | |
| | 171 | + textbox.parentNode.appendChild( document.createTextNode( '\u00A0' ) ); |
| 171 | 172 | textbox.parentNode.appendChild( button ); |
| 172 | 173 | } |
| 173 | 174 | |
| Index: trunk/extensions/Configure/Configure.settings-core.php |
| — | — | @@ -12,12 +12,52 @@ |
| 13 | 13 | * http://www.mediawiki.org/wiki/Manual:Configuration_settings |
| 14 | 14 | */ |
| 15 | 15 | $settings = array( |
| 16 | | - 'popular' => array( |
| 17 | | - 'general' => array( |
| | 16 | + 'site' => array( |
| | 17 | + 'site' => array( |
| 18 | 18 | 'wgSitename' => 'text', |
| 19 | | - 'wgVersion' => 'text', |
| 20 | 19 | 'wgLogo' => 'image-url', |
| | 20 | + 'wgArticleRobotPolicies' => 'array', |
| | 21 | + 'wgBreakFrames' => 'bool', |
| | 22 | + 'wgCapitalLinks' => 'bool', |
| | 23 | + 'wgDefaultLanguageVariant' => 'text', |
| | 24 | + 'wgDefaultRobotPolicy' => 'text', |
| | 25 | + 'wgExemptFromUserRobotsControl' => 'array', |
| | 26 | + 'wgExtraLanguageNames' => 'array', |
| | 27 | + 'wgExtraRandompageSQL' => 'text', |
| | 28 | + 'wgExtraSubtitle' => 'text', |
| | 29 | + 'wgHideInterlanguageLinks' => 'bool', |
| | 30 | + 'wgLegalTitleChars' => 'text', |
| | 31 | + 'wgMaxArticleSize' => 'int', |
| | 32 | + 'wgMetadataWhitelist' => 'text', |
| | 33 | + 'wgNoFollowLinks' => 'bool', |
| | 34 | + 'wgPageShowWatchingUsers' => 'bool', |
| | 35 | + 'wgRestrictionLevels' => 'array', |
| | 36 | + 'wgSiteNotice' => 'text', |
| | 37 | + 'wgSiteSupportPage' => 'text', |
| | 38 | + 'wgStyleVersion' => 'int', |
| | 39 | + 'wgUniversalEditButton' => 'bool', |
| | 40 | + 'wgUrlProtocols' => 'array', |
| | 41 | + 'wgUseExternalEditor' => 'bool', |
| | 42 | + 'wgUseMetadataEdit' => 'bool', |
| 21 | 43 | ), |
| | 44 | + 'ajax' => array( |
| | 45 | + 'wgUseAjax' => 'bool', |
| | 46 | + 'wgAjaxExportList' => 'array', |
| | 47 | + 'wgAjaxSearch' => 'bool', |
| | 48 | + 'wgAjaxUploadDestCheck' => 'bool', |
| | 49 | + 'wgAjaxWatch' => 'bool', |
| | 50 | + 'wgLivePreview' => 'bool', |
| | 51 | + ), |
| | 52 | + 'css-js' => array( |
| | 53 | + 'wgAllowUserCss' => 'bool', |
| | 54 | + 'wgAllowUserJs' => 'bool', |
| | 55 | + 'wgUseSiteCss' => 'bool', |
| | 56 | + 'wgUseSiteJs' => 'bool', |
| | 57 | + 'wgHandheldStyle' => 'text', |
| | 58 | + 'wgHandheldForIPhone' => 'bool', |
| | 59 | + ), |
| | 60 | + ), |
| | 61 | + 'namespaces' => array( |
| 22 | 62 | 'namespaces' => array( |
| 23 | 63 | 'wgContentNamespaces' => 'array', |
| 24 | 64 | 'wgExtraNamespaces' => 'array', |
| — | — | @@ -33,6 +73,8 @@ |
| 34 | 74 | 'wgNonincludableNamespaces' => 'array', |
| 35 | 75 | 'wgSitemapNamespaces' => 'array', |
| 36 | 76 | ), |
| | 77 | + ), |
| | 78 | + 'groups' => array( |
| 37 | 79 | 'groups' => array( |
| 38 | 80 | 'wgAutopromote' => 'array', |
| 39 | 81 | 'wgGroupPermissions' => 'array', |
| — | — | @@ -207,49 +249,6 @@ |
| 208 | 250 | 'wgUDPProfilerPort' => 'int', |
| 209 | 251 | ), |
| 210 | 252 | ), |
| 211 | | - 'site' => array( |
| 212 | | - 'site' => array( |
| 213 | | - 'wgArticleRobotPolicies' => 'array', |
| 214 | | - 'wgBreakFrames' => 'bool', |
| 215 | | - 'wgCapitalLinks' => 'bool', |
| 216 | | - 'wgDefaultLanguageVariant' => 'text', |
| 217 | | - 'wgDefaultRobotPolicy' => 'text', |
| 218 | | - 'wgExemptFromUserRobotsControl' => 'array', |
| 219 | | - 'wgExtraLanguageNames' => 'array', |
| 220 | | - 'wgExtraRandompageSQL' => 'text', |
| 221 | | - 'wgExtraSubtitle' => 'text', |
| 222 | | - 'wgHideInterlanguageLinks' => 'bool', |
| 223 | | - 'wgLegalTitleChars' => 'text', |
| 224 | | - 'wgMaxArticleSize' => 'int', |
| 225 | | - 'wgMetadataWhitelist' => 'text', |
| 226 | | - 'wgNoFollowLinks' => 'bool', |
| 227 | | - 'wgPageShowWatchingUsers' => 'bool', |
| 228 | | - 'wgRestrictionLevels' => 'array', |
| 229 | | - 'wgSiteNotice' => 'text', |
| 230 | | - 'wgSiteSupportPage' => 'text', |
| 231 | | - 'wgStyleVersion' => 'int', |
| 232 | | - 'wgUniversalEditButton' => 'bool', |
| 233 | | - 'wgUrlProtocols' => 'array', |
| 234 | | - 'wgUseExternalEditor' => 'bool', |
| 235 | | - 'wgUseMetadataEdit' => 'bool', |
| 236 | | - ), |
| 237 | | - 'ajax' => array( |
| 238 | | - 'wgUseAjax' => 'bool', |
| 239 | | - 'wgAjaxExportList' => 'array', |
| 240 | | - 'wgAjaxSearch' => 'bool', |
| 241 | | - 'wgAjaxUploadDestCheck' => 'bool', |
| 242 | | - 'wgAjaxWatch' => 'bool', |
| 243 | | - 'wgLivePreview' => 'bool', |
| 244 | | - ), |
| 245 | | - 'css-js' => array( |
| 246 | | - 'wgAllowUserCss' => 'bool', |
| 247 | | - 'wgAllowUserJs' => 'bool', |
| 248 | | - 'wgUseSiteCss' => 'bool', |
| 249 | | - 'wgUseSiteJs' => 'bool', |
| 250 | | - 'wgHandheldStyle' => 'text', |
| 251 | | - 'wgHandheldForIPhone' => 'bool', |
| 252 | | - ), |
| 253 | | - ), |
| 254 | 253 | 'stats' => array( |
| 255 | 254 | 'stats' => array( |
| 256 | 255 | 'wgCountCategorizedImagesAsUsed' => 'bool', |