* (bug 6276) Stopped search field from getting too large in Cologne Blue

* Fixed duplicate name/id value of "search" in Cologne Blue

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d53b085..6f4bb52 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -61,6 +61,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 2241) Fix collision of 'w' and 'd' accesskeys
 * (bug 5795) CSS class added to body based on page name for page-specific
   styling
+* (bug 6276) Stopped search field from getting too large in Cologne Blue
+* Fixed duplicate name/id value of "search" in Cologne Blue
 
 == Languages updated ==
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index da38277..51c0cc1 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1030,7 +1030,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '16';
+$wgStyleVersion = '17';
 
 # Server-side caching:
 

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 5612706..801f5ed 100644 (file)
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -304,9 +304,9 @@ class SkinCologneBlue extends Skin {
                $s = "<form id=\"search\" method=\"get\" class=\"inline\" action=\"$action\">";
                if ( "" != $label ) { $s .= "{$label}: "; }
 
-               $s .= "<input type='text' name=\"search\" size='14' value=\""
+               $s .= "<input type='text' id=\"searchtext\" name=\"searchtext\" size=\"14\" value=\""
                  . htmlspecialchars(substr($search,0,256)) . "\" />"
-                 . "<br /><input type='submit' name=\"go\" value=\"" . htmlspecialchars( wfMsg( "searcharticle" ) ) . "\" /> <input type='submit' name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" /></form>";
+                 . "<br /><input type='submit' id=\"go\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( "searcharticle" ) ) . "\" /> <input type='submit' id=\"fulltext\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" /></form>";
 
                return $s;
        }

diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css
index c71eb2d..b1a2991 100644 (file)
--- a/skins/common/cologneblue.css
+++ b/skins/common/cologneblue.css
@@ -94,4 +94,5 @@ a.printable { text-decoration: underline; }
 a.stub, #quickbar a.stub { color:#772233; text-decoration:none; }
 a.new, #quickbar a.new { color: #CC2200; }
 h2, h3, h4, h5, h6 { margin-bottom: 0; }
-small { font-size: 75%; }
\ No newline at end of file
+small { font-size: 75%; }
+input#searchtext { width: 106px; }
\ No newline at end of file