From: Danny B <danny_b@users.mediawiki.org>
Date: Wed, 7 Jan 2009 04:56:08 +0000 (+0000)
Subject: * Added "Advanced search" link to the search form
X-Git-Tag: 1.31.0-rc.0~43524
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=8125067c8b099e992988d29f1e7e165032e98d48;p=lhc%2Fweb%2Fwiklou.git

* Added "Advanced search" link to the search form
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c8f3fd7cda..c938415953 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -258,6 +258,7 @@ The following extensions are migrated into MediaWiki 1.14:
 * Image moving is now enabled for sysops by default
 * Make "Did you mean" search feature more noticeable
 * (bug 16720) Transcluded Special:NewPages processes "/username="
+* Added "Advanced search" link to the search form
 
 === Bug fixes in 1.14 ===
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f7157b279b..9a42c478db 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1446,7 +1446,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '195';
+$wgStyleVersion = '196';
 
 
 # Server-side caching:
diff --git a/includes/Skin.php b/includes/Skin.php
index 636b96bf75..348f420526 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1148,7 +1148,8 @@ END;
 		  . '<input type="text" id="searchInput'.$this->searchboxes.'" name="search" size="19" value="'
 		  . htmlspecialchars(substr($search,0,256)) . "\" />\n"
 		  . '<input type="submit" name="go" value="' . wfMsg ('searcharticle') . '" />&nbsp;'
-		  . '<input type="submit" name="fulltext" value="' . wfMsg ('searchbutton') . "\" />\n</form>";
+		  . '<input type="submit" name="fulltext" value="' . wfMsg ('searchbutton') . "\" />\n"
+		  . '<a href="' . $this->escapeSearchLink() . '" rel="search">' . wfMsg ('powersearch-legend') . '</a></form>';
 
 		// Ensure unique id's for search boxes made after the first
 		$this->searchboxes = $this->searchboxes == '' ? 2 : $this->searchboxes + 1;
diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index f3806dc998..cd93e1f087 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -299,7 +299,8 @@ 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=\"mw-searchButton{$this->searchboxes}\" class=\"searchButton\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" />\n"
+		  . '<a href="$action" rel="search">' . wfMsg ('powersearch-legend') . '</a></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 cb24bafaef..c16ae47668 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -256,6 +256,7 @@ class ModernTemplate extends QuickTemplate {
 						?> 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' ); ?> />
+				<a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a>
 			</div></form>
 		</div><!-- pBody -->
 	</div><!-- portlet -->
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 8afc4982e3..62d98baa7c 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -259,6 +259,7 @@ class MonoBookTemplate extends QuickTemplate {
 						?> 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' ); ?> />
+				<a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a>
 			</div></form>
 		</div>
 	</div>
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 7e5809b55a..c89e77e808 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -715,7 +715,9 @@ input.searchButton {
 	padding: .5em .4em .4em .4em;
 	text-align: center;
 }
-
+#p-search a {
+	font-size: 95%;
+}
 /*
 ** the personal toolbar
 */