| Index: trunk/extensions/CentralNotice/centralnotice.css |
| — | — | @@ -18,6 +18,9 @@ |
| 19 | 19 | #preferences fieldset.prefsection h2 { |
| 20 | 20 | border:none; |
| 21 | 21 | } |
| | 22 | +#preferences div.cn-pager { |
| | 23 | + margin:1em 0; |
| | 24 | +} |
| 22 | 25 | #preferences div.cn-error { |
| 23 | 26 | color:#AA0000; |
| 24 | 27 | margin:1em; |
| Index: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php |
| — | — | @@ -152,9 +152,9 @@ |
| 153 | 153 | ); |
| 154 | 154 | } |
| 155 | 155 | $htmlOut .= Xml::element( 'h2', null, wfMsg( 'centralnotice-manage-templates' ) ); |
| 156 | | - $htmlOut .= $pager->getNavigationBar() . |
| 157 | | - $pager->getBody() . |
| 158 | | - $pager->getNavigationBar(); |
| | 156 | + $htmlOut .= Xml::tags( 'div', array( 'class' => 'cn-pager' ), $pager->getNavigationBar() ); |
| | 157 | + $htmlOut .= $pager->getBody(); |
| | 158 | + $htmlOut .= Xml::tags( 'div', array( 'class' => 'cn-pager' ), $pager->getNavigationBar() ); |
| 159 | 159 | |
| 160 | 160 | if ( $this->editable ) { |
| 161 | 161 | $htmlOut .= Xml::closeElement( 'form' ); |
| — | — | @@ -333,17 +333,17 @@ |
| 334 | 334 | ); |
| 335 | 335 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 336 | 336 | } |
| | 337 | + $htmlOut .= Xml::closeElement( 'table' ); |
| | 338 | + |
| 337 | 339 | if ( $this->editable ) { |
| 338 | 340 | $htmlOut .= Xml::hidden( 'wpUserLanguage', $wpUserLang ); |
| 339 | | - $htmlOut .= Xml::openElement( 'tr' ); |
| 340 | | - $htmlOut .= Xml::tags( 'td', array( 'colspan' => 4 ), |
| 341 | | - Xml::submitButton( wfMsg( 'centralnotice-modify' ), array( 'name' => 'update' ) ) |
| | 341 | + $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() ); |
| | 342 | + $htmlOut .= Xml::tags( 'div', |
| | 343 | + array( 'class' => 'cn-buttons' ), |
| | 344 | + Xml::submitButton( wfMsg( 'centralnotice-modify' ), array( 'name' => 'update' ) ) |
| 342 | 345 | ); |
| 343 | | - $htmlOut .= Xml::closeElement( 'tr' ); |
| 344 | 346 | } |
| 345 | | - |
| 346 | | - $htmlOut .= Xml::closeElement( 'table' ); |
| 347 | | - $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() ); |
| | 347 | + |
| 348 | 348 | $htmlOut .= Xml::closeElement( 'fieldset' ); |
| 349 | 349 | |
| 350 | 350 | if ( $this->editable ) { |
| — | — | @@ -395,13 +395,14 @@ |
| 396 | 396 | $htmlOut .= Xml::tags( 'tr', null, |
| 397 | 397 | Xml::tags( 'td', null, Xml::textarea( 'templateBody', $body, 60, 20, $readonly ) ) |
| 398 | 398 | ); |
| | 399 | + $htmlOut .= Xml::closeElement( 'table' ); |
| 399 | 400 | if ( $this->editable ) { |
| 400 | | - $htmlOut .= Xml::tags( 'tr', null, |
| 401 | | - Xml::tags( 'td', null, Xml::submitButton( wfMsg( 'centralnotice-modify' ) ) ) |
| | 401 | + $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() ); |
| | 402 | + $htmlOut .= Xml::tags( 'div', |
| | 403 | + array( 'class' => 'cn-buttons' ), |
| | 404 | + Xml::submitButton( wfMsg( 'centralnotice-modify' ) ) |
| 402 | 405 | ); |
| 403 | 406 | } |
| 404 | | - $htmlOut .= Xml::closeElement( 'table' ); |
| 405 | | - $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() ); |
| 406 | 407 | $htmlOut .= Xml::closeElement( 'fieldset' ); |
| 407 | 408 | if ( $this->editable ) { |
| 408 | 409 | $htmlOut .= Xml::closeElement( 'form' ); |
| — | — | @@ -767,15 +768,14 @@ |
| 768 | 769 | function getEndBody() { |
| 769 | 770 | global $wgUser; |
| 770 | 771 | $htmlOut = ''; |
| | 772 | + $htmlOut .= Xml::closeElement( 'table' ); |
| 771 | 773 | if ( $this->editable ) { |
| 772 | | - $htmlOut .= Xml::tags( 'tr', null, |
| 773 | | - Xml::tags( 'td', array( 'colspan' => 3 ), |
| 774 | | - Xml::submitButton( wfMsg( 'centralnotice-modify' ) ) |
| 775 | | - ) |
| | 774 | + $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() ); |
| | 775 | + $htmlOut .= Xml::tags( 'div', |
| | 776 | + array( 'class' => 'cn-buttons' ), |
| | 777 | + Xml::submitButton( wfMsg( 'centralnotice-modify' ) ) |
| 776 | 778 | ); |
| 777 | 779 | } |
| 778 | | - $htmlOut .= Xml::closeElement( 'table' ); |
| 779 | | - $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() ); |
| 780 | 780 | return $htmlOut; |
| 781 | 781 | } |
| 782 | 782 | } |