diff options
Diffstat (limited to 'skins/ArchLinux.php')
-rw-r--r-- | skins/ArchLinux.php | 19 |
1 files changed, 12 insertions, 7 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' ); ?> /> - <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> @@ -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> </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 } @@ -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'])) { ?> |