| Index: trunk/phase3/skins/monobook/main.css |
| — | — | @@ -966,6 +966,13 @@ |
| 967 | 967 | height: 1%; |
| 968 | 968 | } |
| 969 | 969 | |
| | 970 | +.mw-htmlform-submit { |
| | 971 | + font-weight: bold; |
| | 972 | + padding-left: .3em; |
| | 973 | + padding-right: .3em; |
| | 974 | + margin-right: 2em; |
| | 975 | +} |
| | 976 | + |
| 970 | 977 | /* js pref toc */ |
| 971 | 978 | #preftoc { |
| 972 | 979 | margin: 0; |
| — | — | @@ -1027,11 +1034,7 @@ |
| 1028 | 1035 | padding: 0; |
| 1029 | 1036 | margin: 0; |
| 1030 | 1037 | } |
| 1031 | | -.prefsection fieldset { |
| 1032 | | - border: 1px solid #aaa; |
| 1033 | | - float: left; |
| 1034 | | - margin-right: 2em; |
| 1035 | | -} |
| | 1038 | + |
| 1036 | 1039 | .prefsection legend { |
| 1037 | 1040 | font-weight: bold; |
| 1038 | 1041 | } |
| — | — | @@ -1046,12 +1049,6 @@ |
| 1047 | 1050 | padding: .2em 2em; |
| 1048 | 1051 | color: #666; |
| 1049 | 1052 | } |
| 1050 | | -.mw-htmlform-submit { |
| 1051 | | - font-weight: bold; |
| 1052 | | - padding-left: .3em; |
| 1053 | | - padding-right: .3em; |
| 1054 | | - margin-right: 2em; |
| 1055 | | -} |
| 1056 | 1053 | |
| 1057 | 1054 | .preferences-login { |
| 1058 | 1055 | clear: both; |
| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -286,6 +286,8 @@ |
| 287 | 287 | |
| 288 | 288 | global $wgEnableEmail, $wgEnableUserEmail, $wgEmailAuthentication; |
| 289 | 289 | |
| | 290 | + $disableEmailPrefs = false; |
| | 291 | + |
| 290 | 292 | if ( $wgEmailAuthentication ) { |
| 291 | 293 | if ( $user->getEmail() ) { |
| 292 | 294 | if( $user->getEmailAuthenticationTimestamp() ) { |
| — | — | @@ -306,6 +308,7 @@ |
| 307 | 309 | wfMsg( 'emailconfirmlink' ) ) . '<br />'; |
| 308 | 310 | } |
| 309 | 311 | } else { |
| | 312 | + $disableEmailPrefs = true; |
| 310 | 313 | $emailauthenticated = wfMsg( 'noemailprefs' ); |
| 311 | 314 | } |
| 312 | 315 | |
| — | — | @@ -328,12 +331,14 @@ |
| 329 | 332 | 'invert' => true, |
| 330 | 333 | 'section' => 'personal/email', |
| 331 | 334 | 'label-message' => 'allowemail', |
| | 335 | + 'disabled' => $disableEmailPrefs, |
| 332 | 336 | ); |
| 333 | 337 | $defaultPreferences['ccmeonemails'] = |
| 334 | 338 | array( |
| 335 | 339 | 'type' => 'toggle', |
| 336 | 340 | 'section' => 'personal/email', |
| 337 | 341 | 'label-message' => 'tog-ccmeonemails', |
| | 342 | + 'disabled' => $disableEmailPrefs, |
| 338 | 343 | ); |
| 339 | 344 | } |
| 340 | 345 | |
| — | — | @@ -342,24 +347,28 @@ |
| 343 | 348 | 'type' => 'toggle', |
| 344 | 349 | 'section' => 'personal/email', |
| 345 | 350 | 'label-message' => 'tog-enotifwatchlistpages', |
| | 351 | + 'disabled' => $disableEmailPrefs, |
| 346 | 352 | ); |
| 347 | 353 | $defaultPreferences['enotifusertalkpages'] = |
| 348 | 354 | array( |
| 349 | 355 | 'type' => 'toggle', |
| 350 | 356 | 'section' => 'personal/email', |
| 351 | 357 | 'label-message' => 'tog-enotifusertalkpages', |
| | 358 | + 'disabled' => $disableEmailPrefs, |
| 352 | 359 | ); |
| 353 | 360 | $defaultPreferences['enotifminoredits'] = |
| 354 | 361 | array( |
| 355 | 362 | 'type' => 'toggle', |
| 356 | 363 | 'section' => 'personal/email', |
| 357 | 364 | 'label-message' => 'tog-enotifminoredits', |
| | 365 | + 'disabled' => $disableEmailPrefs, |
| 358 | 366 | ); |
| 359 | 367 | $defaultPreferences['enotifrevealaddr'] = |
| 360 | 368 | array( |
| 361 | 369 | 'type' => 'toggle', |
| 362 | 370 | 'section' => 'personal/email', |
| 363 | | - 'label-message' => 'tog-enotifrevealaddr' |
| | 371 | + 'label-message' => 'tog-enotifrevealaddr', |
| | 372 | + 'disabled' => $disableEmailPrefs, |
| 364 | 373 | ); |
| 365 | 374 | } |
| 366 | 375 | } |