https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115138

Revision: 115138
Author:   ashley
Date:     2012-05-04 19:55:25 +0000 (Fri, 04 May 2012)
Log Message:
-----------
WikiForum: fix bug #33676 -- rename searchbox ID to mw-wikiforum-searchbox 
because the searchbox ID is already taken by InputBox (+bump version number)

Modified Paths:
--------------
    trunk/extensions/WikiForum/WikiForum.php
    trunk/extensions/WikiForum/WikiForumGui.php
    trunk/extensions/WikiForum/styles.css

Modified: trunk/extensions/WikiForum/WikiForum.php
===================================================================
--- trunk/extensions/WikiForum/WikiForum.php    2012-05-04 16:15:46 UTC (rev 
115137)
+++ trunk/extensions/WikiForum/WikiForum.php    2012-05-04 19:55:25 UTC (rev 
115138)
@@ -6,8 +6,8 @@
  * @ingroup Extensions
  * @author Michael Chlebek
  * @author Jack Phoenix <j...@countervandalism.net>
- * @date 6 October 2011
- * @version 1.2.1-SW
+ * @date 4 May 2012
+ * @version 1.2.2-SW
  * @copyright Copyright © 2010 Unidentify Studios
  * @copyright Copyright © 2010-2011 Jack Phoenix <j...@countervandalism.net>
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
3.0 or later
@@ -35,7 +35,7 @@
        'path' => __FILE__,
        'name' => 'WikiForum',
        'author' => array( 'Michael Chlebek', 'Jack Phoenix' ),
-       'version' => '1.2.1-SW',
+       'version' => '1.2.2-SW',
        'url' => 'https://www.mediawiki.org/wiki/Extension:WikiForum',
        'descriptionmsg' => 'wikiforum-desc'
 );

Modified: trunk/extensions/WikiForum/WikiForumGui.php
===================================================================
--- trunk/extensions/WikiForum/WikiForumGui.php 2012-05-04 16:15:46 UTC (rev 
115137)
+++ trunk/extensions/WikiForum/WikiForumGui.php 2012-05-04 19:55:25 UTC (rev 
115138)
@@ -22,10 +22,10 @@
 
                $specialPageObj = SpecialPage::getTitleFor( 'WikiForum' );
 
-               $icon = '<img src="' . $wgScriptPath . 
'/extensions/WikiForum/icons/zoom.png" id="searchbox_picture" title="' . wfMsg( 
'search' ) . '" />';
+               $icon = '<img src="' . $wgScriptPath . 
'/extensions/WikiForum/icons/zoom.png" id="mw-wikiforum-searchbox-picture" 
title="' . wfMsg( 'search' ) . '" />';
 
-               $output = '<div id="searchbox"><form method="post" action="' . 
$specialPageObj->escapeFullURL() . '">' .
-                       '<div id="searchbox_border">' . $icon .
+               $output = '<div id="mw-wikiforum-searchbox"><form method="post" 
action="' . $specialPageObj->escapeFullURL() . '">' .
+                       '<div id="mw-wikiforum-searchbox-border">' . $icon .
                        '<input type="text" value="" name="txtSearch" 
id="txtSearch" /></div>
                </form></div>';
 

Modified: trunk/extensions/WikiForum/styles.css
===================================================================
--- trunk/extensions/WikiForum/styles.css       2012-05-04 16:15:46 UTC (rev 
115137)
+++ trunk/extensions/WikiForum/styles.css       2012-05-04 19:55:25 UTC (rev 
115138)
@@ -162,19 +162,19 @@
 }
 
 /* Search box */
-#searchbox {
+#mw-wikiforum-searchbox {
        float: right;
        margin-bottom: 8px;
 }
 
-#searchbox_border {
+#mw-wikiforum-searchbox-border {
        border: 1px dotted #ccc;
        width: 200px;
        text-align: left;
        background: #f6f6f6;
 }
 
-#searchbox_picture {
+#mw-wikiforum-searchbox-picture {
        margin-left: 5px;
        margin-right: 5px;
 }


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to