Re-establishing validation feature (the beginnings)

[lhc/web/wiklou.git] / includes / ImageGallery.php

diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index 2b33d54..d7819b5 100644 (file)
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -33,12 +33,23 @@ class ImageGallery
         * 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
         */
@@ -81,7 +92,7 @@ class ImageGallery
 
                $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];
@@ -90,6 +101,15 @@ class ImageGallery
                        $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 );
 
@@ -110,14 +130,15 @@ class ImageGallery
                                '' ;
 
                        $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>\n" .  (($i%4==3) ? "</tr>\n" : '');
-
+                       $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;">'.
+                               $sk->makeKnownLinkObj( $nt, $thumb->toHtml() ) . '</div><div class="gallerytext">' .
+                               $textlink . $text . $nb .
+                               '</div>';
+                       $s .= "</div></td>\n";
+                       $s .= ($i%4==3) ? '</tr>' : '';
                        $i++;
                }
                if( $i %4 != 0 ) {