| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -19,9 +19,10 @@ |
| 20 | 20 | } |
| 21 | 21 | if( $wgUsePHPTal ) { |
| 22 | 22 | #$wgValidSkinNames[] = "PHPTal"; |
| 23 | | - $wgValidSkinNames['davinci'] = "DaVinci"; |
| 24 | | - $wgValidSkinNames['mono'] = "Mono"; |
| | 23 | + #$wgValidSkinNames['davinci'] = "DaVinci"; |
| | 24 | + #$wgValidSkinNames['mono'] = "Mono"; |
| 25 | 25 | $wgValidSkinNames['monobook'] = "MonoBook"; |
| | 26 | + #$wgValidSkinNames['monobookminimal'] = "MonoBookMinimal"; |
| 26 | 27 | } |
| 27 | 28 | |
| 28 | 29 | include_once( "RecentChange.php" ); |
| — | — | @@ -1550,7 +1551,7 @@ |
| 1551 | 1552 | " <img border=\"0\" src=\"{$url}\" alt=\"{$alt}\" />\n </a>"; |
| 1552 | 1553 | } |
| 1553 | 1554 | if ( "" != $align ) { |
| 1554 | | - $s = "<div class=\"float{$align}\">{$s}\n</div>"; |
| | 1555 | + $s = "<div class=\"float{$align}\"><span>{$s}\n</span></div>"; |
| 1555 | 1556 | } |
| 1556 | 1557 | return $prefix.$s.$postfix; |
| 1557 | 1558 | } |
| — | — | @@ -1688,7 +1689,7 @@ |
| 1689 | 1690 | $magnifyalign = $wgLang->isRTL() ? "left" : "right"; |
| 1690 | 1691 | $textalign = $wgLang->isRTL() ? " style=\"text-align:right\"" : ""; |
| 1691 | 1692 | |
| 1692 | | - $s = "<div class=\"thumbnail-{$align}\" style=\"width:{$boxwidth}px;\">"; |
| | 1693 | + $s = "<div class=\"thumbnail-{$align}\" style=\"width:{$boxwidth}px;\"><div>"; |
| 1693 | 1694 | if ( $thumbUrl == "" ) { |
| 1694 | 1695 | $s .= str_replace( "$1", $name, wfMsg("missingimage") ); |
| 1695 | 1696 | } else { |
| — | — | @@ -1699,7 +1700,7 @@ |
| 1700 | 1701 | ' <img border="0" src="'.$wgUploadPath.'/magnify-clip.png" ' . |
| 1701 | 1702 | 'width="26" height="24" align="'.$magnifyalign.'" alt="'.$more.'" /> </a>'."\n"; |
| 1702 | 1703 | } |
| 1703 | | - $s .= ' <p'.$textalign.'>'.$label."</p>\n</div>"; |
| | 1704 | + $s .= ' <p'.$textalign.'>'.$label."</p>\n</div></div>"; |
| 1704 | 1705 | return $s; |
| 1705 | 1706 | } |
| 1706 | 1707 | |
| — | — | @@ -2276,11 +2277,11 @@ |
| 2277 | 2278 | # try min-width & co when somebody gets a chance |
| 2278 | 2279 | $hideline = " <script type='text/javascript'>showTocToggle(\"" . addslashes( wfMsg("showtoc") ) . "\",\"" . addslashes( wfMsg("hidetoc") ) . "\")</script>"; |
| 2279 | 2280 | return |
| 2280 | | - "<p><table border=\"0\" id=\"toc\"><tr><td align=\"center\">\n". |
| | 2281 | + "<table border=\"0\" id=\"toc\"><tr><td align=\"center\">\n". |
| 2281 | 2282 | "<b>".wfMsg("toc")."</b>" . |
| 2282 | 2283 | $hideline . |
| 2283 | 2284 | "</td></tr><tr id='tocinside'><td>\n". |
| 2284 | | - $toc."</td></tr></table><P>\n"; |
| | 2285 | + $toc."</td></tr></table>\n"; |
| 2285 | 2286 | } |
| 2286 | 2287 | |
| 2287 | 2288 | # These two do not check for permissions: check $wgTitle->userCanEdit before calling them |