http://www.mediawiki.org/wiki/Special:Code/MediaWiki/93740
Revision: 93740
Author: siebrand
Date: 2011-08-02 13:47:41 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
Change some uses of Xml class to Html class.
Modified Paths:
--------------
trunk/extensions/CentralNotice/special/SpecialNoticeTemplate.php
Modified: trunk/extensions/CentralNotice/special/SpecialNoticeTemplate.php
===================================================================
--- trunk/extensions/CentralNotice/special/SpecialNoticeTemplate.php
2011-08-02 13:06:16 UTC (rev 93739)
+++ trunk/extensions/CentralNotice/special/SpecialNoticeTemplate.php
2011-08-02 13:47:41 UTC (rev 93740)
@@ -47,7 +47,7 @@
CentralNotice::printHeader();
// Begin Banners tab content
- $wgOut->addHTML( Xml::openElement( 'div', array( 'id' =>
'preferences' ) ) );
+ $wgOut->addHTML( Html::openElement( 'div', array( 'id' =>
'preferences' ) ) );
$method = $wgRequest->getVal( 'wpMethod' );
@@ -121,14 +121,14 @@
if ( $sub == 'view' && $wgRequest->getVal( 'wpUserLanguage' )
== 'all' ) {
$template = $wgRequest->getVal( 'template' );
$this->showViewAvailable( $template );
- $wgOut->addHTML( Xml::closeElement( 'div' ) );
+ $wgOut->addHTML( Html::closeElement( 'div' ) );
return;
}
// Handle viewing a specific banner
if ( $sub == 'view' && $wgRequest->getText( 'template' ) != ''
) {
$this->showView();
- $wgOut->addHTML( Xml::closeElement( 'div' ) );
+ $wgOut->addHTML( Html::closeElement( 'div' ) );
return;
}
@@ -136,7 +136,7 @@
// Handle showing "Add a banner" interface
if ( $sub == 'add' ) {
$this->showAdd();
- $wgOut->addHTML( Xml::closeElement( 'div' ) );
+ $wgOut->addHTML( Html::closeElement( 'div' ) );
return;
}
@@ -166,7 +166,7 @@
$this->showList();
// End Banners tab content
- $wgOut->addHTML( Xml::closeElement( 'div' ) );
+ $wgOut->addHTML( Html::closeElement( 'div' ) );
}
/**
@@ -182,15 +182,15 @@
$htmlOut = '';
// Begin Manage Banners fieldset
- $htmlOut .= Xml::openElement( 'fieldset', array( 'class' =>
'prefsection' ) );
+ $htmlOut .= Html::openElement( 'fieldset', array( 'class' =>
'prefsection' ) );
if ( !$pager->getNumRows() ) {
- $htmlOut .= Xml::element( 'p', null, wfMsg(
'centralnotice-no-templates' ) );
+ $htmlOut .= Html::element( 'p', null, wfMsg(
'centralnotice-no-templates' ) );
} else {
if ( $this->editable ) {
- $htmlOut .= Xml::openElement( 'form', array(
'method' => 'post' ) );
+ $htmlOut .= Html::openElement( 'form', array(
'method' => 'post' ) );
}
- $htmlOut .= Xml::element( 'h2', null, wfMsg(
'centralnotice-manage-templates' ) );
+ $htmlOut .= Html::element( 'h2', null, wfMsg(
'centralnotice-manage-templates' ) );
// Show paginated list of banners
$htmlOut .= Xml::tags( 'div', array( 'class' =>
'cn-pager' ),
@@ -200,18 +200,18 @@
$pager->getNavigationBar() );
if ( $this->editable ) {
- $htmlOut .= Xml::closeElement( 'form' );
+ $htmlOut .= Html::closeElement( 'form' );
}
}
if ( $this->editable ) {
- $htmlOut .= Xml::element( 'p' );
+ $htmlOut .= Html::element( 'p' );
$newPage = $this->getTitle( 'add' );
$htmlOut .= $sk->makeLinkObj( $newPage, wfMsgHtml(
'centralnotice-add-template' ) );
}
// End Manage Banners fieldset
- $htmlOut .= Xml::closeElement( 'fieldset' );
+ $htmlOut .= Html::closeElement( 'fieldset' );
$wgOut->addHTML( $htmlOut );
}
@@ -226,10 +226,10 @@
// Build HTML
$htmlOut = '';
- $htmlOut .= Xml::openElement( 'fieldset', array( 'class' =>
'prefsection' ) );
- $htmlOut .= Xml::openElement( 'form',
+ $htmlOut .= Html::openElement( 'fieldset', array( 'class' =>
'prefsection' ) );
+ $htmlOut .= Html::openElement( 'form',
array( 'method' => 'post', 'onsubmit' => 'return
validateBannerForm(this)' ) );
- $htmlOut .= Xml::element( 'h2', null, wfMsg(
'centralnotice-add-template' ) );
+ $htmlOut .= Html::element( 'h2', null, wfMsg(
'centralnotice-add-template' ) );
$htmlOut .= Html::hidden( 'wpMethod', 'addTemplate' );
// If there was an error, we'll need to restore the state of
the form
@@ -257,22 +257,22 @@
);
// Display settings
- $htmlOut .= Xml::openElement( 'p', null );
+ $htmlOut .= Html::openElement( 'p', null );
$htmlOut .= wfMsg( 'centralnotice-banner-display' );
$htmlOut .= Xml::check( 'displayAnon', $displayAnon, array(
'id' => 'displayAnon' ) );
$htmlOut .= Xml::label( wfMsg( 'centralnotice-banner-anonymous'
), 'displayAnon' );
$htmlOut .= Xml::check( 'displayAccount', $displayAccount,
array( 'id' => 'displayAccount' ) );
$htmlOut .= Xml::label( wfMsg( 'centralnotice-banner-logged-in'
), 'displayAccount' );
- $htmlOut .= Xml::closeElement( 'p' );
+ $htmlOut .= Html::closeElement( 'p' );
// Fundraising settings
if ( $wgNoticeEnableFundraising ) {
- $htmlOut .= Xml::openElement( 'p', null );
+ $htmlOut .= Html::openElement( 'p', null );
$htmlOut .= Xml::check( 'fundraising', $fundraising,
array( 'id' => 'fundraising' ) );
$htmlOut .= Xml::label( wfMsg(
'centralnotice-banner-fundraising' ), 'fundraising' );
- $htmlOut .= Xml::closeElement( 'p' );
- $htmlOut .= Xml::openElement( 'div',
+ $htmlOut .= Html::closeElement( 'p' );
+ $htmlOut .= Html::openElement( 'div',
array( 'id' => 'fundraisingInterface', 'style'
=> 'display: none;' ) );
$htmlOut .= Xml::tags( 'p', array(), wfMsg(
'centralnotice-banner-fundraising-help' ) );
$htmlOut .= Xml::tags( 'p', array(),
@@ -282,7 +282,7 @@
array( 'maxlength' => 255 )
)
);
- $htmlOut .= Xml::closeElement( 'div' );
+ $htmlOut .= Html::closeElement( 'div' );
}
// Begin banner body section
@@ -297,8 +297,8 @@
wfMsg( 'centralnotice-insert',
$wgLang->commaList( $buttons ) )
);
- $htmlOut .= Xml::textarea( 'templateBody', $body, 60, 20 );
- $htmlOut .= Xml::closeElement( 'fieldset' );
+ $htmlOut .= Html::textarea( 'templateBody', $body, 60, 20 );
+ $htmlOut .= Html::closeElement( 'fieldset' );
$htmlOut .= Html::hidden( 'authtoken', $wgUser->editToken() );
// Submit button
@@ -307,8 +307,8 @@
Xml::submitButton( wfMsg( 'centralnotice-save-banner' )
)
);
- $htmlOut .= Xml::closeElement( 'form' );
- $htmlOut .= Xml::closeElement( 'fieldset' );
+ $htmlOut .= Html::closeElement( 'form' );
+ $htmlOut .= Html::closeElement( 'fieldset' );
// Output HTML
$wgOut->addHTML( $htmlOut );
@@ -348,9 +348,9 @@
$htmlOut = '';
// Begin View Banner fieldset
- $htmlOut .= Xml::openElement( 'fieldset', array(
'class' => 'prefsection' ) );
+ $htmlOut .= Html::openElement( 'fieldset', array(
'class' => 'prefsection' ) );
- $htmlOut .= Xml::element( 'h2', null,
+ $htmlOut .= Html::element( 'h2', null,
wfMsg( 'centralnotice-banner-heading',
$currentTemplate ) );
// Show preview of banner
@@ -387,14 +387,14 @@
// If there are any message fields in the banner,
display translation tools.
if ( count( $fields[0] ) > 0 ) {
if ( $this->editable ) {
- $htmlOut .= Xml::openElement( 'form',
array( 'method' => 'post' ) );
+ $htmlOut .= Html::openElement( 'form',
array( 'method' => 'post' ) );
}
$htmlOut .= Xml::fieldset(
wfMsg(
'centralnotice-translate-heading', $currentTemplate ),
false,
array( 'id' =>
'mw-centralnotice-translations-for' )
);
- $htmlOut .= Xml::openElement( 'table',
+ $htmlOut .= Html::openElement( 'table',
array (
'cellpadding' => 9,
'width' => '100%'
@@ -402,14 +402,14 @@
);
// Table headers
- $htmlOut .= Xml::element( 'th', array( 'width'
=> '15%' ),
+ $htmlOut .= Html::element( 'th', array( 'width'
=> '15%' ),
wfMsg( 'centralnotice-message' ) );
- $htmlOut .= Xml::element( 'th', array( 'width'
=> '5%' ),
+ $htmlOut .= Html::element( 'th', array( 'width'
=> '5%' ),
wfMsg ( 'centralnotice-number-uses' )
);
- $htmlOut .= Xml::element( 'th', array( 'width'
=> '40%' ),
+ $htmlOut .= Html::element( 'th', array( 'width'
=> '40%' ),
wfMsg ( 'centralnotice-english' ) );
$languages = Language::getLanguageNames();
- $htmlOut .= Xml::element( 'th', array( 'width'
=> '40%' ),
+ $htmlOut .= Html::element( 'th', array( 'width'
=> '40%' ),
$languages[$wpUserLang] );
// Remove duplicate message fields
@@ -427,14 +427,14 @@
:
"Centralnotice-{$currentTemplate}-{$field}/{$wpUserLang}";
// English value
- $htmlOut .= Xml::openElement( 'tr' );
+ $htmlOut .= Html::openElement( 'tr' );
$title = Title::newFromText(
"MediaWiki:{$message}" );
$htmlOut .= Xml::tags( 'td', null,
$sk->makeLinkObj( $title,
htmlspecialchars( $field ) )
);
- $htmlOut .= Xml::element( 'td', null,
$count );
+ $htmlOut .= Html::element( 'td', null,
$count );
// English text
$englishText = wfMsg(
'centralnotice-message-not-set' );
@@ -450,7 +450,7 @@
$englishTextExists = true;
}
$htmlOut .= Xml::tags( 'td', null,
- Xml::element( 'span',
+ Html::element( 'span',
array(
'style' =>
'font-style:italic;' .
(
!$englishTextExists ? 'color:silver' : '' )
@@ -478,9 +478,9 @@
(
!$foreignTextExists ? 'color:red' : '' ) ) )
)
);
- $htmlOut .= Xml::closeElement( 'tr' );
+ $htmlOut .= Html::closeElement( 'tr' );
}
- $htmlOut .= Xml::closeElement( 'table' );
+ $htmlOut .= Html::closeElement( 'table' );
if ( $this->editable ) {
$htmlOut .= Html::hidden(
'wpUserLanguage', $wpUserLang );
@@ -494,19 +494,19 @@
);
}
- $htmlOut .= Xml::closeElement( 'fieldset' );
+ $htmlOut .= Html::closeElement( 'fieldset' );
if ( $this->editable ) {
- $htmlOut .= Xml::closeElement( 'form' );
+ $htmlOut .= Html::closeElement( 'form'
);
}
// Show language selection form
$actionTitle = $this->getTitleFor(
'NoticeTemplate', 'view' );
$actionUrl = $actionTitle->getLocalURL();
- $htmlOut .= Xml::openElement( 'form', array(
'method' => 'get', 'action' => $actionUrl ) );
+ $htmlOut .= Html::openElement( 'form', array(
'method' => 'get', 'action' => $actionUrl ) );
$htmlOut .= Xml::fieldset( wfMsg(
'centralnotice-change-lang' ) );
$htmlOut .= Html::hidden( 'template',
$currentTemplate );
- $htmlOut .= Xml::openElement( 'table', array (
'cellpadding' => 9 ) );
+ $htmlOut .= Html::openElement( 'table', array (
'cellpadding' => 9 ) );
list( $lsLabel, $lsSelect ) =
Xml::languageSelector( $wpUserLang );
$newPage = $this->getTitle( 'view' );
@@ -527,14 +527,14 @@
"template=$currentTemplate&wpUserLanguage=all" )
)
);
- $htmlOut .= Xml::closeElement( 'table' );
- $htmlOut .= Xml::closeElement( 'fieldset' );
- $htmlOut .= Xml::closeElement( 'form' );
+ $htmlOut .= Html::closeElement( 'table' );
+ $htmlOut .= Html::closeElement( 'fieldset' );
+ $htmlOut .= Html::closeElement( 'form' );
}
// Show edit form
if ( $this->editable ) {
- $htmlOut .= Xml::openElement( 'form',
+ $htmlOut .= Html::openElement( 'form',
array(
'method' => 'post',
'onsubmit' => 'return
validateBannerForm(this)'
@@ -560,7 +560,7 @@
// Show banner settings
$htmlOut .= Xml::fieldset( wfMsg(
'centralnotice-settings' ) );
- $htmlOut .= Xml::openElement( 'p', null );
+ $htmlOut .= Html::openElement( 'p', null );
$htmlOut .= wfMsg( 'centralnotice-banner-display' );
$htmlOut .= Xml::check( 'displayAnon', $displayAnon,
wfArrayMerge( $disabled, array( 'id' =>
'displayAnon' ) ) );
@@ -568,20 +568,20 @@
$htmlOut .= Xml::check( 'displayAccount',
$displayAccount,
wfArrayMerge( $disabled, array( 'id' =>
'displayAccount' ) ) );
$htmlOut .= Xml::label( wfMsg(
'centralnotice-banner-logged-in' ), 'displayAccount' );
- $htmlOut .= Xml::closeElement( 'p' );
+ $htmlOut .= Html::closeElement( 'p' );
// Fundraising settings
if ( $wgNoticeEnableFundraising ) {
- $htmlOut .= Xml::openElement( 'p', null );
+ $htmlOut .= Html::openElement( 'p', null );
$htmlOut .= Xml::check( 'fundraising',
$fundraising,
wfArrayMerge( $disabled, array( 'id' =>
'fundraising' ) ) );
$htmlOut .= Xml::label( wfMsg(
'centralnotice-banner-fundraising' ),
'fundraising' );
- $htmlOut .= Xml::closeElement( 'p' );
+ $htmlOut .= Html::closeElement( 'p' );
if ( $fundraising ) {
- $htmlOut .= Xml::openElement( 'div',
array( 'id'=>'fundraisingInterface' ) );
+ $htmlOut .= Html::openElement( 'div',
array( 'id'=>'fundraisingInterface' ) );
} else {
- $htmlOut .= Xml::openElement( 'div',
+ $htmlOut .= Html::openElement( 'div',
array(
'id'=>'fundraisingInterface', 'style'=>'display:none;' ) );
}
$htmlOut .= Xml::tags( 'p', array(),
@@ -593,11 +593,11 @@
array( 'maxlength' => 255 )
)
);
- $htmlOut .= Xml::closeElement( 'div' );
+ $htmlOut .= Html::closeElement( 'div' );
}
// Begin banner body section
- $htmlOut .= Xml::closeElement( 'fieldset' );
+ $htmlOut .= Html::closeElement( 'fieldset' );
if ( $this->editable ) {
$htmlOut .= Xml::fieldset( wfMsg(
'centralnotice-edit-template' ) );
$htmlOut .= wfMsg(
'centralnotice-edit-template-summary' );
@@ -614,7 +614,7 @@
$htmlOut .= Xml::fieldset( wfMsg(
'centralnotice-banner' ) );
}
$htmlOut .= Xml::textarea( 'templateBody', $body, 60,
20, $readonly );
- $htmlOut .= Xml::closeElement( 'fieldset' );
+ $htmlOut .= Html::closeElement( 'fieldset' );
if ( $this->editable ) {
// Indicate which form was submitted
$htmlOut .= Html::hidden( 'mainform', 'true' );
@@ -623,12 +623,12 @@
array( 'class' => 'cn-buttons' ),
Xml::submitButton( wfMsg(
'centralnotice-save-banner' ) )
);
- $htmlOut .= Xml::closeElement( 'form' );
+ $htmlOut .= Html::closeElement( 'form' );
}
// Show clone form
if ( $this->editable ) {
- $htmlOut .= Xml::openElement ( 'form',
+ $htmlOut .= Html::openElement ( 'form',
array(
'method' => 'post',
'action' => $this->getTitle(
'clone' )->getLocalUrl()
@@ -636,8 +636,8 @@
);
$htmlOut .= Xml::fieldset( wfMsg(
'centralnotice-clone-notice' ) );
- $htmlOut .= Xml::openElement( 'table', array(
'cellpadding' => 9 ) );
- $htmlOut .= Xml::openElement( 'tr' );
+ $htmlOut .= Html::openElement( 'table', array(
'cellpadding' => 9 ) );
+ $htmlOut .= Html::openElement( 'tr' );
$htmlOut .= Xml::inputLabel(
wfMsg( 'centralnotice-clone-name' ),
'newTemplate', 'newTemplate', '25' );
@@ -646,15 +646,15 @@
array ( 'id' => 'clone' ) );
$htmlOut .= Html::hidden( 'oldTemplate',
$currentTemplate );
- $htmlOut .= Xml::closeElement( 'tr' );
- $htmlOut .= Xml::closeElement( 'table' );
+ $htmlOut .= Html::closeElement( 'tr' );
+ $htmlOut .= Html::closeElement( 'table' );
$htmlOut .= Html::hidden( 'authtoken',
$wgUser->editToken() );
- $htmlOut .= Xml::closeElement( 'fieldset' );
- $htmlOut .= Xml::closeElement( 'form' );
+ $htmlOut .= Html::closeElement( 'fieldset' );
+ $htmlOut .= Html::closeElement( 'form' );
}
// End View Banner fieldset
- $htmlOut .= Xml::closeElement( 'fieldset' );
+ $htmlOut .= Html::closeElement( 'fieldset' );
// Output HTML
$wgOut->addHTML( $htmlOut );
@@ -677,9 +677,9 @@
$htmlOut = '';
// Begin View Banner fieldset
- $htmlOut .= Xml::openElement( 'fieldset', array( 'class' =>
'prefsection' ) );
+ $htmlOut .= Html::openElement( 'fieldset', array( 'class' =>
'prefsection' ) );
- $htmlOut .= Xml::element( 'h2', null, wfMsg(
'centralnotice-banner-heading', $template ) );
+ $htmlOut .= Html::element( 'h2', null, wfMsg(
'centralnotice-banner-heading', $template ) );
foreach ( $langs as $lang ) {
// Link and Preview all available translations
@@ -704,7 +704,7 @@
}
// End View Banner fieldset
- $htmlOut .= Xml::closeElement( 'fieldset' );
+ $htmlOut .= Html::closeElement( 'fieldset' );
return $wgOut->addHtml( $htmlOut );
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
