* Image caption elements are now styled using a linked CSS (fixes bug 12869)

* A bug with Gecko browsers is fixed (lists were not floated correctly in RTL).

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7a355af..7426f97 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -374,6 +374,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   version
 * (bug 12952) Using Nosuchusershort instead of Nosuchuser when account creation
   is disabled
+* (bug 12869) Magnify icon alignment should be adjusted using linked CSS
 
 == Parser changes in 1.12 ==
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ad79928..8585413 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1320,7 +1320,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '112';
+$wgStyleVersion = '113';
 
 
 # Server-side caching:

diff --git a/includes/Linker.php b/includes/Linker.php
index 11d3854..658b450 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -677,8 +677,6 @@ class Linker {
                $url = $title->getLocalURL( $query );
 
                $more = htmlspecialchars( wfMsg( 'thumbnail-more' ) );
-               $magnifyalign = $wgContLang->isRTL() ? 'left' : 'right';
-               $textalign = $wgContLang->isRTL() ? ' style="text-align:right"' : '';
 
                $s = "<div class=\"thumb t{$fp['align']}\"><div class=\"thumbinner\" style=\"width:{$outerWidth}px;\">";
                if( !$exists ) {
@@ -695,13 +693,13 @@ class Linker {
                        if ( isset( $fp['framed'] ) ) {
                                $zoomicon="";
                        } else {
-                               $zoomicon =  '<div class="magnify" style="float:'.$magnifyalign.'">'.
+                               $zoomicon =  '<div class="magnify">'.
                                        '<a href="'.$url.'" class="internal" title="'.$more.'">'.
                                        '<img src="'.$wgStylePath.'/common/images/magnify-clip.png" ' .
                                        'width="15" height="11" alt="" /></a></div>';
                        }
                }
-               $s .= '  <div class="thumbcaption"'.$textalign.'>'.$zoomicon.$fp['caption']."</div></div></div>";
+               $s .= '  <div class="thumbcaption">'.$zoomicon.$fp['caption']."</div></div></div>";
                return str_replace("\n", ' ', $s);
        }
 

diff --git a/skins/common/shared.css b/skins/common/shared.css
index ccc72b1..4ede168 100644 (file)
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -68,3 +68,18 @@ body.rtl td.mw-submit { text-align: right; }
 
 td.mw-label { vertical-align: top; }
 td.mw-submit { white-space: nowrap; }
+
+/**
+ * Lists (fixing for RTL display_
+ */
+body.rtl #body-content ul { display:table; }
+body.rtl #body-content ol { display:table; }
+
+/**
+ * Image captions
+ */
+body.rtl .thumbcaption { text-aling:right; }
+body.rtl .magnify { float:left; }
+
+body.ltr .thumbcaption { text-aling:left; }
+body.ltr .magnify { float:right; }
\ No newline at end of file