From d3d21cbb02391635983a803ac22560818ea7c8f5 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Sat, 28 Mar 2009 16:41:00 +0000 Subject: [PATCH] (bug 17617) HTML cleanup for ImagePage --- RELEASE-NOTES | 1 + includes/ImagePage.php | 53 ++++++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 72f79a8627..c820b7c861 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -296,6 +296,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * The svn-version version numbers on Special:Version have been removed * (bug 17374) Special:Export no longer exports two copies of the same page * (bug 18190) Proper parsing in MediaWiki:Sharedupload message +* (bug 17617) HTML cleanup for ImagePage == API changes in 1.15 == * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions diff --git a/includes/ImagePage.php b/includes/ImagePage.php index 5e72b47814..61ce97d863 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -115,7 +115,7 @@ class ImagePage extends Article { if( $fol != '-' && !wfEmptyMsg( 'shareddescriptionfollows', $fol ) ) { $wgOut->addWikiText( $fol ); } - $wgOut->addHTML( '
' . $this->mExtraDescription . '
' ); + $wgOut->addHTML( '
' . $this->mExtraDescription . "
\n" ); } $this->closeShowImage(); @@ -135,7 +135,7 @@ class ImagePage extends Article { global $wgStylePath, $wgStyleVersion; $expand = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-expand' ) ) ); $collapse = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-collapse' ) ) ); - $wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ). "\n" ); + $wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ) . "\n" ); $wgOut->addWikiText( $this->makeMetadataTable( $formattedMetadata ) ); $wgOut->addScriptFile( 'metadata.js' ); $wgOut->addHTML( @@ -226,9 +226,9 @@ class ImagePage extends Article { $r = ''; +
  • ' . wfMsgHtml( 'imagelinks' ) . "
    • \n" . + ($metadata ? '
  • ' . wfMsgHtml( 'metadata' ) . '
    • ' : '') . " + \n"; return $r; } @@ -241,8 +241,9 @@ class ImagePage extends Article { * @return string */ protected function makeMetadataTable( $metadata ) { - $r = wfMsg( 'metadata-help' ) . "\n\n"; - $r .= "{| id=mw_metadata class=mw_metadata\n"; + $r = "
    \n"; + $r .= wfMsg( 'metadata-help' ); + $r .= "\n"; foreach ( $metadata as $type => $stuff ) { foreach ( $stuff as $v ) { # FIXME, why is this using escapeId for a class?! @@ -250,12 +251,12 @@ class ImagePage extends Article { if( $type == 'collapsed' ) { $class .= ' collapsable'; } - $r .= "|- class=\"$class\"\n"; - $r .= "!| {$v['name']}\n"; - $r .= "|| {$v['value']}\n"; + $r .= "\n"; + $r .= "\n"; + $r .= "\n"; } } - $r .= '|}'; + $r .= "
    {$v['name']}{$v['value']}
    \n
    \n"; return $r; } @@ -371,7 +372,7 @@ class ImagePage extends Article { ); $wgOut->addHTML( '' ); + $anchorclose . "\n" ); } if( $this->displayImg->isMultipage() ) { @@ -428,7 +429,7 @@ class ImagePage extends Article { $wgOut->addHTML( '' ); + "\n" ); } $showLink = true; @@ -443,16 +444,16 @@ class ImagePage extends Article { $wgOut->addWikiText( << [[Media:$filename|$filename]]$dirmark - $longDesc +$longDesc -
    $warning
    EOT ); } else { $wgOut->addWikiText( << -[[Media:$filename|$filename]]$dirmark $longDesc +[[Media:$filename|$filename]]$dirmark +$longDesc EOT ); @@ -484,7 +485,7 @@ EOT $descUrl = $this->img->getDescriptionUrl(); $descText = $this->img->getDescriptionText(); - $wrap = "
    \n$1\n
    "; + $wrap = "
    \n$1\n
    \n"; $repo = $this->img->getRepo()->getDisplayName(); $msg = ''; @@ -520,19 +521,19 @@ EOT $sk = $wgUser->getSkin(); - $wgOut->addHTML( '
      ' ); + $wgOut->addHTML( "
        \n" ); # "Upload a new version of this file" link if( UploadForm::userCanReUpload($wgUser,$this->img->name) ) { $ulink = $sk->makeExternalLink( $this->getUploadUrl(), wfMsg( 'uploadnewversion-linktext' ) ); - $wgOut->addHTML( "
      • {$ulink}
        • " ); + $wgOut->addHTML( "
      • {$ulink}
        • \n" ); } # External editing link $elink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'edit-externally' ), 'action=edit&externaledit=true&mode=file' ); - $wgOut->addHTML( '
      • ' . $elink . ' ' . wfMsgExt( 'edit-externally-help', array( 'parseinline' ) ) . '
        • ' ); + $wgOut->addHTML( '
      • ' . $elink . ' ' . wfMsgExt( 'edit-externally-help', array( 'parseinline' ) ) . "
        • \n" ); - $wgOut->addHTML( '
      ' ); + $wgOut->addHTML( "
    \n" ); } protected function closeShowImage() {} # For overloading @@ -602,12 +603,13 @@ EOT $wgOut->addHTML( "
  • {$link}
    • \n" ); } } - $wgOut->addHTML( "\n" ); + $wgOut->addHTML( "\n" ); $res->free(); // Add a links to [[Special:Whatlinkshere]] if( $count > $limit ) $wgOut->addWikiMsg( 'morelinkstoimage', $this->mTitle->getPrefixedDBkey() ); + $wgOut->addHTML( "\n" ); } protected function imageRedirects() { @@ -746,9 +748,10 @@ class ImageHistoryList { public function beginImageHistoryList( $navLinks = '' ) { global $wgOut, $wgUser; - return Xml::element( 'h2', array( 'id' => 'filehistory' ), wfMsg( 'filehist' ) ) + return Xml::element( 'h2', array( 'id' => 'filehistory' ), wfMsg( 'filehist' ) ) . "\n" + . "
    \n" . $wgOut->parse( wfMsgNoTrans( 'filehist-help' ) ) - . $navLinks + . $navLinks . "\n" . Xml::openElement( 'table', array( 'class' => 'filehistory' ) ) . "\n" . '' . ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deleterevision') ) ? '' : '' ) @@ -761,7 +764,7 @@ class ImageHistoryList { } public function endImageHistoryList( $navLinks = '' ) { - return "\n$navLinks\n"; + return "\n$navLinks\n
    \n"; } public function imageHistoryLine( $iscur, $file ) { -- 2.20.1