BUG#1124

Make gallery valid XHTML 1.0
Make MonoBook.php valid XHTML 1.0 (tagline)
Move image gallery CSS code from PHP to CSS file

diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index 7f49a79..9e141c0 100644 (file)
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -30,7 +30,7 @@ class ImageGallery
        }
 
        /**
-        * Add an image at the end of the gallery.
+        * Add an image to 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.
@@ -38,17 +38,18 @@ class ImageGallery
        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.
-        */
+       * 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
         */
@@ -91,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];
@@ -102,8 +103,8 @@ class ImageGallery
 
                        // Not an image. Just print the name and skip.
                        if ( $nt->getNamespace() != NS_IMAGE ) {
-                               $s .= '<td valign="top" width="150px" style="background-color:#F0F0F0;">' .
-                                       htmlspecialchars( $nt->getText() ) . '</td>' .  (($i%4==3) ? "</tr>\n" : '');
+                               $s .= '<td><div class="gallerybox" style="height: 152px;">' .
+                                       htmlspecialchars( $nt->getText() ) . '</div></td>' .  (($i%4==3) ? "</tr>\n" : '');
                                $i++;
 
                                continue;
@@ -129,15 +130,18 @@ class ImageGallery
                                '' ;
 
                        $s .= ($i%4==0) ? '<tr>' : '';
-                       $thumb = $img->getThumbnail(120,120);
-                       $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, $thumb->toHtml() ) . '</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>';
+                       if($text <> '') {
+                               $s .= '<div class="gallerytext">' .
+                                       $textlink . $text . $nb .
+                                       '</div>';
+                       }
+                       $s .= "</div></td>\n";
+                       $s .= ($i%4==3) ? '</tr>' : '';
                        $i++;
                }
                if( $i %4 != 0 ) {

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 29bd147..ba1d50f 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -185,8 +185,8 @@ class MonoBookTemplate extends QuickTemplate {
          <?php if($this->data['copyright' ]) { ?><li id="f-copyright"><?php  $this->html('copyright')  ?></li><?php } ?>
          <?php if($this->data['about'     ]) { ?><li id="f-about"><?php      $this->html('about')      ?></li><?php } ?>
          <?php if($this->data['disclaimer']) { ?><li id="f-disclaimer"><?php $this->html('disclaimer') ?></li><?php } ?>
+         <?php if($this->data['tagline']) { ?><li id="f-tagline"><?php echo $this->data['tagline'] ?></li><?php } ?>
        </ul>
-       <?php if($this->data['tagline']) { ?><li id="f-tagline"><?php echo $this->data['tagline'] ?></li><?php } ?>
       </div>
     </div>
     <?php $this->html('reporttime') ?>
@@ -196,4 +196,4 @@ class MonoBookTemplate extends QuickTemplate {
        }
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/skins/amethyst/main.css b/skins/amethyst/main.css
index e696f49..6f96de8 100644 (file)
--- a/skins/amethyst/main.css
+++ b/skins/amethyst/main.css
@@ -981,3 +981,33 @@ span.minoreditletter {
        color:black;
        background-color:#C5FFE6;
 }
+
+table.gallery {
+        border:  1px solid #cccccc;
+        margin:  2px;
+        padding: 2px;
+        background-color:#ffffff;
+}
+
+table.gallery tr { 
+        vertical-align:top;
+}
+
+div.gallerybox {
+        border: 1px solid #cccccc;
+        margin: 2px;
+        background-color:#f9f9f9;
+        width:  150px;
+}
+
+div.gallerybox div.thumb {
+        text-align: center;
+        border: 1px solid #cccccc;
+        margin: 2px;
+}       
+
+div.gallerytext {
+        font-size: 94%;
+        padding: 2px 4px;
+}       
+

diff --git a/skins/chick/main.css b/skins/chick/main.css
index 4e798bb..c31aca5 100755 (executable)
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -445,3 +445,32 @@ span.minoreditletter {
        background-color:#C5FFE6;
 }
 
+table.gallery {
+        border:  1px solid #cccccc;
+        margin:  2px;
+        padding: 2px;
+        background-color:#ffffff;
+}
+
+table.gallery tr { 
+        vertical-align:top;
+}
+
+div.gallerybox {
+        border: 1px solid #cccccc;
+        margin: 2px;
+        background-color:#f9f9f9;
+        width:  150px;
+}
+
+div.gallerybox div.thumb {
+        text-align: center;
+        border: 1px solid #cccccc;
+        margin: 2px;
+}       
+
+div.gallerytext {
+        font-size: 94%;
+        padding: 2px 4px;
+}       
+

diff --git a/skins/common/common.css b/skins/common/common.css
index 95c68b2..108eef7 100644 (file)
--- a/skins/common/common.css
+++ b/skins/common/common.css
@@ -225,3 +225,33 @@ span.minoreditletter {
        color:black;
        background-color:#C5FFE6;
 }
+
+table.gallery {
+        border:  1px solid #cccccc;
+        margin:  2px;
+        padding: 2px;
+        background-color:#ffffff;
+}
+
+table.gallery tr { 
+        vertical-align:top;
+}
+
+div.gallerybox {
+        border: 1px solid #cccccc;
+        margin: 2px;
+        background-color:#f9f9f9;
+        width:  150px;
+}
+
+div.gallerybox div.thumb {
+        text-align: center;
+        border: 1px solid #cccccc;
+        margin: 2px;
+}       
+
+div.gallerytext {
+        font-size: 94%;
+        padding: 2px 4px;
+}       
+

diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css
index 491d9e7..ce4b35d 100644 (file)
--- a/skins/common/commonPrint.css
+++ b/skins/common/commonPrint.css
@@ -229,3 +229,33 @@ div.townBox dl dd {
 }
 
 #siteNotice { display: none; }
+
+table.gallery {
+        border:  1px solid #cccccc;
+        margin:  2px;
+        padding: 2px;
+        background-color:#ffffff;
+}
+
+table.gallery tr { 
+        vertical-align:top;
+}
+
+div.gallerybox {
+        border: 1px solid #cccccc;
+        margin: 2px;
+        background-color:#f9f9f9;
+        width:  150px;
+}
+
+div.gallerybox div.thumb {
+        text-align: center;
+        border: 1px solid #cccccc;
+        margin: 2px;
+}       
+
+div.gallerytext {
+        font-size: 94%;
+        padding: 2px 4px;
+}       
+

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 05ac91f..8b386a6 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -950,3 +950,32 @@ span.minoreditletter {
        color:black;
        background-color:#C5FFE6;
 }
+
+table.gallery {
+       border:  1px solid #cccccc;
+       margin:  2px;
+       padding: 2px;
+       background-color:#ffffff;
+}
+
+table.gallery tr {
+       vertical-align:top;
+}
+
+div.gallerybox {
+       border: 1px solid #cccccc;
+       margin: 2px;
+       background-color:#f9f9f9;
+       width:  150px;
+}
+
+div.gallerybox div.thumb {
+       text-align: center;
+       border: 1px solid #cccccc;
+       margin: 2px;
+}
+
+div.gallerytext {
+       font-size: 94%;
+       padding: 2px 4px;
+}