From 086ae52d12011746a75f5588e877347bc0457352 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 21 Mar 2008 11:49:34 +0100 Subject: Update auf MediaWiki 1.12.0 --- skins/ArchLinux.php | 14 +- skins/Modern.deps.php | 13 + skins/Modern.php | 293 +++++++++ skins/MonoBook.php | 12 +- skins/archlinux/IE60Fixes.css | 5 +- skins/archlinux/KHTMLFixes.css | 1 + skins/archlinux/headbg.jpg | Bin 0 -> 7881 bytes skins/archlinux/main.css | 60 +- skins/archlinux/rtl.css | 9 + skins/archlinux/user.gif | Bin 932 -> 923 bytes skins/archlinux/wiki-indexed.png | Bin 0 -> 8205 bytes skins/archlinux/wiki.png | Bin 0 -> 23064 bytes skins/chick/main.css | 3 +- skins/common/ajaxsearch.js | 1 - skins/common/block.js | 29 +- skins/common/cologneblue.css | 4 +- skins/common/commonPrint.css | 3 +- skins/common/oldshared.css | 3 +- skins/common/preview.js | 109 +++- skins/common/protect.js | 68 ++- skins/common/shared.css | 31 + skins/common/upload.js | 2 +- skins/common/wikibits.js | 4 +- skins/disabled/MonoBookCBT.php | 2 +- skins/modern/audio.png | Bin 0 -> 312 bytes skins/modern/bullet.gif | Bin 0 -> 50 bytes skins/modern/discussionitem_icon.gif | Bin 0 -> 949 bytes skins/modern/document.png | Bin 0 -> 270 bytes skins/modern/external.png | Bin 0 -> 165 bytes skins/modern/file_icon.gif | Bin 0 -> 921 bytes skins/modern/footer-grad.png | Bin 0 -> 149 bytes skins/modern/link_icon.gif | Bin 0 -> 942 bytes skins/modern/lock_icon.gif | Bin 0 -> 918 bytes skins/modern/mail_icon.gif | Bin 0 -> 918 bytes skins/modern/main.css | 1119 ++++++++++++++++++++++++++++++++++ skins/modern/news_icon.png | Bin 0 -> 297 bytes skins/modern/print.css | 9 + skins/modern/rtl.css | 142 +++++ skins/modern/video.png | Bin 0 -> 215 bytes skins/monobook/IE60Fixes.css | 5 +- skins/monobook/KHTMLFixes.css | 1 + skins/monobook/main.css | 60 +- skins/monobook/rtl.css | 9 + skins/simple/main.css | 17 +- skins/simple/rtl.css | 175 ++++++ 45 files changed, 2015 insertions(+), 188 deletions(-) create mode 100644 skins/Modern.deps.php create mode 100644 skins/Modern.php create mode 100644 skins/archlinux/headbg.jpg create mode 100644 skins/archlinux/wiki-indexed.png create mode 100644 skins/archlinux/wiki.png create mode 100644 skins/modern/audio.png create mode 100644 skins/modern/bullet.gif create mode 100644 skins/modern/discussionitem_icon.gif create mode 100644 skins/modern/document.png create mode 100644 skins/modern/external.png create mode 100644 skins/modern/file_icon.gif create mode 100644 skins/modern/footer-grad.png create mode 100644 skins/modern/link_icon.gif create mode 100644 skins/modern/lock_icon.gif create mode 100644 skins/modern/mail_icon.gif create mode 100644 skins/modern/main.css create mode 100644 skins/modern/news_icon.png create mode 100644 skins/modern/print.css create mode 100644 skins/modern/rtl.css create mode 100644 skins/modern/video.png create mode 100644 skins/simple/rtl.css (limited to 'skins') diff --git a/skins/ArchLinux.php b/skins/ArchLinux.php index 68626eeb..c16c2b7d 100644 --- a/skins/ArchLinux.php +++ b/skins/ArchLinux.php @@ -55,7 +55,7 @@ class ArchLinuxTemplate extends QuickTemplate { html('headlinks') ?> - archlinux.de :: <?php $this->text('pagetitle') ?> + <?php $this->text('pagetitle') ?> data ); ?> + +html('headscripts') ?> data['jsvarurl' ]) { ?> @@ -86,12 +88,10 @@ class ArchLinuxTemplate extends QuickTemplate { data['trackbackhtml']) print $this->data['trackbackhtml']; ?> - - html('headscripts') ?> -data['body_ondblclick']) { ?>ondblclick="text('body_ondblclick') ?>" -data['body_onload' ]) { ?>onload="text('body_onload') ?>" +data['body_ondblclick']) { ?> ondblclick="text('body_ondblclick') ?>" +data['body_onload' ]) { ?> onload="text('body_onload') ?>" class="mediawiki text('nsclass') ?> text('dir') ?> text('pageclass') ?>"> @@ -203,8 +203,8 @@ class ArchLinuxTemplate extends QuickTemplate { tooltipAndAccesskey('search'); if( isset( $this->data['search'] ) ) { ?> value="text('search') ?>" /> -   - + tooltipAndAccesskey( 'search-go' ); ?> />  + tooltipAndAccesskey( 'search-fulltext' ); ?> /> diff --git a/skins/Modern.deps.php b/skins/Modern.deps.php new file mode 100644 index 00000000..73adcb40 --- /dev/null +++ b/skins/Modern.deps.php @@ -0,0 +1,13 @@ +skinname = 'modern'; + $this->stylename = 'modern'; + $this->template = 'ModernTemplate'; + } +} + +/** + * @todo document + * @addtogroup Skins + */ +class ModernTemplate extends QuickTemplate { + /** + * Template filter callback for Modern skin. + * Takes an associative array of data set from a SkinTemplate-based + * class, and a wrapper for MediaWiki's localization database, and + * outputs a formatted page. + * + * @access private + */ + function execute() { + global $wgUser; + $skin = $wgUser->getSkin(); + + // Suppress warnings to prevent notices about missing indexes in $this->data + wfSuppressWarnings(); + +?> +data['xhtmlnamespaces'] as $tag => $ns) { + ?>xmlns:xml:lang="text('lang') ?>" lang="text('lang') ?>" dir="text('dir') ?>"> + + + html('headlinks') ?> + <?php $this->text('pagetitle') ?> + + data['printable']) ) { ?>media="print" href="text('stylepath') ?>/text('stylename') ?>/print.css?" /> + + + data ); ?> + + + +html('headscripts') ?> +data['jsvarurl' ]) { ?> + + +data['pagecss' ]) { ?> + +data['usercss' ]) { ?> + +data['userjs' ]) { ?> + +data['userjsprev']) { ?> + +data['trackbackhtml']) print $this->data['trackbackhtml']; ?> + +data['body_ondblclick']) { ?> ondblclick="text('body_ondblclick') ?>" +data['body_onload' ]) { ?> onload="text('body_onload') ?>" + class="mediawiki text('nsclass') ?> text('dir') ?> text('pageclass') ?>"> + + +
+

data['displaytitle']!=""?$this->html('title'):$this->text('title') ?>

+
+ +
+
+ +
+
msg('views') ?>
+
+ +
+
+ + +
+ +
+
+
msg('tagline') ?>
+ data['newtalk'] ) { + ?>
html('newtalk') ?>
+ + data['sitenotice']) { + ?>
html('sitenotice') ?>
+ +
+ +
html('subtitle') ?>
+ + data['undelete']) { ?>
html('undelete') ?>
+ data['showjumplinks']) { ?> + + html('bodytext') ?> +
+ data['catlinks']) { ?> +
+
+
+ +
+ + + data['sidebar'] as $bar => $cont) { ?> +
tooltip('p-'.$bar) ?>> +
+
+ +
+
+ + + + + + +
+
msg('toolbox') ?>
+
+ +
+
+ + +data['language_urls'] ) { ?> +
+
msg('otherlanguages') ?>
+
+
    +data['language_urls'] as $langlink) { ?> +
    • + +
+
+
+ + +
+ + +
+ +
+ + +
+
msg('personaltools') ?>
+
+ +
+
+ + + + + + html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?> +html('reporttime') ?> +data['debug'] ): ?> + + + + diff --git a/skins/MonoBook.php b/skins/MonoBook.php index 398d3f7c..e930a5e7 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -71,6 +71,8 @@ class MonoBookTemplate extends QuickTemplate { data ); ?> + +html('headscripts') ?> data['jsvarurl' ]) { ?> @@ -87,11 +89,9 @@ class MonoBookTemplate extends QuickTemplate { data['trackbackhtml']) print $this->data['trackbackhtml']; ?> - -html('headscripts') ?> -data['body_ondblclick']) { ?>ondblclick="text('body_ondblclick') ?>" -data['body_onload' ]) { ?>onload="text('body_onload') ?>" +data['body_ondblclick']) { ?> ondblclick="text('body_ondblclick') ?>" +data['body_onload' ]) { ?> onload="text('body_onload') ?>" class="mediawiki text('nsclass') ?> text('dir') ?> text('pageclass') ?>">
@@ -169,8 +169,8 @@ class MonoBookTemplate extends QuickTemplate { tooltipAndAccesskey('search'); if( isset( $this->data['search'] ) ) { ?> value="text('search') ?>" /> -   - + tooltipAndAccesskey( 'search-go' ); ?> />  + tooltipAndAccesskey( 'search-fulltext' ); ?> />
diff --git a/skins/archlinux/IE60Fixes.css b/skins/archlinux/IE60Fixes.css index 6b646c70..bf78413d 100644 --- a/skins/archlinux/IE60Fixes.css +++ b/skins/archlinux/IE60Fixes.css @@ -80,5 +80,8 @@ div.tright, div.tleft { position: relative; } -/*{ border:1px solid Red !important;}*/ +/* bug 12846 */ +body.rtl #preftoc a, body.rtl #preftoc a:active { + float: left; +} diff --git a/skins/archlinux/KHTMLFixes.css b/skins/archlinux/KHTMLFixes.css index 97fba0c4..afa3568b 100644 --- a/skins/archlinux/KHTMLFixes.css +++ b/skins/archlinux/KHTMLFixes.css @@ -1,3 +1,4 @@ /* KHTML fix stylesheet */ /* work around the horizontal scrollbars */ #column-content { margin-left: 0; } + diff --git a/skins/archlinux/headbg.jpg b/skins/archlinux/headbg.jpg new file mode 100644 index 00000000..5491c6e4 Binary files /dev/null and b/skins/archlinux/headbg.jpg differ diff --git a/skins/archlinux/main.css b/skins/archlinux/main.css index 3c089ded..7192b5f3 100644 --- a/skins/archlinux/main.css +++ b/skins/archlinux/main.css @@ -472,14 +472,6 @@ img.thumbborder { display: none; } -/* Have a checkered background on images on the description pages and in galleries - to make transparency visible - -#file img, .gallerybox .thumb img { - background: url(Checker-16x16.png) repeat; -} -*/ - /* ** classes for special content elements like town boxes ** intended to be referenced directly from the wiki src @@ -724,30 +716,6 @@ special external link styling */ background-position: 35% 50% !important; text-decoration: none; } -/* -** the navigation portlet -*/ - -#p-navigation { - position: relative; - z-index: 3; -} -#p-navigation a { - display: block; -} -#p-navigation li.active a, #p-navigation li.active a:hover { - display: inline; -} - -#p-navigation .pBody { - padding-right: 0; -} - -#p-navigation li.active a, #p-navigation li.active a:hover { - text-decoration: none; - font-weight: bold; -} - /* ** Search portlet @@ -1199,6 +1167,7 @@ div#userloginForm .captcha { background-color: #ffa; } div.patrollink { + clear: both; font-size: 75%; text-align: right; } @@ -1298,12 +1267,6 @@ span.changedby { color: gray; } -li span.deleted, span.history-deleted { - text-decoration: line-through; - color: #888; - font-style: italic; -} - .toggle { margin-left: 2em; text-indent: -2em; @@ -1470,6 +1433,13 @@ div#searchTarget ul li:before { content: "\00BB \0020"; } +div#searchTargetHide { + float:right; + border:solid 1px black; + background:gainsboro; + padding:2px; +} + div.multipageimagenavbox { border: solid 1px silver; padding: 4px; @@ -1494,17 +1464,17 @@ table.multipageimage td { /** Special:Version */ -table#sv-ext, table#sv-hooks { +table#sv-ext, table#sv-hooks, table#sv-software { margin: 1em; padding:0em; } -#sv-ext td, #sv-hooks td, -#sv-ext th, #sv-hooks th { +#sv-ext td, #sv-hooks td, #sv-software td, +#sv-ext th, #sv-hooks th, #sv-software th { border: 1px solid #A0A0A0; padding: 0 0.15em 0 0.15em; } -#sv-ext th, #sv-hooks th { +#sv-ext th, #sv-hooks th, #sv-software th { background-color: #F0F0F0; color: black; padding: 0 0.15em 0 0.15em; @@ -1567,12 +1537,14 @@ div.mw-lag-warn-high { background-color: #FFCCCC; } -/* Recreating-deleted-page warning and log entries */ +/* Recreating-deleted-page/reupload file warning and log entries */ +div#mw-upload-deleted-warn, div#mw-recreate-deleted-warn { padding: 3px; margin-bottom: 3px; border: 2px solid #2F6FAB; } +div#mw-upload-deleted-warn ul li, div#mw-recreate-deleted-warn ul li { font-size: 90%; } @@ -1584,4 +1556,4 @@ div#mw-recreate-deleted-warn ul li { text-align: center; vertical-align: middle; font-size: 90%; -} \ No newline at end of file +} diff --git a/skins/archlinux/rtl.css b/skins/archlinux/rtl.css index e28ffb75..2bd5261e 100644 --- a/skins/archlinux/rtl.css +++ b/skins/archlinux/rtl.css @@ -227,3 +227,12 @@ p.mw-ipb-conveniencelinks { table.filehistory th { text-align: right; } + +/** + * Lists: + * The following lines don't have a visible effect on non-Gecko browsers + * They fix a problem ith Gecko browsers rendering lists to the right of + * left-floated objects in an RTL layout. + */ +html>body.rtl #bodyContent ul { display:table; } +html>body.rtl #bodyContent ol { display:table; } \ No newline at end of file diff --git a/skins/archlinux/user.gif b/skins/archlinux/user.gif index bc934396..c9c9ab96 100644 Binary files a/skins/archlinux/user.gif and b/skins/archlinux/user.gif differ diff --git a/skins/archlinux/wiki-indexed.png b/skins/archlinux/wiki-indexed.png new file mode 100644 index 00000000..189a2ae3 Binary files /dev/null and b/skins/archlinux/wiki-indexed.png differ diff --git a/skins/archlinux/wiki.png b/skins/archlinux/wiki.png new file mode 100644 index 00000000..69fce988 Binary files /dev/null and b/skins/archlinux/wiki.png differ diff --git a/skins/chick/main.css b/skins/chick/main.css index 876f3c7d..07b922c3 100644 --- a/skins/chick/main.css +++ b/skins/chick/main.css @@ -466,7 +466,8 @@ div.gallerytext { .templatesUsed { margin-top: 1.5em; } -/* Recreating-deleted-page warning and log entries */ +/* Recreating-deleted-page/reupload file warning and log entries */ +div#mw-upload-deleted-warn ul li, div#mw-recreate-deleted-warn ul li { font-size: 95%; } diff --git a/skins/common/ajaxsearch.js b/skins/common/ajaxsearch.js index 1e972236..b9fb56f3 100644 --- a/skins/common/ajaxsearch.js +++ b/skins/common/ajaxsearch.js @@ -23,7 +23,6 @@ function Searching_Go() function Search_Typing() { started=true; typing=true; - window.status = "Waiting until you're done typing..."; setTimeout("Search_doneTyping()", 500); // I believe these are needed by IE for when the users press return? diff --git a/skins/common/block.js b/skins/common/block.js index 430c1d54..78ae3bf2 100644 --- a/skins/common/block.js +++ b/skins/common/block.js @@ -1,4 +1,3 @@ - function considerChangingExpiryFocus() { if (!document.getElementById) { return; @@ -31,23 +30,23 @@ function updateBlockOptions() { 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 anonymousCheck = document.getElementById('wpAnonOnly'); - anonymousCheck.disabled = !isIp && !isEmpty; - - var autoblockCheck = document.getElementById('wpEnableAutoblock'); - autoblockCheck.disabled = isIp && !isEmpty; - - var emailblockCheck = document.getElementById('wpEmailBan'); - emailblockCheck.disabled = isIp && !isEmpty; - */ - var anonymousRow = document.getElementById('wpAnonOnlyRow'); - anonymousRow.style.display = (!isIp && !isEmpty) ? 'none' : ''; + if( anonymousRow ) { + anonymousRow.style.display = (!isIp && !isEmpty) ? 'none' : ''; + } var autoblockRow = document.getElementById('wpEnableAutoblockRow'); - autoblockRow.style.display = isIp && !isEmpty ? 'none' : ''; + if( autoblockRow ) { + autoblockRow.style.display = isIp && !isEmpty ? 'none' : ''; + } var emailblockRow = document.getElementById('wpEnableEmailBan'); - emailblockRow.style.display = isIp && !isEmpty ? 'none' : ''; + if( emailblockRow ) { + emailblockRow.style.display = isIp && !isEmpty ? 'none' : ''; + } + + var hideuserRow = document.getElementById('wpEnableHideUser'); + if( hideuserRow ) { + hideuserRow.style.display = isIp && !isEmpty ? 'none' : ''; + } } diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css index 547585ef..670996ea 100644 --- a/skins/common/cologneblue.css +++ b/skins/common/cologneblue.css @@ -95,13 +95,15 @@ h2, h3, h4, h5, h6 { margin-bottom: 0; } small { font-size: 75%; } input.mw-searchInput { width: 106px; } -/* Recreating-deleted-page warning and log entries */ +/* Recreating-deleted-page/reupload file warning and log entries */ +div#mw-upload-deleted-warn, div#mw-recreate-deleted-warn { padding: 3px; margin-top: 3px; margin-bottom: 3px; border: 1px solid #6688AA; } +div#mw-upload-deleted-warn ul li, div#mw-recreate-deleted-warn ul li { font-size: 90%; } \ No newline at end of file diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css index a7d49e36..b0aad3d1 100644 --- a/skins/common/commonPrint.css +++ b/skins/common/commonPrint.css @@ -129,8 +129,7 @@ ul { border-top: 1px solid black; } -h1, h2, h3, h4, h5, h6 -{ +h1, h2, h3, h4, h5, h6 { font-weight: bold; } diff --git a/skins/common/oldshared.css b/skins/common/oldshared.css index 27d93a03..ead422dc 100644 --- a/skins/common/oldshared.css +++ b/skins/common/oldshared.css @@ -447,7 +447,8 @@ p.mw-ipb-conveniencelinks { float: right; } -/* Recreating-deleted-page warning and log entries */ +/* Recreating-deleted-page/reupload file warning and log entries */ +div#mw-upload-deleted-warn ul li, div#mw-recreate-deleted-warn ul li { font-size: 95%; } diff --git a/skins/common/preview.js b/skins/common/preview.js index ec612963..ad096e2c 100644 --- a/skins/common/preview.js +++ b/skins/common/preview.js @@ -1,5 +1,19 @@ -// Live preview +/** + * Live preview script for MediaWiki + * + * 2007-04-25 – Nikerabbit: + * Worked around text cutoff in mozilla-based browsers + * Support for categories + */ + + +lpIdPreview = 'wikiPreview'; +lpIdCategories = 'catlinks'; +lpIdDiff = 'wikiDiff'; +/* + * Returns XMLHttpRequest based on browser support or null + */ function openXMLHttpRequest() { if( window.XMLHttpRequest ) { return new XMLHttpRequest(); @@ -15,55 +29,94 @@ function openXMLHttpRequest() { * Returns true if could open the request, * false otherwise (eg no browser support). */ -function livePreview(target, text, postUrl) { - prevTarget = target; - if( !target ) { - window.alert(i18n(wgLivepreviewMessageFailed)); - showFallback(); - } - prevReq = openXMLHttpRequest(); - if( !prevReq ) return false; +function lpDoPreview(text, postUrl) { + lpRequest = openXMLHttpRequest(); + if( !lpRequest ) return false; - prevReq.onreadystatechange = updatePreviewText; - prevReq.open("POST", postUrl, true); + lpRequest.onreadystatechange = lpStatusUpdate; + lpRequest.open("POST", postUrl, true); var postData = 'wpTextbox1=' + encodeURIComponent(text); - prevReq.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); - prevReq.send(postData); + lpRequest.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); + lpRequest.send(postData); return true; } -function updatePreviewText() { +function lpStatusUpdate() { - if (prevReq.readyState > 0 && prevReq.readyState < 4) { + /* We are at some stage of loading */ + if (lpRequest.readyState > 0 && lpRequest.readyState < 4) { notify(i18n(wgLivepreviewMessageLoading)); } - if(prevReq.readyState != 4) { + /* Not loaded yet */ + if(lpRequest.readyState != 4) { return; } - dismissNotify(i18n(wgLivepreviewMessageReady), 750); - - if( prevReq.status != 200 ) { + /* We got response, bug it not what we wanted */ + if( lpRequest.status != 200 ) { var keys = new Array(); - keys[0] = prevReq.status; - keys[1] = prevReq.statusText; + keys[0] = lpRequest.status; + keys[1] = lpRequest.statusText; window.alert(i18n(wgLivepreviewMessageError, keys)); - showFallback(); + lpShowNormalPreview(); return; } - var xmlObject = prevReq.responseXML.documentElement; - var previewElement = xmlObject.getElementsByTagName('preview')[0]; - prevTarget.innerHTML = previewElement.firstChild.data; + /* All good */ + dismissNotify(i18n(wgLivepreviewMessageReady), 750); + + + var XMLObject = lpRequest.responseXML.documentElement; + + + /* Work around Firefox (Gecko?) limitation where it shows only the first 4096 + * bytes of data. Ref: http://www.thescripts.com/forum/thread482760.html + */ + XMLObject.normalize(); + + var previewElement = XMLObject.getElementsByTagName('preview')[0]; + var categoryElement = XMLObject.getElementsByTagName('category')[0]; /* Hide the active diff if it exists */ - var diff = document.getElementById('wikiDiff'); + var diff = document.getElementById(lpIdDiff); if ( diff ) { diff.style.display = 'none'; } + + /* Inject preview */ + var previewContainer = document.getElementById( lpIdPreview ); + if ( previewContainer && previewElement ) { + previewContainer.innerHTML = previewElement.firstChild.data; + } else { + /* Should never happen */ + window.alert(i18n(wgLivepreviewMessageFailed)); + lpShowNormalPreview(); + return; + } + + + /* Inject categories */ + var categoryContainer = document.getElementById( lpIdCategories ); + if ( categoryElement && categoryElement.firstChild ) { + if ( categoryContainer ) { + categoryContainer.innerHTML = categoryElement.firstChild.data; + /* May be hidden */ + categoryContainer.style.display = 'block'; + } else { + /* Just dump them somewhere */ + /* previewContainer.innerHTML += '';*/ + } + } else { + /* Nothing to show, hide old data */ + if ( categoryContainer ) { + categoryContainer.style.display = 'none'; + } + } + } -function showFallback() { +function lpShowNormalPreview() { var fallback = document.getElementById('wpPreview'); if ( fallback ) { fallback.style.display = 'inline'; } } @@ -71,7 +124,7 @@ function showFallback() { // TODO: move elsewhere /* Small non-intrusive popup which can be used for example to notify the user - * about completed AJAX action + * about completed AJAX action. Supports only one notify at a time. */ function notify(message) { var notifyElement = document.getElementById('mw-js-notify'); diff --git a/skins/common/protect.js b/skins/common/protect.js index b3eec3bd..863b95bd 100644 --- a/skins/common/protect.js +++ b/skins/common/protect.js @@ -5,7 +5,7 @@ * @param String tableId Identifier of the table containing UI bits * @param String labelText Text to use for the checkbox label */ -function protectInitialize( tableId, labelText ) { +function protectInitialize( tableId, labelText, types ) { if( !( document.createTextNode && document.getElementById && document.getElementsByTagName ) ) return false; @@ -20,34 +20,48 @@ function protectInitialize( tableId, labelText ) { row.appendChild( document.createElement( 'td' ) ); var col = document.createElement( 'td' ); row.appendChild( col ); - - var check = document.createElement( 'input' ); - check.id = 'mwProtectUnchained'; - check.type = 'checkbox'; - col.appendChild( check ); - addClickHandler( check, protectChainUpdate ); + // If there is only one protection type, there is nothing to chain + if( types > 1 ) { + var check = document.createElement( 'input' ); + check.id = 'mwProtectUnchained'; + check.type = 'checkbox'; + col.appendChild( check ); + addClickHandler( check, protectChainUpdate ); - col.appendChild( document.createTextNode( ' ' ) ); - var label = document.createElement( 'label' ); - label.setAttribute( 'for', 'mwProtectUnchained' ); - label.appendChild( document.createTextNode( labelText ) ); - col.appendChild( label ); + col.appendChild( document.createTextNode( ' ' ) ); + var label = document.createElement( 'label' ); + label.htmlFor = 'mwProtectUnchained'; + label.appendChild( document.createTextNode( labelText ) ); + col.appendChild( label ); - check.checked = !protectAllMatch(); - protectEnable( check.checked ); + check.checked = !protectAllMatch(); + protectEnable( check.checked ); + } - allowCascade(); + setCascadeCheckbox(); return true; } -function allowCascade() { +/** +* Determine if, given the cascadeable protection levels +* and what is currently selected, if the cascade box +* can be checked +* +* @return boolean +* +*/ +function setCascadeCheckbox() { + // For non-existent titles, there is no cascade option + if( !document.getElementById( 'mwProtect-cascade' ) ) { + return false; + } var lists = protectSelectors(); for( var i = 0; i < lists.length; i++ ) { if( lists[i].selectedIndex > -1 ) { var items = lists[i].getElementsByTagName( 'option' ); var selected = items[ lists[i].selectedIndex ].value; - if( wgCascadeableLevels.indexOf( selected ) == -1 ) { + if( !isCascadeableLevel(selected) ) { document.getElementById( 'mwProtect-cascade' ).checked = false; document.getElementById( 'mwProtect-cascade' ).disabled = true; return false; @@ -58,6 +72,22 @@ function allowCascade() { return true; } +/** +* Is this protection level cascadeable? +* @param String level +* +* @return boolean +* +*/ +function isCascadeableLevel( level ) { + for (var k = 0; k < wgCascadeableLevels.length; k++) { + if ( wgCascadeableLevels[k] == level ) { + return true; + } + } + return false; +} + /** * When protection levels are locked together, update the rest * when one action's level changes @@ -67,7 +97,7 @@ function allowCascade() { function protectLevelsUpdate(source) { if( !protectUnchained() ) protectUpdateAll( source.selectedIndex ); - allowCascade(); + setCascadeCheckbox(); } /** @@ -81,7 +111,7 @@ function protectChainUpdate() { protectChain(); protectEnable( false ); } - allowCascade(); + setCascadeCheckbox(); } /** diff --git a/skins/common/shared.css b/skins/common/shared.css index f6d63ab8..de02a10f 100644 --- a/skins/common/shared.css +++ b/skins/common/shared.css @@ -46,3 +46,34 @@ table.filehistory td.mw-imagepage-filesize, table.filehistory th.mw-imagepage-filesize { white-space:nowrap; } + +/* + * rev_deleted stuff + */ +li span.deleted, span.history-deleted { + text-decoration: line-through; + color: #888; + font-style: italic; +} + +/** + * Forms + */ +body.ltr td.mw-label { text-align: right; } +body.ltr td.mw-input { text-align: left; } +body.ltr td.mw-submit { text-align: left; } +body.rtl td.mw-label { text-align: left; } +body.rtl td.mw-input { text-align: right; } +body.rtl td.mw-submit { text-align: right; } + +td.mw-label { vertical-align: top; } +td.mw-submit { white-space: nowrap; } + +/** + * Image captions + */ +body.rtl .thumbcaption { text-align:right; } +body.rtl .magnify { float:left; } + +body.ltr .thumbcaption { text-align:left; } +body.ltr .magnify { float:right; } diff --git a/skins/common/upload.js b/skins/common/upload.js index 7cbfc9aa..f00c4db8 100644 --- a/skins/common/upload.js +++ b/skins/common/upload.js @@ -96,7 +96,7 @@ var wgUploadWarningObj = { // Set a value in the form indicating that the warning is acknowledged and // doesn't need to be redisplayed post-upload - if ( warning == '' || warning == ' ' ) { + if ( warning == '' || warning == ' ' ) { ackElt.value = ''; } else { ackElt.value = '1'; diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js index 11ede270..cdb5c9de 100644 --- a/skins/common/wikibits.js +++ b/skins/common/wikibits.js @@ -44,8 +44,6 @@ if (typeof stylepath != 'undefined' && typeof skin != 'undefined') { document.write(''); } else if (is_opera_seven && !is_opera_95) { document.write(''); - } else if (is_opera_95) { - document.write(''); } else if (is_khtml) { document.write(''); } @@ -1146,7 +1144,7 @@ function ts_dateToSortKey(date) { function ts_parseFloat(num) { if (!num) return 0; - num = parseFloat(num.replace(/,/, "")); + num = parseFloat(num.replace(/,/g, "")); return (isNaN(num) ? 0 : num); } diff --git a/skins/disabled/MonoBookCBT.php b/skins/disabled/MonoBookCBT.php index 03e5f070..c6297cd9 100644 --- a/skins/disabled/MonoBookCBT.php +++ b/skins/disabled/MonoBookCBT.php @@ -1020,7 +1020,7 @@ class SkinMonoBookCBT extends SkinTemplate { $dbr = wfGetDB( DB_SLAVE ); extract( $dbr->tableNames( 'watchlist' ) ); $sql = "SELECT COUNT(*) AS n FROM $watchlist - WHERE wl_title='" . $dbr->strencode($this->mTitle->getDBKey()) . + WHERE wl_title='" . $dbr->strencode($this->mTitle->getDBkey()) . "' AND wl_namespace=" . $this->mTitle->getNamespace() ; $res = $dbr->query( $sql, 'SkinTemplate::outputPage'); $row = $dbr->fetchObject( $res ); diff --git a/skins/modern/audio.png b/skins/modern/audio.png new file mode 100644 index 00000000..1c56bdc8 Binary files /dev/null and b/skins/modern/audio.png differ diff --git a/skins/modern/bullet.gif b/skins/modern/bullet.gif new file mode 100644 index 00000000..b43de48a Binary files /dev/null and b/skins/modern/bullet.gif differ diff --git a/skins/modern/discussionitem_icon.gif b/skins/modern/discussionitem_icon.gif new file mode 100644 index 00000000..baec471a Binary files /dev/null and b/skins/modern/discussionitem_icon.gif differ diff --git a/skins/modern/document.png b/skins/modern/document.png new file mode 100644 index 00000000..b48138e9 Binary files /dev/null and b/skins/modern/document.png differ diff --git a/skins/modern/external.png b/skins/modern/external.png new file mode 100644 index 00000000..419c06fb Binary files /dev/null and b/skins/modern/external.png differ diff --git a/skins/modern/file_icon.gif b/skins/modern/file_icon.gif new file mode 100644 index 00000000..847f6485 Binary files /dev/null and b/skins/modern/file_icon.gif differ diff --git a/skins/modern/footer-grad.png b/skins/modern/footer-grad.png new file mode 100644 index 00000000..6f61d616 Binary files /dev/null and b/skins/modern/footer-grad.png differ diff --git a/skins/modern/link_icon.gif b/skins/modern/link_icon.gif new file mode 100644 index 00000000..815ccb1b Binary files /dev/null and b/skins/modern/link_icon.gif differ diff --git a/skins/modern/lock_icon.gif b/skins/modern/lock_icon.gif new file mode 100644 index 00000000..8a87e283 Binary files /dev/null and b/skins/modern/lock_icon.gif differ diff --git a/skins/modern/mail_icon.gif b/skins/modern/mail_icon.gif new file mode 100644 index 00000000..50a87a9a Binary files /dev/null and b/skins/modern/mail_icon.gif differ diff --git a/skins/modern/main.css b/skins/modern/main.css new file mode 100644 index 00000000..78cd2b22 --- /dev/null +++ b/skins/modern/main.css @@ -0,0 +1,1119 @@ +body { + margin: 0 0 0 0; + padding: 0 0 0 0; + /*font-size: 10pt;*/ + font-size: x-small; + + + font-family: sans-serif; + color: black; + background-color: #f0f0f0; +} + +#mw_main, +#p-personal, +#mw_header { + font-size: 130%; +} + +#mw_header { + position: absolute; + top: 0; + left: 0; + margin: 0 0 0 0; + padding: 0 0em 0 0em; + border: none; + height: 2em; + width: 100%; + + background-color: #003366; + color: white; +} + +#mw_header h1 { + margin: 0 0 0 0.5em; + padding: 0 0 0 0; + text-decoration: none; + font-size: 150%; +} + +#p-personal { + position: absolute; + top: 2em; + left: 0; + height: 1.5em; + margin: 0 0 0 0; + padding: 0 0 0 0; + width: 100%; + +} + +#p-personal div.pBody { + margin: 0 0 0 0; + padding: 0 0 0 0; + height: 1.5em; + font-variant: small-caps; +} + +#p-personal h5 { + display: none; +} + +#p-personal ul { + margin: 0 0 0 0; + padding: 0 0 0 0; + display: block; + height: 1.5em; + background-color: #3c78b5; +} + +#p-personal li { + display: block; float: left; + height: 1.5em; + margin: 0 0 0 0; + vertical-align: middle; + + font-weight: bold; + text-transform: lowercase; +} + +#p-personal li a { + text-decoration: none; + color: white; + padding: 0 1em 0 1em; +} + +#p-personal li a:hover { + text-decoration: none; + color: white; +} + +#p-personal li:hover { + background-color: #003366; +} + +#jump-to-nav { + display: none; +} + +#mw_contentwrapper { + width: 100%; + margin: 0 0 0 -15em; + float: right; +} + +#mw_content { + margin: 0 0 0 14em; + + background-color: white; + border-top: solid 1px #bbbbbb; + border-left: solid 1px #bbbbbb; + border-bottom: solid 1px #bbbbbb; + + line-height: 1.5em; + padding: 0 1em 1em 1em; +} + +#mw_portlets { + width: 14em; + + border-right: solid 1px #bbbbbb; + background-color: #f0f0f0; +} + +#mw_main { + padding: 0 0 0 0; + margin: 0 0 0 0; + margin-top: 3.5em; +} + +div.mw_clear { + margin: 0 0 0 0; + padding: 0 0 0 0; + clear: both; +} + +.portlet { + padding: 0 0 0 0; + margin: 0 0 0 0; +} + +.portlet div.pBody { + padding: 1em 0 1em 0; +} + +textarea { + width: 100%; + padding: .1em; +} + +#searchBody { + text-align: center; +} + +#searchInput { + display: block; + margin-left: auto; + margin-right: auto; +} + +.portlet h5 { + padding: 0.1em 0 0.3em 1em; + margin: 0 0 0 0; + background-color: #dddddd; + font-weight: bold; + border-bottom: solid 1px #3c78b5; + height: 1.1em; +} + +.portlet ul { + margin: 0 0 0 1.5em; + padding: 0 0 0 0; +} + +#mw_portlets .portlet ul { + line-height: 1.4em; +} + +ul { + list-style-image: url(bullet.gif); +} + +#p-cactions { + height: 1.5em; + padding: 0 0 0 0; + margin: 0 0 0 14em; +} + +#p-cactions div.pBody { + margin: 0 0 0 0; + padding: 0 0 0 0; +} + +#p-cactions a, +#p-cactions a:hover { + color: black; + text-decoration: none; +} + +#p-cactions ul { + display: inline; + margin: 0 0 0 0; + padding: 0 0 0 0; +} + +#p-cactions li { + margin: 0 0.5em 0 0.5em; + padding: 0 0.2em 0 0.2em; + display: block; + float: left; + height: 1.5em; + text-transform: lowercase; +} + +#p-cactions li.selected { + background-color: #bbbbbb; +} + +#p-cactions li a, +#p-cactions li a:hover, +#p-cactions li a:visited { + text-decoration: underline; + color: #003366; +} + +#p-cactions li.selected a, +#p-cactions li.selected a:hover, +#p-cactions li.selected a:visited { + text-decoration: none; + color: white; +} + +#p-cactions h5 { + display: none; +} + +#siteSub { + display: none; +} + +#footer { + background-color: #f0f0f0; + background: url(footer-grad.png) repeat-x 0 0; + padding: 10px 1em 1em 1em; + clear:both; + color: #444444; +} + +#footer a, +#footer a:hover, +#footer a:visited { + color: #444444; + text-decoration: underline; +} + +img { + border: none; +} + +#footer li { + display: inline; + list-style-type: none; + padding: 0 0 0 0; + margin: 0 0 0 0; +} + +#footer ul { + padding: 0 0 0 0; + margin: 0 0 0 0; +} + +div.printfooter { + display: none; +} + +p { + margin: 1em 0 1em 0; +} + +#contentSub { + color: #888; + font-size: small; + padding-left: 2em; +} + +#mw_portlets form { + margin: 0 0 0 0; + padding: 0 0 0 0; +} + +a { + text-decoration: none; + color: #003366; + background: none; +} +a:visited { + color: #5a3696; +} +a:active { + color: #faa700; +} +a:hover { + text-decoration: underline; +} +a.stub { + color: #772233; +} +a.new { + color: #ba0000; +} +a.new:visited { + color: #a55858; +} + +span.editsection { + font-size: small; +} + +h1, h2 { + border-bottom: solid 1px #003366; +} + +#preftoc { + width: 100%; + margin: 0 0 0 0; + padding: 0 0 0 0; + height: 1.5em; + clear: right; +} + +#preftoc li { + margin: 0 0.5em 0 0.5em; + padding: 0 0.2em 0 0.2em; + display: block; + float: left; + height: 1.5em; + text-transform: lowercase; +} + +#preferences { + margin: 0 0 0 0; + padding: 0em 1em 1em 1em; + border: solid 1px #bbbbbb; +} + +#preferences fieldset { + margin-top: 0; + border: none; +} + +#preferences h2 { +} + +.mainLegend { + display: none; +} + +#preftoc li.selected { + background-color: #bbbbbb; +} + +#preftoc li a, +#preftoc li a:hover, +#preftoc li a:visited { + text-decoration: underline; + color: #003366; +} + +#preftoc li.selected a, +#preftoc li.selected a:hover, +#preftoc li.selected a:visited { + text-decoration: none; + color: white; +} + +#mw_content a.external, +#mw_content a[href ^="gopher://"] { + background: url(external.png) center right no-repeat; + padding-right: 13px; +} +#mw_content a[href ^="https://"], +.link-https { + background: url(lock_icon.gif) center right no-repeat; + padding-right: 16px; +} +#mw_content a[href ^="mailto:"], +.link-mailto { + background: url(mail_icon.gif) center right no-repeat; + padding-right: 18px; +} +#mw_content a[href ^="news://"] { + background: url(news_icon.png) center right no-repeat; + padding-right: 18px; +} +#mw_content a[href ^="ftp://"], +.link-ftp { + background: url(file_icon.gif) center right no-repeat; + padding-right: 18px; +} +#mw_content a[href ^="irc://"], +.link-irc { + background: url(discussionitem_icon.gif) center right no-repeat; + padding-right: 18px; +} + +#mw_content a.external[href $=".ogg"], #mw_content a.external[href $=".OGG"], +#mw_content a.external[href $=".mid"], #mw_content a.external[href $=".MID"], +#mw_content a.external[href $=".midi"], #mw_content a.external[href $=".MIDI"], +#mw_content a.external[href $=".mp3"], #mw_content a.external[href $=".MP3"], +#mw_content a.external[href $=".wav"], #mw_content a.external[href $=".WAV"], +#mw_content a.external[href $=".wma"], #mw_content a.external[href $=".WMA"], +.link-audio { + background: url("audio.png") center right no-repeat; + padding-right: 13px; +} +#mw_content a.external[href $=".ogm"], #mw_content a.external[href $=".OGM"], +#mw_content a.external[href $=".avi"], #mw_content a.external[href $=".AVI"], +#mw_content a.external[href $=".mpeg"], #mw_content a.external[href $=".MPEG"], +#mw_content a.external[href $=".mpg"], #mw_content a.external[href $=".MPG"], +.link-video { + background: url("video.png") center right no-repeat; + padding-right: 13px; +} +#mw_content a.external[href $=".pdf"], #mw_content a.external[href $=".PDF"], +#mw_content a.external[href *=".pdf#"], #mw_content a.external[href *=".PDF#"], +#mw_content a.external[href *=".pdf?"], #mw_content a.external[href *=".PDF?"], +.link-document { + background: url("document.png") center right no-repeat; + padding-right: 12px; +} + +/* images */ +div.floatright, table.floatright { + clear: right; + float: right; + position: relative; + margin: 0 0 .5em .5em; + border: 0; +/* + border: .5em solid white; + border-width: .5em 0 .8em 1.4em; +*/ +} +div.floatright p { font-style: italic; } +div.floatleft, table.floatleft { + float: left; + clear: left; + position: relative; + margin: 0 .5em .5em 0; + border: 0; +/* + margin: .3em .5em .5em 0; + border: .5em solid white; + border-width: .5em 1.4em .8em 0; +*/ +} +div.floatleft p { font-style: italic; } +/* thumbnails */ +div.thumb { + margin-bottom: .5em; + border-style: solid; + border-color: white; + width: auto; +} +div.thumbinner { + border: 1px solid #ccc; + padding: 3px !important; + background-color: #f9f9f9; + font-size: 94%; + text-align: center; + overflow: hidden; +} +html .thumbimage { + border: 1px solid #ccc; +} +html .thumbcaption { + border: none; + text-align: left; + line-height: 1.4em; + padding: 3px !important; + font-size: 94%; +} +div.magnify { + float: right; + border: none !important; + background: none !important; +} +div.magnify a, div.magnify img { + display: block; + border: none !important; + background: none !important; +} +div.tright { + clear: right; + float: right; + border-width: .5em 0 .8em 1.4em; +} +div.tleft { + float: left; + clear: left; + margin-right: .5em; + border-width: .5em 1.4em .8em 0; +} +img.thumbborder { + border: 1px solid #dddddd; +} +.hiddenStructure { + display: none; +} + +#mw_content .plainlinks a { + background: none !important; + padding: 0 !important; +} + +.mw-warning { + border: 1px solid #aaa; + background-color: #f9f9f9; + padding: 5px; + font-size: 95%; +} + +#toc, +.toc { + margin: 0 0 0 0; + padding: 0 0 0 0; + border-spacing: 0; + background-color: #f0f0f0; + border: solid 1px #bbbbbb; +} + +#toc tr, #toc td { + margin: 0 0 0 0; + padding: 0 0 0 0; +} + +#toctitle { + border-bottom: solid 1px #3c78b5; + background-color: #dddddd; + margin: 0 0 0 0; +} + +#toc h2, +.toc h2 { + display: inline; + border: none; + padding: 0; + font-size: 100%; + font-weight: bold; +} +#toc #toctitle, +.toc #toctitle, +#toc .toctitle, +.toc .toctitle { + text-align: center; +} + +#toc ul, +.toc ul { + list-style-type: none; + list-style-image: none; + margin: 0 1em 0 1em; + padding-left: 0; + text-align: left; +} + +#toc ul ul, +.toc ul ul { + margin: 0 0 0 2em; +} + +#toc .toctoggle, +.toc .toctoggle { + font-size: 94%; +} + +.mw-warning { + margin-left: 50px; + margin-right: 50px; + text-align: center; +} + +#catlinks { + border: solid 1px #bbbbbb; + background-color: #f0f0f0; + padding: 0.5em 0.5em 0.5em 0.5em; + margin: 0 0 0 0; +} + +#catlinks p { + margin: 0 0 0 0; + padding: 0 0 0 0; +} + +#mw_header h1, +#p-personal, +#p-cactions { + overflow: hidden; +} + +.autocomment { + color: gray; +} + + +#pagehistory span.user { + margin-left: 1.4em; + margin-right: .4em; +} +#pagehistory span.minor { + font-weight: bold; +} +#pagehistory li { + border: 1px solid white; +} +#pagehistory li.selected { + background-color: #f9f9f9; + border: 1px dashed #aaa; +} + +/* disable interwiki styling */ +#mw_content a.extiw, +#mw_content a.extiw:active { + color: #36b; + background: none; + padding: 0; +} +#mw_content a.external { + color: #36b; +} + + + +.redirectText { + font-size: 150%; + margin: 5px; +} + +.printfooter { + display: none; +} + +.not-patrolled { + background-color: #ffa; +} +div.patrollink { + font-size: 75%; + text-align: right; +} +span.newpage, span.minor, span.searchmatch, span.bot { + font-weight: bold; +} +span.unpatrolled { + font-weight: bold; + color: red; +} + +span.searchmatch { + color: red; +} +.sharedUploadNotice { + font-style: italic; +} + +span.updatedmarker { + color: black; + background-color: #0f0; +} + +table.gallery { + border: 1px solid #ccc; + margin: 2px; + padding: 2px; + background-color: white; +} + +table.gallery tr { + vertical-align: top; +} + +table.gallery td { + vertical-align: top; + background-color: #f9f9f9; + border: solid 2px white; +} +/* Keep this temporarily so that cached pages will display right */ +table.gallery td.galleryheader { + text-align: center; + font-weight: bold; +} +table.gallery caption { + font-weight: bold; +} + +div.gallerybox { + margin: 2px; +} + +div.gallerybox div.thumb { + text-align: center; + border: 1px solid #ccc; + margin: 2px; +} + +div.gallerytext { + overflow: hidden; + font-size: 94%; + padding: 2px 4px; +} + +span.comment { + font-style: italic; +} + +span.changedby { + font-size: 95%; +} + +.previewnote { + text-indent: 3em; + color: #c00; + border-bottom: 1px solid #aaa; + padding-bottom: 1em; + margin-bottom: 1em; +} + +.previewnote p { + margin: 0; + padding: 0; +} + +.editExternally { + border: 1px solid gray; + background-color: #ffffff; + padding: 3px; + margin-top: 0.5em; + float: left; + font-size: small; + text-align: center; +} +.editExternallyHelp { + font-style: italic; + color: gray; +} + +.toggle { + margin-left: 2em; + text-indent: -2em; +} + +/* Classes for EXIF data display */ +table.mw_metadata { + font-size: 0.8em; + margin-left: 0.5em; + margin-bottom: 0.5em; + width: 300px; +} + +table.mw_metadata caption { + font-weight: bold; +} + +table.mw_metadata th { + font-weight: normal; +} + +table.mw_metadata td { + padding: 0.1em; +} + +table.mw_metadata { + border: none; + border-collapse: collapse; +} + +table.mw_metadata td, table.mw_metadata th { + text-align: center; + border: 1px solid #aaaaaa; + padding-left: 0.1em; + padding-right: 0.1em; +} + +table.mw_metadata th { + background-color: #f9f9f9; +} + +table.mw_metadata td { + background-color: #fcfcfc; +} + +table.collapsed tr.collapsable { + display: none; +} + + +/* filetoc */ +ul#filetoc { + text-align: center; + border: 1px solid #aaaaaa; + background-color: #f9f9f9; + padding: 5px; + font-size: 95%; + margin-bottom: 0.5em; + margin-left: 0; + margin-right: 0; +} + +#filetoc li { + display: inline; + list-style-type: none; + padding-right: 2em; +} + +input#wpSummary { + width: 80%; +} + +/* @bug 1714 */ +input#wpSave, input#wpDiff { + margin-right: 0.33em; +} + +#editform .editOptions { + display: inline; +} + +#wpSave { + font-weight: bold; +} + +/* Classes for article validation */ + +table.revisionform_default { + border: 1px solid #000000; +} + +table.revisionform_focus { + border: 1px solid #000000; + background-color:#00BBFF; +} + +tr.revision_tr_default { + background-color:#EEEEEE; +} + +tr.revision_tr_first { + background-color:#DDDDDD; +} + +p.revision_saved { + color: green; + font-weight:bold; +} + +#mw_trackbacks { + border: solid 1px #bbbbff; + background-color: #eeeeff; + padding: 0.2em; +} + + +/* Allmessages table */ + +#allmessagestable th { + background-color: #b2b2ff; +} + +#allmessagestable tr.orig { + background-color: #ffe2e2; +} + +#allmessagestable tr.new { + background-color: #e2ffe2; +} + +#allmessagestable tr.def { + background-color: #f0f0ff; +} + + +/* noarticletext */ +div.noarticletext { + border: 1px solid #ccc; + background: #fff; + padding: .2em 1em; + color: #000; +} + +div#searchTargetContainer { + left: 10px; + top: 10px; + width: 90%; + background: white; +} + +div#searchTarget { + padding: 3px; + margin: 5px; + background: #F0F0F0; + border: solid 1px blue; +} + +div#searchTarget ul li { + list-style: none; +} + +div#searchTarget ul li:before { + color: orange; + content: "\00BB \0020"; +} + +div#searchTargetHide { + float:right; + border:solid 1px black; + background:gainsboro; + padding:2px; +} + +div.multipageimagenavbox { + border: solid 1px silver; + padding: 4px; + margin: 1em; + -moz-border-radius: 6px; + background: #f0f0f0; +} + +div.multipageimagenavbox div.thumb { + border: none; + margin-left: 2em; + margin-right: 2em; +} + +div.multipageimagenavbox hr { + margin: 6px; +} + +table.multipageimage td { + text-align: center; +} + +/** Special:Version */ + +table#sv-ext, table#sv-hooks, table#sv-software { + margin: 1em; + padding:0em; +} + +#sv-ext td, #sv-hooks td, #sv-software td, +#sv-ext th, #sv-hooks th, #sv-software th { + border: 1px solid #A0A0A0; + padding: 0 0.15em 0 0.15em; +} +#sv-ext th, #sv-hooks th, #sv-software th { + background-color: #F0F0F0; + color: black; + padding: 0 0.15em 0 0.15em; +} +tr.sv-space{ + height: 0.8em; + border:none; +} +tr.sv-space td { display: none; } + +/* + Table pager (e.g. Special:Imagelist) + - remove underlines from the navigation link + - collapse borders + - set the borders to outsets (similar to Special:Allmessages) + - remove line wrapping for all td and th, set background color + - restore line wrapping for the last two table cells (description and size) +*/ +.TablePager_nav a { text-decoration: none; } +.TablePager { border-collapse: collapse; } +.TablePager, .TablePager td, .TablePager th { + border: 1px solid #aaaaaa; + padding: 0 0.15em 0 0.15em; +} +.TablePager th { background-color: #eeeeff } +.TablePager td { background-color: #ffffff } +.TablePager tr:hover td { background-color: #eeeeff } + +.imagelist td, .imagelist th { white-space: nowrap } +.imagelist .TablePager_col_links { background-color: #eeeeff } +.imagelist .TablePager_col_img_description { white-space: normal } +.imagelist th.TablePager_sort { background-color: #ccccff } + +.templatesUsed { margin-top: 1.5em; } + +.mw-summary-preview { + margin: 0.1em 0; +} + +/* Convenience links on Special:Ipblocklist */ +p.mw-ipb-conveniencelinks { + font-size: 90%; + float: right; +} + +/* Friendlier slave lag warnings */ +div.mw-lag-warn-normal, +div.mw-lag-warn-high { + padding: 3px; + text-align: center; + margin: 3px auto; +} +div.mw-lag-warn-normal { + border: 1px solid #FFCC66; + background-color: #FFFFCC; +} +div.mw-lag-warn-high { + font-weight: bold; + border: 2px solid #FF0033; + background-color: #FFCCCC; +} + +/* Recreating-deleted-page/reupload file warning and log entries */ +div#mw-upload-deleted-warn, +div#mw-recreate-deleted-warn { + padding: 3px; + margin-bottom: 3px; + border: 2px solid #2F6FAB; +} +div#mw-upload-deleted-warn ul li, +div#mw-recreate-deleted-warn ul li { + font-size: 90%; +} +.MediaTransformError { + background-color: #ccc; + padding: 0.1em; +} +.MediaTransformError td { + text-align: center; + vertical-align: middle; + font-size: 90%; +} +ul { + line-height: 1.5em; + list-style-type: square; + margin: .3em 0 0 1.5em; + padding: 0; + list-style-image: url(bullet.gif); +} +ol { + line-height: 1.5em; + margin: .3em 0 0 3.2em; + padding: 0; + list-style-image: none; +} +li { + margin-bottom: .1em; +} +dt { + font-weight: bold; + margin-bottom: .1em; +} +dl { + margin-top: .2em; + margin-bottom: .5em; +} + +#p-cactions li.new a { + color: #cc2200; +} + +pre { + border: solid 1px #3c78b5; + padding: 0.4em; + background-color: #f0f0f0; +} + +.usermessage { + background-color: #dadaff; +} + +.mw-topboxes { + border-collapse: collapse; + margin: 0 -1em 1em -1em; + padding: 0 0 8px 0; + background: url(footer-grad.png) repeat-x bottom left; +} + +.mw-topbox p { + padding: 0 0 0 0; + margin: 0 0 0 0; +} + +.mw-topbox { + color: black; + font-weight: bold; + margin: 0 0 0 0; + padding: 0 1em 0 1em; + vertical-align: middle; + border-collapse: collapse; + border-bottom: solid 1px #bbbbbb; +} + +#siteSub { + background-color: #dddddd; +} + +/* emulate center */ +.center { + width:100%; + text-align:center; +} +*.center * { + margin-left:auto; + margin-right:auto; +} + +/* table standards */ +.toccolours { + border:1px solid #bbbbbb; + background-color:#f0f0f0; + border-spacing:0pt; + margin:0pt; + padding:0pt; +} + + diff --git a/skins/modern/news_icon.png b/skins/modern/news_icon.png new file mode 100644 index 00000000..dd1541d1 Binary files /dev/null and b/skins/modern/news_icon.png differ diff --git a/skins/modern/print.css b/skins/modern/print.css new file mode 100644 index 00000000..2d5b265e --- /dev/null +++ b/skins/modern/print.css @@ -0,0 +1,9 @@ +#mw_portlets, +#p-cactions, +#p-personal, +#jump-to-nav, +#footer, +span.editsection +{ + display: none; +} diff --git a/skins/modern/rtl.css b/skins/modern/rtl.css new file mode 100644 index 00000000..c92dbcfe --- /dev/null +++ b/skins/modern/rtl.css @@ -0,0 +1,142 @@ +body { + direction: rtl; + unicode-bidi: embed; +} + +.editsection { + float: left; + margin-right: 5px; + margin-left: 0; /* bug 9122: undo default LTR */ +} + +/* Fix alignment */ +.documentByLine, +.portletDetails, +.portletMore { + text-align: left; +} + +div div.thumbcaption { + text-align: right; +} + +div.magnify, +#div.townBox { + left: auto; + right: 0; +} + +/* Fix margins for non-css2 browsers */ +/* top right bottom left */ + +dd { + margin-left: 0; + margin-right: 1.6em; +} +.tocindent { + margin-left: 0; + margin-right: 2em; +} +div.tright, div.floatright, table.floatright { + clear: none; +} +div.tleft, div.floatleft, table.floatleft { + clear: left; +} +div.townBox { + margin-left: 0; + margin-right: 1em; +} +div.townBox dl dd { + margin-left: 0; + margin-right: 1.1em; +} + +/* Fix link icons */ +.external { + padding: 0 !important; + background: none !important; +} + +/* js pref toc */ + +#preftoc { + margin-right: 1em; +} + +.errorbox, .successbox, #preftoc li, .prefsection fieldset { + float: right; +} + +.prefsection { + padding-right: 2em; +} + +/* workaround for moz bug, displayed bullets on left side */ + +#toc ul { + text-align: right; +} + +#toc ul ul { + margin: 0 2em 0 0; +} + +input#wpSave, input#wpDiff { + margin-right: 0; + margin-left: .33em; +} + +#userlogin { + float: right; + margin: 0 0 1em 3em; +} +/* Unblock and Ipblocklist links of Special:Blockip */ +p.mw-ipb-conveniencelinks { + float: left; +} + +.toggle { + margin-left: 0em; + margin-right: 2em; +} +table.filehistory th { + text-align: right; +} + +#mw_contentwrapper { + margin: 0 -15em 0 0; + float: left; +} + +#mw_content { + margin: 0 14em 0 0; + border-left: none; + border-right: solid 1px #bbbbbb; +} + +.portlet ul { + margin: 0 1.5em 0 0; + padding: 0 0 0 0; +} + +.portlet h5 { + padding: 0.1em 1em 0.3em 0; +} + +#p-cactions li { + float: right; +} + +#p-personal li { + float: right; +} + +#p-cactions { + margin: 0 14em 0 0; +} + +#mw_portlets { + border-right: none; + border-left: solid 1px #bbbbbb; +} diff --git a/skins/modern/video.png b/skins/modern/video.png new file mode 100644 index 00000000..38103dac Binary files /dev/null and b/skins/modern/video.png differ diff --git a/skins/monobook/IE60Fixes.css b/skins/monobook/IE60Fixes.css index 6b646c70..bf78413d 100644 --- a/skins/monobook/IE60Fixes.css +++ b/skins/monobook/IE60Fixes.css @@ -80,5 +80,8 @@ div.tright, div.tleft { position: relative; } -/*{ border:1px solid Red !important;}*/ +/* bug 12846 */ +body.rtl #preftoc a, body.rtl #preftoc a:active { + float: left; +} diff --git a/skins/monobook/KHTMLFixes.css b/skins/monobook/KHTMLFixes.css index 97fba0c4..afa3568b 100644 --- a/skins/monobook/KHTMLFixes.css +++ b/skins/monobook/KHTMLFixes.css @@ -1,3 +1,4 @@ /* KHTML fix stylesheet */ /* work around the horizontal scrollbars */ #column-content { margin-left: 0; } + diff --git a/skins/monobook/main.css b/skins/monobook/main.css index 3c089ded..7192b5f3 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -472,14 +472,6 @@ img.thumbborder { display: none; } -/* Have a checkered background on images on the description pages and in galleries - to make transparency visible - -#file img, .gallerybox .thumb img { - background: url(Checker-16x16.png) repeat; -} -*/ - /* ** classes for special content elements like town boxes ** intended to be referenced directly from the wiki src @@ -724,30 +716,6 @@ special external link styling */ background-position: 35% 50% !important; text-decoration: none; } -/* -** the navigation portlet -*/ - -#p-navigation { - position: relative; - z-index: 3; -} -#p-navigation a { - display: block; -} -#p-navigation li.active a, #p-navigation li.active a:hover { - display: inline; -} - -#p-navigation .pBody { - padding-right: 0; -} - -#p-navigation li.active a, #p-navigation li.active a:hover { - text-decoration: none; - font-weight: bold; -} - /* ** Search portlet @@ -1199,6 +1167,7 @@ div#userloginForm .captcha { background-color: #ffa; } div.patrollink { + clear: both; font-size: 75%; text-align: right; } @@ -1298,12 +1267,6 @@ span.changedby { color: gray; } -li span.deleted, span.history-deleted { - text-decoration: line-through; - color: #888; - font-style: italic; -} - .toggle { margin-left: 2em; text-indent: -2em; @@ -1470,6 +1433,13 @@ div#searchTarget ul li:before { content: "\00BB \0020"; } +div#searchTargetHide { + float:right; + border:solid 1px black; + background:gainsboro; + padding:2px; +} + div.multipageimagenavbox { border: solid 1px silver; padding: 4px; @@ -1494,17 +1464,17 @@ table.multipageimage td { /** Special:Version */ -table#sv-ext, table#sv-hooks { +table#sv-ext, table#sv-hooks, table#sv-software { margin: 1em; padding:0em; } -#sv-ext td, #sv-hooks td, -#sv-ext th, #sv-hooks th { +#sv-ext td, #sv-hooks td, #sv-software td, +#sv-ext th, #sv-hooks th, #sv-software th { border: 1px solid #A0A0A0; padding: 0 0.15em 0 0.15em; } -#sv-ext th, #sv-hooks th { +#sv-ext th, #sv-hooks th, #sv-software th { background-color: #F0F0F0; color: black; padding: 0 0.15em 0 0.15em; @@ -1567,12 +1537,14 @@ div.mw-lag-warn-high { background-color: #FFCCCC; } -/* Recreating-deleted-page warning and log entries */ +/* Recreating-deleted-page/reupload file warning and log entries */ +div#mw-upload-deleted-warn, div#mw-recreate-deleted-warn { padding: 3px; margin-bottom: 3px; border: 2px solid #2F6FAB; } +div#mw-upload-deleted-warn ul li, div#mw-recreate-deleted-warn ul li { font-size: 90%; } @@ -1584,4 +1556,4 @@ div#mw-recreate-deleted-warn ul li { text-align: center; vertical-align: middle; font-size: 90%; -} \ No newline at end of file +} diff --git a/skins/monobook/rtl.css b/skins/monobook/rtl.css index e28ffb75..2bd5261e 100644 --- a/skins/monobook/rtl.css +++ b/skins/monobook/rtl.css @@ -227,3 +227,12 @@ p.mw-ipb-conveniencelinks { table.filehistory th { text-align: right; } + +/** + * Lists: + * The following lines don't have a visible effect on non-Gecko browsers + * They fix a problem ith Gecko browsers rendering lists to the right of + * left-floated objects in an RTL layout. + */ +html>body.rtl #bodyContent ul { display:table; } +html>body.rtl #bodyContent ol { display:table; } \ No newline at end of file diff --git a/skins/simple/main.css b/skins/simple/main.css index c159b1f4..b2c477b8 100644 --- a/skins/simple/main.css +++ b/skins/simple/main.css @@ -199,17 +199,9 @@ textarea { width: 100%; } -#p-personal li, #p-personal ul, -#p-tb li, #p-tb ul, -#p-navigation li, #p-navigation ul, -#p-cactions li, #p-cactions ul, -#p-newlinks li, #p-newlinks ul { - padding-left: 0em; - margin-left: 0.5em; -} - -#p-cactions li, #p-cactions ul { - margin-left: 0.7em; +.pBody li, .pBody ul { + padding-left: 0em; + margin-left: 0.5em; } pre { @@ -438,7 +430,8 @@ table.collapsed tr.collapsable { .templatesUsed { margin-top: 1.5em; } -/* Recreating-deleted-page warning and log entries */ +/* Recreating-deleted-page/reupload file warning and log entries */ +div#mw-upload-deleted-warn ul li, div#mw-recreate-deleted-warn ul li { font-size: 95%; } diff --git a/skins/simple/rtl.css b/skins/simple/rtl.css new file mode 100644 index 00000000..002aa72e --- /dev/null +++ b/skins/simple/rtl.css @@ -0,0 +1,175 @@ +/* +Right-to-left fixes for MonoBook. +Places sidebar on right, tweaks various alignment issues. + +Works mostly ok nicely on Safari 1.2.1; fine in Mozilla. + +Safari bugs (1.2.1): +* Tabs are still appearing in left-to-right order. (Try after localizing) + +Opera bugs (7.23 linux): +* Some bits of ltr text (sidebar box titles) have forward and backward versions overlapping each other + +IE/mac bugs: +* The thing barfs on Hebrew and Arabic anyway, so no point testing. + +Missing features due to lack of support: +* external link icons + +To test: +* Opera6 +* IE 5.0 +* etc + +*/ +body { + direction: rtl; +/* unicode-bidi: bidi-override;*/ + unicode-bidi: embed; +} +#column-content { + margin: 0 -12.2em 0 0; + float: left; +} +#column-content #content{ + margin-left: 0; + margin-right: 12.2em; + border-right: 1px solid #aaaaaa; + border-left: none; +} +html>body .portlet { + float: right; + clear: right; +} +.editsection { + float: left; + margin-right: 5px; + margin-left: 0; /* bug 9122: undo default LTR */ +} +/* recover IEMac (might be fine with the float, but usually it's close to IE */ +*>body .portlet { + float: none; + clear: none; +} +.pBody { + padding: 0 0.5em 0.3em 0.8em; +} + +/* Fix alignment */ +.documentByLine, +.portletDetails, +.portletMore { + text-align: left; +} + +div div.thumbcaption { + text-align: right; +} + +div.magnify, +#div.townBox, +#p-logo { + left: auto; + right: 0; +} + +/* Fix margins for non-css2 browsers */ +/* top right bottom left */ + +dd { + margin-left: 0; + margin-right: 1.6em; +} +#contentSub { + margin-right: 1em; + margin-left: 0; +} +.tocindent { + margin-left: 0; + margin-right: 2em; +} +div.tright, div.floatright, table.floatright { + clear: none; +} +div.tleft, div.floatleft, table.floatleft { + clear: left; +} +div.townBox { + margin-left: 0; + margin-right: 1em; +} +div.townBox dl dd { + margin-left: 0; + margin-right: 1.1em; +} + +/* Fix link icons */ +.external { + padding: 0 !important; + background: none !important; +} +#footer { + clear: both; +} +* html #footer { + margin-left: 0; + margin-right: 13.6em; + border-left: 0; + border-right: 1px solid #fabd23; +} +* html #column-content { + float: none; + margin-left: 0; + margin-right: 0; +} +* html #column-content #content { + margin-left: 0; + margin-top: 3em; +} +* html #column-one { right: 0; } + +/* js pref toc */ + +#preftoc { + margin-right: 1em; +} + +.errorbox, .successbox, #preftoc li, .prefsection fieldset { + float: right; +} + +.prefsection { + padding-right: 2em; +} + +/* workaround for moz bug, displayed bullets on left side */ + +#toc ul { + text-align: right; +} + +#toc ul ul { + margin: 0 2em 0 0; +} + +input#wpSave, input#wpDiff { + margin-right: 0; + margin-left: .33em; +} + +#userlogin { + float: right; + margin: 0 0 1em 3em; +} +/* Unblock and Ipblocklist links of Special:Blockip */ +p.mw-ipb-conveniencelinks { + float: left; +} + +.toggle { + margin-left: 0em; + margin-right: 2em; +} +table.filehistory th { + text-align: right; +} -- cgit v1.2.2