-
<?php
/**
* @package MediaWiki
* Add an image to the gallery.
*
* @param Image $image Image object that is added to the gallery
- * @param string $text Additional text to be shown. The name and size of the image are always shown.
+ * @param string $html Additional HTML text to be shown. The name and size of the image are always shown.
*/
- function add( $image, $text='' ) {
- $this->mImages[] = array( &$image, $text );
+ function add( $image, $html='' ) {
+ $this->mImages[] = array( &$image, $html );
+ }
+
+ /**
+ * Add an image at the beginning of the gallery.
+ *
+ * @param Image $image Image object that is added to the gallery
+ * @param string $html Additional HTML text to be shown. The name and size of the image are always shown.
+ */
+ function insert( $image, $html='' ) {
+ array_unshift( $this->mImages, array( &$image, $html ) );
}
+
/**
- * isEmpty() returns false iff the gallery doesn't contain any images
+ * isEmpty() returns true if the gallery contains no images
*/
function isEmpty() {
return empty( $this->mImages );
$sk = $wgUser->getSkin();
- $s = '<table style="border:solid 1px #DDDDDD; cellspacing:0; cellpadding:0; margin:1em;">';
+ $s = '<table class="gallery" cellspacing="0" cellpadding="0">';
$i = 0;
foreach ( $this->mImages as $pair ) {
$img =& $pair[0];
$name = $img->getName();
$nt = $img->getTitle();
+ // Not an image. Just print the name and skip.
+ if ( $nt->getNamespace() != NS_IMAGE ) {
+ $s .= '<td><div class="gallerybox" style="height: 152px;">' .
+ htmlspecialchars( $nt->getText() ) . '</div></td>' . (($i%4==3) ? "</tr>\n" : '');
+ $i++;
+
+ continue;
+ }
+
//TODO
//$ul = $sk->makeLink( $wgContLang->getNsText( Namespace::getUser() ) . ":{$ut}", $ut );
- $nb = $this->mShowBytes ?
- wfMsg( "nbytes", $wgLang->formatNum( $img->getSize() ) ) . '<br />' :
- '' ;
+ if( $this->mShowBytes ) {
+ if( $img->exists() ) {
+ $nb = wfMsg( 'nbytes', $wgLang->formatNum( $img->getSize() ) );
+ } else {
+ $nb = wfMsg( 'filemissing' );
+ }
+ $nb = htmlspecialchars( $nb ) . "<br />\n";
+ } else {
+ $nb = '';
+ }
+
$textlink = $this->mShowFilename ?
- $sk->makeKnownLinkObj( $nt, Language::truncate( $nt->getText(), 20, '...' ) ) . '<br />' :
+ $sk->makeKnownLinkObj( $nt, htmlspecialchars( $wgLang->truncate( $nt->getText(), 20, '...' ) ) ) . "<br />\n" :
'' ;
$s .= ($i%4==0) ? '<tr>' : '';
- $s .= '<td valign="top" width="150px" style="background-color:#F0F0F0;">' .
- '<table width="100%" height="150px">'.
- '<tr><td align="center" valign="center" style="background-color:#F8F8F8;border:solid 1px #888888;">' .
- $sk->makeKnownLinkObj( $nt, '<img src="'.$img->createThumb(120,120).'" alt="">' ) . '</td></tr></table> ' .
- $textlink . $text . $nb;
-
- $s .= '</td>' . (($i%4==3) ? '</tr>' : '');
-
+ $thumb = $img->getThumbnail( 120, 120 );
+ $vpad = floor( ( 150 - $thumb->height ) /2 ) - 2;
+ $s .= '<td><div class="gallerybox">' . '<div class="thumb" style="padding: ' . $vpad . 'px 0;">';
+
+ # ATTENTION: The newline after <div class="gallerytext"> is needed to accommodate htmltidy which
+ # in version 4.8.6 generated crackpot html in its absence, see:
+ # http://bugzilla.wikimedia.org/show_bug.cgi?id=1765
+ $s .= $sk->makeKnownLinkObj( $nt, $thumb->toHtml() ) . '</div><div class="gallerytext">' . "\n" .
+ $textlink . $text . $nb .
+ '</div>';
+ $s .= "</div></td>\n";
+ $s .= ($i%4==3) ? '</tr>' : '';
$i++;
}
+ if( $i %4 != 0 ) {
+ $s .= "</tr>\n";
+ }
$s .= '</table>';
return $s;
}
- /**
- * Transparently generates an image gallery from a text with one line per image.
- * text labels may be given by using |-style alternative text. E.g.
- * Image:one.jpg|The number "1"
- * Image:tree.jpg|A tree
- * given as text will return a gallery with two images, labeled 'The number "1"' and
- * 'A tree'.
- */
- function newFromTextList( $text ) {
- $ig = new ImageGallery();
- $ig->setShowBytes( false );
- $ig->setShowFilename( false );
- $lines = explode( "\n", $text );
- foreach ( $lines as $line ) {
- preg_match( "/^([^|]+)(\\|(.*))?$/", $line, $matches );
- # Skip empty lines
- if ( count( $matches ) == 0 ) {
- continue;
- }
- $nt = Title::newFromURL( $matches[1] );
- if ( isset( $matches[3] ) ) {
- $label = $matches[3];
- } else {
- $label = '';
- }
- $ig->add( Image::newFromTitle( $nt ), $label );
- }
- return $ig;
- }
-
-
} //class