http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70447
Revision: 70447
Author: kaldari
Date: 2010-08-04 01:58:59 +0000 (Wed, 04 Aug 2010)
Log Message:
-----------
HTML/CSS clean-up in CetralNotice
Modified Paths:
--------------
trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
trunk/extensions/CentralNotice/centralnotice.css
Modified: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
===================================================================
--- trunk/extensions/CentralNotice/SpecialNoticeTemplate.php 2010-08-04
01:25:54 UTC (rev 70446)
+++ trunk/extensions/CentralNotice/SpecialNoticeTemplate.php 2010-08-04
01:58:59 UTC (rev 70447)
@@ -152,9 +152,9 @@
);
}
$htmlOut .= Xml::element( 'h2', null, wfMsg(
'centralnotice-manage-templates' ) );
- $htmlOut .= $pager->getNavigationBar() .
- $pager->getBody() .
- $pager->getNavigationBar();
+ $htmlOut .= Xml::tags( 'div', array( 'class' =>
'cn-pager' ), $pager->getNavigationBar() );
+ $htmlOut .= $pager->getBody();
+ $htmlOut .= Xml::tags( 'div', array( 'class' =>
'cn-pager' ), $pager->getNavigationBar() );
if ( $this->editable ) {
$htmlOut .= Xml::closeElement( 'form' );
@@ -333,17 +333,17 @@
);
$htmlOut .= Xml::closeElement( 'tr' );
}
+ $htmlOut .= Xml::closeElement( 'table' );
+
if ( $this->editable ) {
$htmlOut .= Xml::hidden( 'wpUserLanguage',
$wpUserLang );
- $htmlOut .= Xml::openElement( 'tr' );
- $htmlOut .= Xml::tags( 'td', array( 'colspan'
=> 4 ),
- Xml::submitButton( wfMsg(
'centralnotice-modify' ), array( 'name' => 'update' ) )
+ $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
+ $htmlOut .= Xml::tags( 'div',
+ array( 'class' => 'cn-buttons' ),
+ Xml::submitButton( wfMsg(
'centralnotice-modify' ), array( 'name' => 'update' ) )
);
- $htmlOut .= Xml::closeElement( 'tr' );
}
-
- $htmlOut .= Xml::closeElement( 'table' );
- $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
+
$htmlOut .= Xml::closeElement( 'fieldset' );
if ( $this->editable ) {
@@ -395,13 +395,14 @@
$htmlOut .= Xml::tags( 'tr', null,
Xml::tags( 'td', null, Xml::textarea( 'templateBody',
$body, 60, 20, $readonly ) )
);
+ $htmlOut .= Xml::closeElement( 'table' );
if ( $this->editable ) {
- $htmlOut .= Xml::tags( 'tr', null,
- Xml::tags( 'td', null, Xml::submitButton(
wfMsg( 'centralnotice-modify' ) ) )
+ $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
+ $htmlOut .= Xml::tags( 'div',
+ array( 'class' => 'cn-buttons' ),
+ Xml::submitButton( wfMsg(
'centralnotice-modify' ) )
);
}
- $htmlOut .= Xml::closeElement( 'table' );
- $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() );
$htmlOut .= Xml::closeElement( 'fieldset' );
if ( $this->editable ) {
$htmlOut .= Xml::closeElement( 'form' );
@@ -767,15 +768,14 @@
function getEndBody() {
global $wgUser;
$htmlOut = '';
+ $htmlOut .= Xml::closeElement( 'table' );
if ( $this->editable ) {
- $htmlOut .= Xml::tags( 'tr', null,
- Xml::tags( 'td', array( 'colspan' => 3 ),
- Xml::submitButton( wfMsg(
'centralnotice-modify' ) )
- )
+ $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
+ $htmlOut .= Xml::tags( 'div',
+ array( 'class' => 'cn-buttons' ),
+ Xml::submitButton( wfMsg(
'centralnotice-modify' ) )
);
}
- $htmlOut .= Xml::closeElement( 'table' );
- $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() );
return $htmlOut;
}
}
Modified: trunk/extensions/CentralNotice/centralnotice.css
===================================================================
--- trunk/extensions/CentralNotice/centralnotice.css 2010-08-04 01:25:54 UTC
(rev 70446)
+++ trunk/extensions/CentralNotice/centralnotice.css 2010-08-04 01:58:59 UTC
(rev 70447)
@@ -18,6 +18,9 @@
#preferences fieldset.prefsection h2 {
border:none;
}
+#preferences div.cn-pager {
+ margin:1em 0;
+}
#preferences div.cn-error {
color:#AA0000;
margin:1em;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
