* Added "Advanced search" link to the search form

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 14dce00..0a49ba3 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -257,6 +257,7 @@ The following extensions are migrated into MediaWiki 1.14:
   move log
 * Image moving is now enabled for sysops by default
 * Make "Did you mean" search feature more noticeable
+* Added "Advanced search" link to the search form
 
 === Bug fixes in 1.14 ===
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 98fe853..1abab6f 100644 (file)
--- 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 636b96b..01d821b 100644 (file)
--- 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="' . wfMsg ('searchaction') . '" 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 f3806dc..0c5b015 100644 (file)
--- 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="' . wfMsg ('searchaction') . '" 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 cb24baf..c16ae47 100644 (file)
--- 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 8afc498..62d98ba 100644 (file)
--- 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 7e5809b..c89e77e 100644 (file)
--- 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
 */