Index: trunk/phase3/skins/common/config.js |
— | — | @@ -47,14 +47,18 @@ |
48 | 48 | $wrapper.show( 'slow' ); |
49 | 49 | } |
50 | 50 | } ); |
51 | | - |
| 51 | + |
| 52 | + // Hide "other" textboxes by default |
| 53 | + // Should not be done in CSS for javascript disabled compatibility |
| 54 | + $( '.enabledByOther' ).closest( '.config-block' ).hide(); |
| 55 | + |
52 | 56 | // Enable/disable "other" textboxes |
53 | 57 | $( '.enableForOther' ).click( function() { |
54 | 58 | var $textbox = $( '#' + $(this).attr( 'rel' ) ); |
55 | 59 | if ( $(this).val() == 'other' ) { // FIXME: Ugh, this is ugly |
56 | | - $textbox.removeAttr( 'disabled' ); |
| 60 | + $textbox.removeAttr( 'readonly' ).closest( '.config-block' ).slideDown( 'fast' ); |
57 | 61 | } else { |
58 | | - $textbox.attr( 'disabled', 'disabled' ); |
| 62 | + $textbox.attr( 'readonly', 'readonly' ).closest( '.config-block' ).slideUp( 'fast' ); |
59 | 63 | } |
60 | 64 | } ); |
61 | 65 | |
Index: trunk/phase3/includes/installer/WebInstaller.php |
— | — | @@ -613,8 +613,8 @@ |
614 | 614 | array_shift( $args ); |
615 | 615 | $args = array_map( 'htmlspecialchars', $args ); |
616 | 616 | $text = wfMsgReal( $msg, $args, false, false, false ); |
| 617 | + $html = htmlspecialchars( $text ); |
617 | 618 | //$html = $this->parse( $text, true ); |
618 | | - $html = $text; |
619 | 619 | return |
620 | 620 | "<span class=\"mw-help-field-hint\"\n" . |
621 | 621 | " title=\"" . $html . "\"\n" . |
Index: trunk/phase3/includes/installer/WebInstallerPage.php |
— | — | @@ -478,8 +478,8 @@ |
479 | 479 | ) ) . |
480 | 480 | $this->parent->getTextBox( array( |
481 | 481 | 'var' => 'wgMetaNamespace', |
482 | | - 'label' => '', |
483 | | - 'attribs' => array( 'disabled' => '' ), |
| 482 | + 'label' => '', //TODO: Needs a label? |
| 483 | + 'attribs' => array( 'readonly' => 'readonly', 'class' => 'enabledByOther' ), |
484 | 484 | |
485 | 485 | ) ) . |
486 | 486 | $this->getFieldSetStart( 'config-admin-box' ) . |