diff options
Diffstat (limited to 'skins')
28 files changed, 274 insertions, 69 deletions
diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php index f3806dc9..c650cbee 100644 --- a/skins/CologneBlue.php +++ b/skins/CologneBlue.php @@ -66,7 +66,7 @@ class SkinCologneBlue extends Skin { function doAfterContent() { - global $wgOut; + global $wgOut, $wgLang; $s = "\n</div><br clear='all' />\n"; @@ -80,9 +80,11 @@ class SkinCologneBlue extends Skin { $s .= "<td class='bottom' align='center' valign='top'>"; $s .= $this->bottomLinks(); - $s .= "\n<br />" . $this->makeKnownLinkObj( Title::newMainPage() ) . " | " - . $this->aboutLink() . " | " - . $this->searchForm( wfMsg( "qbfind" ) ); + $s .= $wgLang->pipeList( array( + "\n<br />" . $this->makeKnownLinkObj( Title::newMainPage() ), + $this->aboutLink(), + $this->searchForm( wfMsg( "qbfind" ) ) + ) ); $s .= "\n<br />" . $this->pageStats(); @@ -121,7 +123,7 @@ class SkinCologneBlue extends Skin { } function sysLinks() { - global $wgUser, $wgContLang, $wgTitle; + global $wgUser, $wgLang, $wgContLang, $wgTitle; $li = $wgContLang->specialPage("Userlogin"); $lo = $wgContLang->specialPage("Userlogout"); @@ -132,29 +134,28 @@ class SkinCologneBlue extends Skin { $q = "returnto={$rt}"; } - $s = "" . - $this->mainPageLink() - . " | " . - $this->makeKnownLink( wfMsgForContent( "aboutpage" ), wfMsg( "about" ) ) - . " | " . - $this->makeKnownLink( wfMsgForContent( "helppage" ), wfMsg( "help" ) ) - . " | " . - $this->makeKnownLink( wfMsgForContent( "faqpage" ), wfMsg("faq") ) - . " | " . - $this->specialLink( "specialpages" ); + $s = array( + $this->mainPageLink(), + $this->makeKnownLink( wfMsgForContent( "aboutpage" ), wfMsg( "about" ) ), + $this->makeKnownLink( wfMsgForContent( "helppage" ), wfMsg( "help" ) ), + $this->makeKnownLink( wfMsgForContent( "faqpage" ), wfMsg("faq") ), + $this->specialLink( "specialpages" ) + ); /* show links to different language variants */ - $s .= $this->variantLinks(); - $s .= $this->extensionTabLinks(); - - $s .= " | "; + if( $this->variantLinks() ) { + $s[] = $this->variantLinks(); + } + if( $this->extensionTabLinks() ) { + $s[] = $this->extensionTabLinks(); + } if ( $wgUser->isLoggedIn() ) { - $s .= $this->makeKnownLink( $lo, wfMsg( "logout" ), $q ); + $s[] = $this->makeKnownLink( $lo, wfMsg( "logout" ), $q ); } else { - $s .= $this->makeKnownLink( $li, wfMsg( "login" ), $q ); + $s[] = $this->makeKnownLink( $li, wfMsg( "login" ), $q ); } - return $s; + return $wgLang->pipeList( $s ); } /** @@ -262,7 +263,7 @@ class SkinCologneBlue extends Skin { $s .= $this->menuHead( "qbspecialpages" ) . $this->specialLink( "newpages" ) - . $sep . $this->specialLink( "imagelist" ) + . $sep . $this->specialLink( "listfiles" ) . $sep . $this->specialLink( "statistics" ); if ( $wgUser->isLoggedIn() && $wgEnableUploads ) { $s .= $sep . $this->specialLink( "upload" ); @@ -289,7 +290,7 @@ class SkinCologneBlue extends Skin { function searchForm( $label = "" ) { - global $wgRequest; + global $wgRequest, $wgUseTwoButtonsSearchForm; $search = $wgRequest->getText( 'search' ); $action = $this->escapeSearchLink(); @@ -298,8 +299,14 @@ class SkinCologneBlue extends Skin { $s .= "<input type='text' id=\"searchInput{$this->searchboxes}\" class=\"mw-searchInput\" name=\"search\" size=\"14\" value=\"" . htmlspecialchars(substr($search,0,256)) . "\" /><br />" - . "<input type='submit' id=\"searchGoButton{$this->searchboxes}\" class=\"searchButton\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( "searcharticle" ) ) . "\" />" - . "<input type='submit' id=\"mw-searchButton{$this->searchboxes}\" class=\"searchButton\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" /></form>"; + . "<input type='submit' id=\"searchGoButton{$this->searchboxes}\" class=\"searchButton\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( "searcharticle" ) ) . "\" />"; + + if ($wgUseTwoButtonsSearchForm) + $s .= "<input type='submit' id=\"mw-searchButton{$this->searchboxes}\" class=\"searchButton\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" />\n"; + else + $s .= '<div><a href="$action" rel="search">' . wfMsg ('powersearch-legend') . "</a></div>\n"; + + $s .= '</form>'; // Ensure unique id's for search boxes made after the first $this->searchboxes = $this->searchboxes == '' ? 2 : $this->searchboxes + 1; diff --git a/skins/Modern.php b/skins/Modern.php index cb24bafa..6b6651d1 100644 --- a/skins/Modern.php +++ b/skins/Modern.php @@ -245,17 +245,22 @@ class ModernTemplate extends QuickTemplate { /*************************************************************************************************/ function searchBox() { + global $wgUseTwoButtonsSearchForm; ?> <!-- search --> <div id="p-search" class="portlet"> <h5><label for="searchInput"><?php $this->msg('search') ?></label></h5> <div id="searchBody" class="pBody"> - <form action="<?php $this->text('searchaction') ?>" id="searchform"><div> + <form action="<?php $this->text('wgScript') ?>" id="searchform"><div> + <input type='hidden' name="title" value="<?php $this->text('searchtitle') ?>"/> <input id="searchInput" name="search" type="text"<?php echo $this->skin->tooltipAndAccesskey('search'); if( isset( $this->data['search'] ) ) { ?> value="<?php $this->text('search') ?>"<?php } ?> /> - <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> /> - <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /> + <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> /><?php if ($wgUseTwoButtonsSearchForm) { ?> + <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /><?php } else { ?> + + <div><a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a></div><?php } ?> + </div></form> </div><!-- pBody --> </div><!-- portlet --> @@ -289,8 +294,8 @@ class ModernTemplate extends QuickTemplate { <?php } if($this->data['feeds']) { ?> <li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) { - ?><span id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>"><a href="<?php - echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a> </span> + ?><a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php + echo htmlspecialchars($feed['href']) ?>" rel="alternate" type="application/<?php echo $key ?>+xml" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a> <?php } ?></li><?php } @@ -304,7 +309,7 @@ class ModernTemplate extends QuickTemplate { if(!empty($this->data['nav_urls']['print']['href'])) { ?> <li id="t-print"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['print']['href']) - ?>"<?php echo $this->skin->tooltipAndAccesskey('t-print') ?>><?php $this->msg('printableversion') ?></a></li><?php + ?>" rel="alternate"<?php echo $this->skin->tooltipAndAccesskey('t-print') ?>><?php $this->msg('printableversion') ?></a></li><?php } if(!empty($this->data['nav_urls']['permalink']['href'])) { ?> diff --git a/skins/MonoBook.php b/skins/MonoBook.php index 8afc4982..2312de0f 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -178,7 +178,7 @@ class MonoBookTemplate extends QuickTemplate { <div class="portlet" id="p-logo"> <a style="background-image: url(<?php $this->text('logopath') ?>);" <?php ?>href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"<?php - echo $skin->tooltipAndAccesskey('n-mainpage') ?>></a> + echo $skin->tooltipAndAccesskey('p-logo') ?>></a> </div> <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script> <?php @@ -249,16 +249,21 @@ class MonoBookTemplate extends QuickTemplate { /*************************************************************************************************/ function searchBox() { + global $wgUseTwoButtonsSearchForm; ?> <div id="p-search" class="portlet"> <h5><label for="searchInput"><?php $this->msg('search') ?></label></h5> <div id="searchBody" class="pBody"> - <form action="<?php $this->text('searchaction') ?>" id="searchform"><div> + <form action="<?php $this->text('wgScript') ?>" id="searchform"><div> + <input type='hidden' name="title" value="<?php $this->text('searchtitle') ?>"/> <input id="searchInput" name="search" type="text"<?php echo $this->skin->tooltipAndAccesskey('search'); if( isset( $this->data['search'] ) ) { ?> value="<?php $this->text('search') ?>"<?php } ?> /> - <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> /> - <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /> + <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> /><?php if ($wgUseTwoButtonsSearchForm) { ?> + <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /><?php } else { ?> + + <div><a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a></div><?php } ?> + </div></form> </div> </div> @@ -291,8 +296,8 @@ class MonoBookTemplate extends QuickTemplate { <?php } if($this->data['feeds']) { ?> <li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) { - ?><span id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>"><a href="<?php - echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a> </span> + ?><a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php + echo htmlspecialchars($feed['href']) ?>" rel="alternate" type="application/<?php echo $key ?>+xml" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a> <?php } ?></li><?php } @@ -306,7 +311,7 @@ class MonoBookTemplate extends QuickTemplate { if(!empty($this->data['nav_urls']['print']['href'])) { ?> <li id="t-print"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['print']['href']) - ?>"<?php echo $this->skin->tooltipAndAccesskey('t-print') ?>><?php $this->msg('printableversion') ?></a></li><?php + ?>" rel="alternate"<?php echo $this->skin->tooltipAndAccesskey('t-print') ?>><?php $this->msg('printableversion') ?></a></li><?php } if(!empty($this->data['nav_urls']['permalink']['href'])) { ?> diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php index 2b9b2f67..d4dee0f4 100644 --- a/skins/Nostalgia.php +++ b/skins/Nostalgia.php @@ -45,8 +45,7 @@ class SkinNostalgia extends Skin { $cat = $this->getCategoryLinks(); if($cat) $s .= "<br />" . $cat; - $s .= "<br clear='all' /></div><hr />\n</div ->\n"; + $s .= "<br clear='all' /></div><hr />\n</div>\n"; $s .= "\n<div id='article'>"; return $s; @@ -60,8 +59,7 @@ class SkinNostalgia extends Skin { . $this->specialLink( 'recentchanges' ); if ( $wgOut->isArticle() ) { - $s .= $sep . $this->editThisPage() - . $sep . $this->historyLink(); + $s .= $sep . '<strong>' . $this->editThisPage() . '</strong>' . $sep . $this->historyLink(); } /* show links to different language variants */ diff --git a/skins/Standard.php b/skins/Standard.php index 1f3cab95..694bc5e3 100644 --- a/skins/Standard.php +++ b/skins/Standard.php @@ -82,7 +82,7 @@ class SkinStandard extends Skin { } function doAfterContent() { - global $wgContLang; + global $wgContLang, $wgLang; $fname = 'SkinStandard::doAfterContent'; wfProfileIn( $fname ); wfProfileIn( $fname.'-1' ); @@ -108,10 +108,11 @@ class SkinStandard extends Skin { $s .= "<td class='bottom' align='$l' valign='top'>"; $s .= $this->bottomLinks(); - $s .= "\n<br />" . $this->mainPageLink() - . ' | ' . $this->aboutLink() - . ' | ' . $this->specialLink( 'recentchanges' ) - . ' | ' . $this->searchForm() + $s .= "\n<br />" . $wgLang->pipeList( array( + $this->mainPageLink(), + $this->aboutLink(), + $this->specialLink( 'recentchanges' ), + $this->searchForm() ) ) . '<br /><span id="pagestats">' . $this->pageStats() . '</span>'; $s .= "</td>"; diff --git a/skins/common/block.js b/skins/common/block.js index 6f7be0cd..90211efa 100644 --- a/skins/common/block.js +++ b/skins/common/block.js @@ -31,6 +31,7 @@ function updateBlockOptions() { var addy = target.value; var isEmpty = addy.match(/^\s*$/); var isIp = addy.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|:(:[0-9A-Fa-f]{1,4}){1,7}|[0-9A-Fa-f]{1,4}(:{1,2}[0-9A-Fa-f]{1,4}|::$){1,7})(\/\d+)?$/); + var isIpRange = isIp && addy.match(/\/\d+$/); var anonymousRow = document.getElementById('wpAnonOnlyRow'); if( anonymousRow ) { @@ -51,4 +52,9 @@ function updateBlockOptions() { if( hideuserRow ) { hideuserRow.style.display = isIp && !isEmpty ? 'none' : ''; } + + var watchuserRow = document.getElementById('wpEnableWatchUser'); + if( watchuserRow ) { + watchuserRow.style.display = isIpRange && !isEmpty ? 'none' : ''; + } } diff --git a/skins/common/changepassword.js b/skins/common/changepassword.js new file mode 100644 index 00000000..1e3e2069 --- /dev/null +++ b/skins/common/changepassword.js @@ -0,0 +1,16 @@ + +function onNameChange() { + if ( wgUserName != document.getElementById('wpName').value ) { + document.getElementById('wpPassword').disabled = true; + document.getElementById('wpComment').disabled = false; + } else { + document.getElementById('wpPassword').disabled = false; + document.getElementById('wpComment').disabled = true; + } +} + +function onNameChangeHook() { + document.getElementById( 'wpName' ).onblur = onNameChange; +} + +addOnloadHook( onNameChangeHook ); diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css index 2723bbef..2329d233 100644 --- a/skins/common/cologneblue.css +++ b/skins/common/cologneblue.css @@ -1,6 +1,11 @@ body { margin: 0px; padding: 0px; color: black; } #specialform { display: inline; } #content { top: 0; margin: 0; padding: 0; } +#mw-data-after-content { + font-family: Verdana, Arial, sans-serif; + color: black; + font-size: 8pt; +} #topbar { padding: 0px; } #powersearch { background: #DDEEFF; border-style: solid; border-width: 1px; padding: 2px; diff --git a/skins/common/common_rtl.css b/skins/common/common_rtl.css index 11fc995b..4f075ae3 100644 --- a/skins/common/common_rtl.css +++ b/skins/common/common_rtl.css @@ -46,3 +46,9 @@ table.filehistory th { html > body div#article ul { display: table; } + +/* feed links */ +a.feedlink { + background: none !important; + padding-left: 0 !important; +} diff --git a/skins/common/history.js b/skins/common/history.js index 57e61849..6a84b997 100644 --- a/skins/common/history.js +++ b/skins/common/history.js @@ -27,7 +27,13 @@ function diffcheck() { } if (oli) { // it's the second checked radio if (inputs[1].checked) { - oli.className = "selected"; + if ( (typeof oli.className) != 'undefined') { + oli.classNameOriginal = oli.className.replace( 'selected', '' ); + } else { + oli.classNameOriginal = ''; + } + + oli.className = "selected "+oli.classNameOriginal; return false; } } else if (inputs[0].checked) { @@ -42,7 +48,13 @@ function diffcheck() { if (dli) { inputs[1].style.visibility = 'hidden'; } - lis[i].className = "selected"; + if ( (typeof lis[i].className) != 'undefined') { + lis[i].classNameOriginal = lis[i].className.replace( 'selected', '' ); + } else { + lis[i].classNameOriginal = ''; + } + + lis[i].className = "selected "+lis[i].classNameOriginal; oli = lis[i]; } else { // no radio is checked in this row if (!oli) { @@ -55,7 +67,7 @@ function diffcheck() { } else { inputs[1].style.visibility = 'visible'; } - lis[i].className = ""; + lis[i].className = lis[i].classNameOriginal; } } } diff --git a/skins/common/images/feed-icon.png b/skins/common/images/feed-icon.png Binary files differnew file mode 100644 index 00000000..7188fa23 --- /dev/null +++ b/skins/common/images/feed-icon.png diff --git a/skins/common/images/nextredirectltr.png b/skins/common/images/nextredirectltr.png Binary files differnew file mode 100644 index 00000000..7d60cdcf --- /dev/null +++ b/skins/common/images/nextredirectltr.png diff --git a/skins/common/images/nextredirectrtl.png b/skins/common/images/nextredirectrtl.png Binary files differnew file mode 100644 index 00000000..3d5b3959 --- /dev/null +++ b/skins/common/images/nextredirectrtl.png diff --git a/skins/common/shared.css b/skins/common/shared.css index bd306167..bb08c648 100644 --- a/skins/common/shared.css +++ b/skins/common/shared.css @@ -14,7 +14,7 @@ span.texhtml { font-family: serif; } #wikiPreview.ontop { margin-bottom: 1em; } /* Stop floats from intruding into edit area in previews */ -#toolbar, #wpTextbox1 { clear: both; } +#editform, #toolbar, #wpTextbox1 { clear: both; } div#mw-js-message { margin: 1em 5%; @@ -253,10 +253,12 @@ td.os-suggest-result-hl { /* * Special:ListGroupRights styling * Special:Statistics styling + * Special:Tags styling */ table.mw-listgrouprights-table, -table.mw-statistics-table { +table.mw-statistics-table, +table.mw-tags-table { border: 1px solid #ccc; border-collapse: collapse; } @@ -266,7 +268,8 @@ table.mw-listgrouprights-table tr { } table.mw-listgrouprights-table td, table.mw-listgrouprights-table th, -table.mw-statistics-table td, table.mw-statistics-table th { +table.mw-statistics-table td, table.mw-statistics-table th, +table.mw-tags-table td, table.mw-tags-table th { padding: 0.5em 0.2em 0.5em 0.2em; border: 1px solid #ccc; } @@ -297,6 +300,19 @@ td#mw-emailuser-sender, td#mw-emailuser-recipient { font-weight: bold; } +/* Special:Prefixindex styling */ +table#mw-prefixindex-list-table, +table#mw-prefixindex-nav-table { + width: 98%; + background-color: transparent; +} +td#mw-prefixindex-nav-form { + font-size: smaller; + margin-bottom: 1em; + text-align: right; + vertical-align: top; +} + /* * Recreating deleted page warning * Reupload file warning @@ -311,3 +327,16 @@ div.mw-warning-with-logexcerpt { div.mw-warning-with-logexcerpt ul li { font-size: 90%; } + +/* (show/hide) revision deletion links */ +span.mw-revdelundel-link, +strong.mw-revdelundel-link { + font-family: monospace; + font-size: smaller; +} + +/* feed links */ +a.feedlink { + background: url("images/feed-icon.png") center left no-repeat; + padding-left: 16px; +} diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js index 089d22d7..397dac91 100644 --- a/skins/common/wikibits.js +++ b/skins/common/wikibits.js @@ -14,6 +14,7 @@ var is_khtml = navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled ); // For accesskeys; note that FF3+ is included here! var is_ff2 = /firefox\/[2-9]|minefield\/3/.test( clientPC ); +var is_ff2_ = /firefox\/2/.test( clientPC ); // These aren't used here, but some custom scripts rely on them var is_ff2_win = is_ff2 && clientPC.indexOf('windows') != -1; var is_ff2_x11 = is_ff2 && clientPC.indexOf('x11') != -1; @@ -91,8 +92,12 @@ if (typeof stylepath != 'undefined' && typeof skin != 'undefined') { importStylesheetURI(stylepath+'/'+skin+'/Opera6Fixes.css'); } else if (is_opera_seven && !is_opera_95) { importStylesheetURI(stylepath+'/'+skin+'/Opera7Fixes.css'); + } else if (is_opera_95) { + importStylesheetURI(stylepath+'/'+skin+'/Opera9Fixes.css'); } else if (is_khtml) { importStylesheetURI(stylepath+'/'+skin+'/KHTMLFixes.css'); + } else if (is_ff2_) { + importStylesheetURI(stylepath+'/'+skin+'/FF2Fixes.css'); } } @@ -807,7 +812,7 @@ function ts_parseFloat( s ) { } num = parseFloat(s.replace(/,/g, "")); - return (isNaN(num) ? s : num); + return (isNaN(num) ? 0 : num); } function ts_currencyToSortKey( s ) { diff --git a/skins/modern/main.css b/skins/modern/main.css index d9537c18..80ef008c 100644 --- a/skins/modern/main.css +++ b/skins/modern/main.css @@ -158,6 +158,10 @@ textarea { margin-right: auto; } +#p-search #searchform div div { + margin-top: .4em; +} + .portlet h5 { padding: 0.1em 0 0.3em 1em; margin: 0 0 0 0; diff --git a/skins/modern/rtl.css b/skins/modern/rtl.css index d7aae769..d2dcacec 100644 --- a/skins/modern/rtl.css +++ b/skins/modern/rtl.css @@ -44,7 +44,7 @@ div.tleft, div.floatleft, table.floatleft { } /* Fix link icons */ -.external { +.external, a.feedlink { padding: 0 !important; background: none !important; } @@ -151,3 +151,9 @@ html > body div.pBody ul li { html > body div#mw_contentholder ul#filetoc { display: block; } + +/* Special:Prefixindex styling */ +td#mw-prefixindex-nav-form { + text-align: left; +} + diff --git a/skins/monobook/FF2Fixes.css b/skins/monobook/FF2Fixes.css new file mode 100644 index 00000000..c8b65f50 --- /dev/null +++ b/skins/monobook/FF2Fixes.css @@ -0,0 +1,4 @@ +.rtl .external, a.feedlink { + padding: 0 !important; + background: none !important; +} diff --git a/skins/monobook/IE60Fixes.css b/skins/monobook/IE60Fixes.css index bf78413d..e6e447f6 100644 --- a/skins/monobook/IE60Fixes.css +++ b/skins/monobook/IE60Fixes.css @@ -61,6 +61,17 @@ padding-right: 13px; } +.rtl #bodyContent a.external { + background-image: url(external-rtl.png); + padding-right: 13px; +} + +.rtl a.feedlink { + background-position: right; + padding-right: 0; + padding-left: 16px; +} + /* show the hand */ #p-logo a, #p-logo a:hover { diff --git a/skins/monobook/IE70Fixes.css b/skins/monobook/IE70Fixes.css index 43ff7076..00145860 100644 --- a/skins/monobook/IE70Fixes.css +++ b/skins/monobook/IE70Fixes.css @@ -18,6 +18,16 @@ margin-top: 160px; } +.rtl #bodyContent a.external { + background-image: url(external-rtl.png); + padding: 0 13px 0 0; +} + +.rtl a.feedlink { + background-position: right; + padding-right: 0; + padding-left: 16px; +} /* the tabs */ #p-cactions { diff --git a/skins/monobook/Opera6Fixes.css b/skins/monobook/Opera6Fixes.css index 88704739..2a3d78f8 100644 --- a/skins/monobook/Opera6Fixes.css +++ b/skins/monobook/Opera6Fixes.css @@ -12,3 +12,9 @@ background: url(external.png) center right no-repeat; padding-right: 13px; } + +.rtl a.feedlink { + background-position: right; + padding-right: 0; + padding-left: 16px; +} diff --git a/skins/monobook/Opera7Fixes.css b/skins/monobook/Opera7Fixes.css index 446ea44c..1dcba7c9 100644 --- a/skins/monobook/Opera7Fixes.css +++ b/skins/monobook/Opera7Fixes.css @@ -9,3 +9,13 @@ background: url(external.png) center right no-repeat; padding-right: 13px; } +.rtl #bodyContent a.external { + background-image: url(external-rtl.png); + padding-right: 13px; +} + +.rtl a.feedlink { + background-position: right; + padding-right: 0; + padding-left: 16px; +} diff --git a/skins/monobook/Opera9Fixes.css b/skins/monobook/Opera9Fixes.css new file mode 100644 index 00000000..9c312a84 --- /dev/null +++ b/skins/monobook/Opera9Fixes.css @@ -0,0 +1,11 @@ +.rtl #bodyContent a.external { + background-image: url(external-rtl.png); + padding-right: 13px; + padding-left: 0; +} + +.rtl a.feedlink { + background-position: right; + padding-right: 0; + padding-left: 16px; +} diff --git a/skins/monobook/external-rtl.png b/skins/monobook/external-rtl.png Binary files differnew file mode 100644 index 00000000..c5cd84db --- /dev/null +++ b/skins/monobook/external-rtl.png diff --git a/skins/monobook/main.css b/skins/monobook/main.css index 7e5809b5..d6a67c1e 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -527,32 +527,36 @@ table.rimage { #bodyContent a.external, #bodyContent a[href ^="gopher://"] { background: url(external.png) center right no-repeat; - padding-right: 13px; + padding: 0 13px; +} +.rtl #bodyContent a.external, +.rtl #bodyContent a[href ^="gopher://"] { + background-image: url(external-rtl.png); } #bodyContent a[href ^="https://"], .link-https { background: url(lock_icon.gif) center right no-repeat; - padding-right: 16px; + padding: 0 16px; } #bodyContent a[href ^="mailto:"], .link-mailto { background: url(mail_icon.gif) center right no-repeat; - padding-right: 18px; + padding: 0 18px; } #bodyContent a[href ^="news://"] { background: url(news_icon.png) center right no-repeat; - padding-right: 18px; + padding: 0 18px; } #bodyContent a[href ^="ftp://"], .link-ftp { background: url(file_icon.gif) center right no-repeat; - padding-right: 18px; + padding: 0 18px; } #bodyContent a[href ^="irc://"], #bodyContent a.extiw[href ^="irc://"], .link-irc { background: url(discussionitem_icon.gif) center right no-repeat; - padding-right: 18px; + padding: 0 18px; } #bodyContent a.external[href $=".ogg"], #bodyContent a.external[href $=".OGG"], #bodyContent a.external[href $=".mid"], #bodyContent a.external[href $=".MID"], @@ -562,7 +566,7 @@ table.rimage { #bodyContent a.external[href $=".wma"], #bodyContent a.external[href $=".WMA"], .link-audio { background: url("audio.png") center right no-repeat; - padding-right: 13px; + padding: 0 13px; } #bodyContent a.external[href $=".ogm"], #bodyContent a.external[href $=".OGM"], #bodyContent a.external[href $=".avi"], #bodyContent a.external[href $=".AVI"], @@ -570,14 +574,30 @@ table.rimage { #bodyContent a.external[href $=".mpg"], #bodyContent a.external[href $=".MPG"], .link-video { background: url("video.png") center right no-repeat; - padding-right: 13px; + padding: 0 13px; } #bodyContent a.external[href $=".pdf"], #bodyContent a.external[href $=".PDF"], #bodyContent a.external[href *=".pdf#"], #bodyContent a.external[href *=".PDF#"], #bodyContent a.external[href *=".pdf?"], #bodyContent a.external[href *=".PDF?"], .link-document { background: url("document.png") center right no-repeat; - padding-right: 12px; + padding: 0 12px; +} + +/* for rtl wikis */ +.rtl #bodyContent a.external { + background-position: left; + padding-right: 0; +} +.rtl a.feedlink { + background-position: right; + padding-right: 16px; + padding-left: 0; +} + +/* correction for ltr wikis */ +.ltr #bodyContent a.external { + padding-left: 0; } /* disable interwiki styling */ @@ -715,7 +735,10 @@ input.searchButton { padding: .5em .4em .4em .4em; text-align: center; } - +#p-search #searchform div div { + margin-top: .4em; + font-size: 95%; +} /* ** the personal toolbar */ diff --git a/skins/monobook/rtl.css b/skins/monobook/rtl.css index fbd5ab35..9b8e4f44 100644 --- a/skins/monobook/rtl.css +++ b/skins/monobook/rtl.css @@ -147,14 +147,23 @@ li#ca-watch { #p-personal li { float: left; } -/* Fix link icons */ -.external { +/* Fix link icons +.external, a.feedlink { padding: 0 !important; background: none !important; } +*/ #footer { clear: both; } +#f-poweredbyico { + float: left; + height: 1%; +} +#f-copyrightico { + float: right; + height: 1%; +} * html #footer { margin-left: 0; margin-right: 13.6em; @@ -231,3 +240,8 @@ html > body div#bodyContent ul { html > body div#bodyContent ul#filetoc { display: block; } +/* Special:Prefixindex styling */ +td#mw-prefixindex-nav-form { + text-align: left; +} + diff --git a/skins/simple/main.css b/skins/simple/main.css index 6f3e8eb8..6ba47e0d 100644 --- a/skins/simple/main.css +++ b/skins/simple/main.css @@ -175,6 +175,12 @@ input.searchButton { padding: 0.5em 0.4em 0.4em 0.4em; } +/* feed links */ +a.feedlink { + background: url("../common/images/feed-icon.png") center left no-repeat; + padding-left: 16px; +} + textarea { width: 100%; } diff --git a/skins/simple/rtl.css b/skins/simple/rtl.css index 1ba1431d..53b3dc0c 100644 --- a/skins/simple/rtl.css +++ b/skins/simple/rtl.css @@ -94,7 +94,7 @@ div.tleft, div.floatleft, table.floatleft { } /* Fix link icons */ -.external { +.external, a.feedlink { padding: 0 !important; background: none !important; } @@ -174,3 +174,8 @@ table.filehistory th { html > body div#bodyContent ul { display: table; } +/* Special:Prefixindex styling */ +td#mw-prefixindex-nav-form { + text-align: left; +} + |
