diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2009-06-10 13:00:47 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2009-06-10 13:00:47 +0200 |
| commit | 72e90545454c0e014318fa3c81658e035aac58c1 (patch) | |
| tree | 9212e3f46868989c4d57ae9a5c8a1a80e4dc0702 /skins/Modern.php | |
| parent | 565a0ccc371ec1a2a0e9b39487cbac18e6f60e25 (diff) | |
applying patch to version 1.15.0
Diffstat (limited to 'skins/Modern.php')
| -rw-r--r-- | skins/Modern.php | 17 |
1 files changed, 11 insertions, 6 deletions
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'])) { ?> |