| Index: trunk/extensions/ExpandTemplates/ExpandTemplates_body.php |
| — | — | @@ -59,6 +59,7 @@ |
| 60 | 60 | private function makeForm( $title, $removeComments, $input ) { |
| 61 | 61 | $self = $this->getTitle(); |
| 62 | 62 | $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) ); |
| | 63 | + $form .= "<fieldset><legend>" . wfMsgHtml( 'expandtemplates' ) . "</legend>\n"; |
| 63 | 64 | $form .= '<p>' . Xml::inputLabel( wfMsgNoTrans( 'expand_templates_title' ), 'contexttitle', 'contexttitle', 60, $title ) . '</p>'; |
| 64 | 65 | $form .= '<p>' . Xml::label( wfMsg( 'expand_templates_input' ), 'input' ) . '</p>'; |
| 65 | 66 | $form .= Xml::openElement( 'textarea', array( 'name' => 'input', 'id' => 'input', 'rows' => 10, 'cols' => 10 ) ); |
| — | — | @@ -66,18 +67,19 @@ |
| 67 | 68 | $form .= Xml::closeElement( 'textarea' ); |
| 68 | 69 | $form .= '<p>' . Xml::checkLabel( wfMsg( 'expand_templates_remove_comments' ), 'removecomments', 'removecomments', $removeComments ) . '</p>'; |
| 69 | 70 | $form .= '<p>' . Xml::submitButton( wfMsg( 'expand_templates_ok' ) ) . '</p>'; |
| | 71 | + $form .= "</fieldset>\n"; |
| 70 | 72 | $form .= Xml::closeElement( 'form' ); |
| 71 | 73 | return $form; |
| 72 | 74 | } |
| 73 | 75 | |
| 74 | 76 | /** |
| 75 | | - * Generate a nice little box with a label for output |
| | 77 | + * Generate a nice little box with a heading for output |
| 76 | 78 | * |
| 77 | 79 | * @param $output Wiki text output |
| 78 | 80 | * @return string |
| 79 | 81 | */ |
| 80 | 82 | private function makeOutput( $output ) { |
| 81 | | - $out = '<p>' . Xml::label( wfMsg( 'expand_templates_output' ), 'output' ) . '</p>'; |
| | 83 | + $out = "<h2>" . wfMsgHtml( 'expand_templates_output' ) . "</h2>\n"; |
| 82 | 84 | $out .= Xml::openElement( 'textarea', array( 'id' => 'output', 'rows' => 10, 'cols' => 10, 'readonly' => 'readonly' ) ); |
| 83 | 85 | $out .= htmlspecialchars( $output ); |
| 84 | 86 | $out .= Xml::closeElement( 'textarea' ); |
| Index: trunk/extensions/ExpandTemplates/ExpandTemplates.i18n.php |
| — | — | @@ -16,7 +16,7 @@ |
| 17 | 17 | It does this by calling the relevant parser stage from MediaWiki itself.', |
| 18 | 18 | 'expand_templates_title' => 'Context title, for {{PAGENAME}} etc.:', |
| 19 | 19 | 'expand_templates_input' => 'Input text:', |
| 20 | | - 'expand_templates_output' => 'Result:', |
| | 20 | + 'expand_templates_output' => 'Result', |
| 21 | 21 | 'expand_templates_ok' => 'OK', |
| 22 | 22 | 'expand_templates_remove_comments' => 'Remove comments', |
| 23 | 23 | 'expand_templates_preview' => 'Preview', |