Move image TOC into content area; a float tends to overlap and crunch in

ugly ways when the title is long or the window is small.
The markup of the toc itself is still a bit odd (table, may conflict with
wiki toc if the description includes one).

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 6cd7b27..e4747a3 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -61,7 +61,7 @@ class ImagePage extends Article {
                $r .= '<a href="#imghistory">' . wfMsg( 'imghistory' ) . '</a href> - ';
                $r .= '<a href="#imagelinks">' . wfMsg( 'imagelinks' ) . '</a href>';
                if ( $wgShowEXIF ) {
-                       $r .= ' - <a href="#showexif">' . wfMsg( 'exifdata' ) . '</a>';
+                       $r .= ' - <a href="#exifdata">' . wfMsg( 'exifdata' ) . '</a>';
                }
 
                        

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index ef7b370..66c645a 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -1144,7 +1144,6 @@ table.exif td.spacer {
        text-indent: -2em;
 }
 
-div.imagepagetoc {
-       float: right;
-       margin-top: -4em;
+div.imagepagetoc table {
+       margin-bottom: 1em;
 }