| Index: trunk/phase3/skins/monobook/main.css |
| — | — | @@ -311,64 +311,40 @@ |
| 312 | 312 | ** content styles |
| 313 | 313 | */ |
| 314 | 314 | |
| 315 | | -/* IE/mac fixes */ |
| 316 | | -#toc { |
| 317 | | - display: inline-table; |
| | 315 | +#toc, |
| | 316 | +.toc { |
| | 317 | + border: 1px solid #aaa; |
| | 318 | + background-color: #f9f9f9; |
| | 319 | + padding: 5px; |
| | 320 | + font-size: 95%; |
| | 321 | + text-align: center; |
| 318 | 322 | } |
| 319 | | -#toc div, #toc h2, #toc ul, #toc li, #toc a { |
| 320 | | - float: left; |
| 321 | | - clear: left; |
| | 323 | +#toc h2, |
| | 324 | +.toc h2 { |
| | 325 | + display: inline; |
| | 326 | + border: none; |
| | 327 | + padding: 0; |
| | 328 | + font-size: 100%; |
| | 329 | + font-weight: bold; |
| 322 | 330 | } |
| 323 | | -#toc .toctoggle * { |
| 324 | | - float: none; |
| 325 | | - clear: none; |
| | 331 | +#toc ul, |
| | 332 | +.toc ul { |
| | 333 | + list-style-type: none; |
| | 334 | + list-style-image: none; |
| | 335 | + margin-left: 0; |
| | 336 | + padding-left: 0; |
| | 337 | + text-align: left; |
| 326 | 338 | } |
| 327 | | -#toc h2 { |
| 328 | | - margin-right: .3em; |
| | 339 | +#toc ul ul, |
| | 340 | +.toc ul ul { |
| | 341 | + margin: 0 0 0 2em; |
| 329 | 342 | } |
| 330 | | -@media all { |
| 331 | | - #toc { |
| 332 | | - display: block; |
| 333 | | - text-align: center; |
| 334 | | - } |
| 335 | | - #toc * { |
| 336 | | - float: none !important; |
| 337 | | - } |
| 338 | | - #toc h2 { |
| 339 | | - margin-right: 0; |
| 340 | | - } |
| | 343 | +#toc .toctoggle, |
| | 344 | +.toc .toctoggle { |
| | 345 | + font-size: 94%; |
| 341 | 346 | } |
| 342 | | -/* end IE/mac fixes */ |
| 343 | 347 | |
| 344 | | -#toc { |
| 345 | | - border: 1px solid #aaa; |
| 346 | | - background-color: #f9f9f9; |
| 347 | | - padding: 5px; |
| 348 | | - font-size: 95%; |
| 349 | | - float: left; |
| 350 | | -} |
| 351 | | -#toc h2 { |
| 352 | | - display: inline; |
| 353 | | - border: none; |
| 354 | | - padding: 0; |
| 355 | | - font-size: 100%; |
| 356 | | - font-weight: bold; |
| 357 | | -} |
| 358 | | -#toc ul { |
| 359 | | - list-style-type: none; |
| 360 | | - list-style-image: none; |
| 361 | | - margin-left: 0; |
| 362 | | - padding-left: 0; |
| 363 | | - text-align: left; |
| 364 | | -} |
| 365 | | -#toc ul ul { |
| 366 | | - margin: 0 0 0 2em; |
| 367 | | -} |
| 368 | | -#toc .toctoggle { |
| 369 | | - font-size: 94%; |
| 370 | | - } |
| 371 | 348 | |
| 372 | | - |
| 373 | 349 | /* images */ |
| 374 | 350 | div.floatright, table.floatright { |
| 375 | 351 | clear: right; |
| — | — | @@ -1144,6 +1120,6 @@ |
| 1145 | 1121 | text-indent: -2em; |
| 1146 | 1122 | } |
| 1147 | 1123 | |
| 1148 | | -div.imagepagetoc table { |
| | 1124 | +div.imagepagetoc table.toc { |
| 1149 | 1125 | margin-bottom: 1em; |
| 1150 | 1126 | } |
| Index: trunk/phase3/skins/common/common.css |
| — | — | @@ -100,51 +100,38 @@ |
| 101 | 101 | img.tex { vertical-align: middle; } |
| 102 | 102 | span.texhtml { font-family: serif; } |
| 103 | 103 | |
| 104 | | -/* IE/mac fixes */ |
| 105 | | -#toc { |
| 106 | | - display: inline-table; |
| 107 | | -} |
| 108 | | -#toc h2, #toc div, #toc ul, #toc li { |
| 109 | | - float: left; |
| 110 | | - clear: left; |
| 111 | | -} |
| 112 | | -@media all { |
| 113 | | - #toc { |
| 114 | | - display: block; |
| 115 | | - text-align: center; |
| 116 | | - } |
| 117 | | - #toc * { |
| 118 | | - float: none!important; |
| 119 | | - } |
| 120 | | -} |
| 121 | | -/* end IE/mac fixes */ |
| 122 | 104 | |
| 123 | | -#toc { |
| 124 | | - border: 1px solid #88a; |
| 125 | | - background-color: #f7f8ff; |
| 126 | | - padding: 5px; |
| 127 | | - font-size: 95%; |
| 128 | | - float: left; |
| | 105 | +#toc, |
| | 106 | +.toc { |
| | 107 | + border: 1px solid #bba; |
| | 108 | + background-color: #f7f8ff; |
| | 109 | + padding: 5px; |
| | 110 | + font-size: 95%; |
| | 111 | + text-align: center; |
| 129 | 112 | } |
| 130 | | -#toc h2 { |
| 131 | | - display: inline; |
| 132 | | - border: none; |
| 133 | | - padding: 0; |
| 134 | | - font-size: 100%; |
| 135 | | - font-weight: bold; |
| | 113 | +#toc h2, |
| | 114 | +.toc h2 { |
| | 115 | + display: inline; |
| | 116 | + border: none; |
| | 117 | + padding: 0; |
| | 118 | + font-size: 100%; |
| | 119 | + font-weight: bold; |
| 136 | 120 | } |
| 137 | | -#toc ul { |
| 138 | | - list-style-type: none; |
| 139 | | - list-style-image: none; |
| 140 | | - margin-left: 0; |
| 141 | | - padding-left: 0; |
| 142 | | - text-align: left; |
| | 121 | +#toc ul, |
| | 122 | +.toc ul { |
| | 123 | + list-style-type: none; |
| | 124 | + list-style-image: none; |
| | 125 | + margin-left: 0; |
| | 126 | + padding-left: 0; |
| | 127 | + text-align: left; |
| 143 | 128 | } |
| 144 | | -#toc ul ul { |
| 145 | | - margin: 0 0 0 2em; |
| | 129 | +#toc ul ul, |
| | 130 | +.toc ul ul { |
| | 131 | + margin: 0 0 0 2em; |
| 146 | 132 | } |
| 147 | | -#toc .toctoggle { |
| 148 | | - font-size: 95%; |
| | 133 | +#toc .toctoggle, |
| | 134 | +.toc .toctoggle { |
| | 135 | + font-size: 94%; |
| 149 | 136 | } |
| 150 | 137 | |
| 151 | 138 | |
| — | — | @@ -324,3 +311,38 @@ |
| 325 | 312 | color: #888; |
| 326 | 313 | font-style: italic; |
| 327 | 314 | } |
| | 315 | + |
| | 316 | + |
| | 317 | +/* Classes for EXIF data display */ |
| | 318 | +table.exif { |
| | 319 | + margin-left: 0.5em; |
| | 320 | +} |
| | 321 | + |
| | 322 | +table.exif caption { font-weight: bold; } |
| | 323 | +table.exif th { font-weight: normal; } |
| | 324 | +table.exif td { padding: 0.1em; } |
| | 325 | + |
| | 326 | +table.exif { |
| | 327 | + border: none; |
| | 328 | + border-collapse: collapse; |
| | 329 | +} |
| | 330 | +table.exif td, table.exif th { |
| | 331 | + border: 1px solid #aaaaaa; |
| | 332 | + padding-left: 4px; |
| | 333 | + padding-right: 4px; |
| | 334 | +} |
| | 335 | +table.exif th { |
| | 336 | + background-color: #f9f9f9; |
| | 337 | +} |
| | 338 | +table.exif td { |
| | 339 | + background-color: #fcfcfc; |
| | 340 | +} |
| | 341 | +table.exif td.spacer { |
| | 342 | + background: inherit; |
| | 343 | + border-top: none; |
| | 344 | + border-bottom: none; |
| | 345 | +} |
| | 346 | + |
| | 347 | +.visualClear { |
| | 348 | + clear: both; |
| | 349 | +} |
| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -56,12 +56,12 @@ |
| 57 | 57 | function showTOC() { |
| 58 | 58 | global $wgOut, $wgShowEXIF, $wgLang; |
| 59 | 59 | |
| 60 | | - $r= '<div class="imagepagetoc"><table id="toc" border="0"><tr><td valign="top"><b>'.wfMsg( 'toc' ).'</b><br />'; |
| 61 | | - $r .= '<a href="#toc">' . $wgLang->getNStext( NS_IMAGE ) . '</a href> - '; |
| 62 | | - $r .= '<a href="#imghistory">' . wfMsg( 'imghistory' ) . '</a href> - '; |
| 63 | | - $r .= '<a href="#imagelinks">' . wfMsg( 'imagelinks' ) . '</a href>'; |
| | 60 | + $r= '<div class="imagepagetoc"><table class="toc"><tr><td><b>'.htmlspecialchars( wfMsg( 'toc' )) .'</b><br />'; |
| | 61 | + $r .= '<a href="#toc">' . htmlspecialchars( $wgLang->getNStext( NS_IMAGE ) ) . '</a> - '; |
| | 62 | + $r .= '<a href="#imghistory">' . htmlspecialchars( wfMsg( 'imghistory' ) ) . '</a> - '; |
| | 63 | + $r .= '<a href="#imagelinks">' . htmlspecialchars( wfMsg( 'imagelinks' ) ) . '</a>'; |
| 64 | 64 | if ( $wgShowEXIF ) { |
| 65 | | - $r .= ' - <a href="#exifdata">' . wfMsg( 'exifdata' ) . '</a>'; |
| | 65 | + $r .= ' - <a href="#exifdata">' . htmlspecialchars( wfMsg( 'exifdata' ) ) . '</a>'; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | |
| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -718,18 +718,17 @@ |
| 719 | 719 | |
| 720 | 720 | /** @todo document */ |
| 721 | 721 | function tocList($toc) { |
| 722 | | - return "<div id='toc'>\n" |
| | 722 | + return "<table id='toc' class='toc'><tr><td>" |
| 723 | 723 | . "<div id='toctitle'><h2>" . wfMsg('toc') . "</h2></div>\n" |
| 724 | 724 | . $toc |
| 725 | | - . "</ul>\n</div>\n" |
| | 725 | + . "</ul>\n</td></tr></table>\n" |
| 726 | 726 | . '<script type="text/javascript">' |
| 727 | 727 | . ' if (window.showTocToggle) {' |
| 728 | 728 | . ' var tocShowText = "' . addslashes( wfMsg('showtoc') ) . '";' |
| 729 | 729 | . ' var tocHideText = "' . addslashes( wfMsg('hidetoc') ) . '"; ' |
| 730 | 730 | . ' showTocToggle();' |
| 731 | 731 | . ' } ' |
| 732 | | - . '</script>' |
| 733 | | - . "<div class='visualClear'></div>\n"; |
| | 732 | + . "</script>\n"; |
| 734 | 733 | } |
| 735 | 734 | |
| 736 | 735 | /** @todo document */ |