apply monobook changes to archlinux skin

10 files changed, 113 insertions, 19 deletions

diff --git a/skins/ArchLinux.php b/skins/ArchLinux.php
index 49a105c1..260f8039 100644
--- a/skins/ArchLinux.php
+++ b/skins/ArchLinux.php
@@ -112,7 +112,7 @@ class ArchLinuxTemplate extends QuickTemplate {
 	<?php if (empty($_REQUEST['printable'])) {?>
 	<a id="logo" 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 id="nav_bar">
 		<ul id="nav">
 			<?php
@@ -260,16 +260,21 @@ class ArchLinuxTemplate 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' ); ?> />&nbsp;
-				<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) { ?>&nbsp;
+				<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>
@@ -302,8 +307,8 @@ class ArchLinuxTemplate 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>&nbsp;</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>&nbsp;
 					<?php } ?></li><?php
 		}
 
@@ -317,7 +322,7 @@ class ArchLinuxTemplate 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/archlinux/FF2Fixes.css b/skins/archlinux/FF2Fixes.css
new file mode 100644
index 00000000..c8b65f50
--- /dev/null
+++ b/skins/archlinux/FF2Fixes.css
@@ -0,0 +1,4 @@
+.rtl .external, a.feedlink {
+	padding: 0 !important;
+	background: none !important;
+}
diff --git a/skins/archlinux/IE60Fixes.css b/skins/archlinux/IE60Fixes.css
index bf78413d..e6e447f6 100644
--- a/skins/archlinux/IE60Fixes.css
+++ b/skins/archlinux/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/archlinux/IE70Fixes.css b/skins/archlinux/IE70Fixes.css
index 43ff7076..00145860 100644
--- a/skins/archlinux/IE70Fixes.css
+++ b/skins/archlinux/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/archlinux/Opera6Fixes.css b/skins/archlinux/Opera6Fixes.css
index 88704739..2a3d78f8 100644
--- a/skins/archlinux/Opera6Fixes.css
+++ b/skins/archlinux/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/archlinux/Opera7Fixes.css b/skins/archlinux/Opera7Fixes.css
index 446ea44c..1dcba7c9 100644
--- a/skins/archlinux/Opera7Fixes.css
+++ b/skins/archlinux/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/archlinux/Opera9Fixes.css b/skins/archlinux/Opera9Fixes.css
new file mode 100644
index 00000000..9c312a84
--- /dev/null
+++ b/skins/archlinux/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/archlinux/external-rtl.png b/skins/archlinux/external-rtl.png
new file mode 100644
index 00000000..c5cd84db
--- /dev/null
+++ b/skins/archlinux/external-rtl.png
diff --git a/skins/archlinux/main.css b/skins/archlinux/main.css
index 7e5809b5..d6a67c1e 100644
--- a/skins/archlinux/main.css
+++ b/skins/archlinux/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/archlinux/rtl.css b/skins/archlinux/rtl.css
index fbd5ab35..9b8e4f44 100644
--- a/skins/archlinux/rtl.css
+++ b/skins/archlinux/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;
+}
+