From 41b92f33438ad8cd757de2336658cea6cba846a7 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 6 Dec 2010 07:08:31 +0000
Subject: [PATCH] Reverted r75832 per my comments on CR, unanswered for 19
 days. Moving all help information into tooltips is a step backwards for
 usability. Reverted followups r75836, r75866, r76314 and r76315.

---
 includes/installer/DatabaseInstaller.php    |  68 +++----
 includes/installer/Installer.i18n.php       |   2 +
 includes/installer/MysqlInstaller.php       |  29 +--
 includes/installer/OracleInstaller.php      |  11 +-
 includes/installer/PostgresInstaller.php    |  13 +-
 includes/installer/SqliteInstaller.php      |   8 +-
 includes/installer/WebInstaller.php         |  60 +++---
 includes/installer/WebInstallerOutput.php   |  31 +--
 includes/installer/WebInstallerPage.php     |  66 +++----
 resources/jquery/jquery.tipsy.js            | 202 --------------------
 skins/common/config.css                     |  47 +++--
 skins/common/config.js                      |  18 +-
 skins/common/images/help-22.png             | Bin 0 -> 4373 bytes
 skins/common/images/help-question-hover.gif | Bin 1246 -> 0 bytes
 skins/common/images/help-question.gif       | Bin 126 -> 0 bytes
 skins/common/images/tipsy-arrow.gif         | Bin 205 -> 0 bytes
 skins/common/shared.css                     |  20 --
 17 files changed, 190 insertions(+), 385 deletions(-)
 delete mode 100644 resources/jquery/jquery.tipsy.js
 create mode 100644 skins/common/images/help-22.png
 delete mode 100644 skins/common/images/help-question-hover.gif
 delete mode 100644 skins/common/images/help-question.gif
 delete mode 100644 skins/common/images/tipsy-arrow.gif

diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php
index 26cf53c316..14e1fd2c6c 100644
--- a/includes/installer/DatabaseInstaller.php
+++ b/includes/installer/DatabaseInstaller.php
@@ -8,7 +8,7 @@
 
 /**
  * Base class for DBMS-specific installation helper classes.
- *
+ * 
  * @ingroup Deployment
  * @since 1.17
  */
@@ -16,30 +16,30 @@ abstract class DatabaseInstaller {
 	
 	/**
 	 * The Installer object.
-	 *
+	 * 
 	 * TODO: naming this parent is confusing, 'installer' would be clearer.
-	 *
+	 * 
 	 * @var Installer
 	 */
 	public $parent;
 
 	/**
 	 * The database connection.
-	 *
+	 * 
 	 * @var DatabaseBase
 	 */
 	public $db;
 
 	/**
 	 * Internal variables for installation.
-	 *
+	 * 
 	 * @var array
 	 */
 	protected $internalDefaults = array();
 
 	/**
 	 * Array of MW configuration globals this class uses.
-	 *
+	 * 
 	 * @var array
 	 */
 	protected $globalNames = array();
@@ -56,7 +56,7 @@ abstract class DatabaseInstaller {
 
 	/**
 	 * Get HTML for a web form that configures this database. Configuration
-	 * at this time should be the minimum needed to connect and test
+	 * at this time should be the minimum needed to connect and test 
 	 * whether install or upgrade is required.
 	 *
 	 * If this is called, $this->parent can be assumed to be a WebInstaller.
@@ -65,7 +65,7 @@ abstract class DatabaseInstaller {
 
 	/**
 	 * Set variables based on the request array, assuming it was submitted
-	 * via the form returned by getConnectForm(). Validate the connection
+	 * via the form returned by getConnectForm(). Validate the connection 
 	 * settings by attempting to connect with them.
 	 *
 	 * If this is called, $this->parent can be assumed to be a WebInstaller.
@@ -77,7 +77,7 @@ abstract class DatabaseInstaller {
 	/**
 	 * Get HTML for a web form that retrieves settings used for installation.
 	 * $this->parent can be assumed to be a WebInstaller.
-	 * If the DB type has no settings beyond those already configured with
+	 * If the DB type has no settings beyond those already configured with 
 	 * getConnectForm(), this should return false.
 	 */
 	public function getSettingsForm() {
@@ -87,7 +87,7 @@ abstract class DatabaseInstaller {
 	/**
 	 * Set variables based on the request array, assuming it was submitted via
 	 * the form return by getSettingsForm().
-	 *
+	 * 
 	 * @return Status
 	 */
 	public function submitSettingsForm() {
@@ -96,7 +96,7 @@ abstract class DatabaseInstaller {
 
 	/**
 	 * Connect to the database using the administrative user/password currently
-	 * defined in the session. On success, return the connection, on failure,
+	 * defined in the session. On success, return the connection, on failure, 
 	 *
 	 * This may be called multiple times, so the result should be cached.
 	 *
@@ -114,7 +114,7 @@ abstract class DatabaseInstaller {
 
 	/**
 	 * Create database tables from scratch.
-	 *
+	 * 
 	 * @return Status
 	 */
 	public function createTables() {
@@ -139,7 +139,7 @@ abstract class DatabaseInstaller {
 
 	/**
 	 * Get the DBMS-specific options for LocalSettings.php generation.
-	 *
+	 * 
 	 * @return String
 	 */
 	public abstract function getLocalSettings();
@@ -188,19 +188,19 @@ abstract class DatabaseInstaller {
 	 */
 	public function getGlobalNames() {
 		return $this->globalNames;
-	}
+	}		
 
 	/**
 	 * Return any table options to be applied to all tables that don't
 	 * override them.
-	 *
+	 * 
 	 * @return Array
 	 */
 	public function getTableOptions() {
 		return array();
 	}
 
-	/**
+	/** 
 	 * Construct and initialise parent.
 	 * This is typically only called from Installer::getDBInstaller()
 	 */
@@ -211,7 +211,7 @@ abstract class DatabaseInstaller {
 	/**
 	 * Convenience function.
 	 * Check if a named extension is present.
-	 *
+	 * 
 	 * @see wfDl
 	 */
 	protected static function checkExtension( $name ) {
@@ -267,19 +267,15 @@ abstract class DatabaseInstaller {
 	/**
 	 * Get a labelled text box to configure a local variable.
 	 */
-	public function getTextBox( $var, $label, $attribs = array(), $helpData = "" ) {
+	public function getTextBox( $var, $label, $attribs = array() ) {
 		$name = $this->getName() . '_' . $var;
 		$value = $this->getVar( $var );
-		if ( !isset( $attribs ) ) {
-		    $attribs = array();
-		}
 		return $this->parent->getTextBox( array(
 			'var' => $var,
 			'label' => $label,
 			'attribs' => $attribs,
 			'controlName' => $name,
-			'value' => $value,
-		    'help' => $helpData
+			'value' => $value
 		) );
 	}
 
@@ -287,26 +283,22 @@ abstract class DatabaseInstaller {
 	 * Get a labelled password box to configure a local variable.
 	 * Implements password hiding.
 	 */
-	public function getPasswordBox( $var, $label, $attribs = array(), $helpData = "" ) {
+	public function getPasswordBox( $var, $label, $attribs = array() ) {
 		$name = $this->getName() . '_' . $var;
 		$value = $this->getVar( $var );
-		if ( !isset( $attribs ) ) {
-		    $attribs = array();
-		}
 		return $this->parent->getPasswordBox( array(
 			'var' => $var,
 			'label' => $label,
 			'attribs' => $attribs,
 			'controlName' => $name,
-			'value' => $value,
-		    'help' => $helpData
+			'value' => $value
 		) );
 	}
 
 	/**
 	 * Get a labelled checkbox to configure a local boolean variable.
 	 */
-	public function getCheckBox( $var, $label, $attribs = array(), $helpData = "" ) {
+	public function getCheckBox( $var, $label, $attribs = array() ) {
 		$name = $this->getName() . '_' . $var;
 		$value = $this->getVar( $var );
 		return $this->parent->getCheckBox( array(
@@ -315,7 +307,6 @@ abstract class DatabaseInstaller {
 			'attribs' => $attribs,
 			'controlName' => $name,
 			'value' => $value,
-		    'help' => $helpData
 		));
 	}
 
@@ -348,11 +339,11 @@ abstract class DatabaseInstaller {
 	}
 
 	/**
-	 * Determine whether an existing installation of MediaWiki is present in
-	 * the configured administrative connection. Returns true if there is
+	 * Determine whether an existing installation of MediaWiki is present in 
+	 * the configured administrative connection. Returns true if there is 
 	 * such a wiki, false if the database doesn't exist.
 	 *
-	 * Traditionally, this is done by testing for the existence of either
+	 * Traditionally, this is done by testing for the existence of either 
 	 * the revision table or the cur table.
 	 *
 	 * @return Boolean
@@ -376,8 +367,9 @@ abstract class DatabaseInstaller {
 		return
 			Html::openElement( 'fieldset' ) .
 			Html::element( 'legend', array(), wfMsg( 'config-db-install-account' ) ) .
-			$this->getTextBox( '_InstallUser', 'config-db-username', array(), $this->parent->getHelpBox( 'config-db-install-username' ) ) .
-			$this->getPasswordBox( '_InstallPassword', 'config-db-password', array(), $this->parent->getHelpBox( 'config-db-install-password' ) ) .
+			$this->getTextBox( '_InstallUser', 'config-db-username' ) .
+			$this->getPasswordBox( '_InstallPassword', 'config-db-password' ) .
+			$this->parent->getHelpBox( 'config-db-install-help' ) .
 			Html::closeElement( 'fieldset' );
 	}
 
@@ -397,7 +389,7 @@ abstract class DatabaseInstaller {
 	public function getWebUserBox( $noCreateMsg = false ) {
 		$s = Html::openElement( 'fieldset' ) .
 			Html::element( 'legend', array(), wfMsg( 'config-db-web-account' ) ) .
-			$this->getCheckBox(
+			$this->getCheckBox( 
 				'_SameAccount', 'config-db-web-account-same',
 				array( 'class' => 'hideShowRadio', 'rel' => 'dbOtherAccount' )
 			) .
@@ -416,7 +408,7 @@ abstract class DatabaseInstaller {
 
 	/**
 	 * Submit the form from getWebUserBox().
-	 *
+	 * 
 	 * @return Status
 	 */
 	public function submitWebUserBox() {
diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index b6fa715872..d9f76fe368 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -31,6 +31,8 @@ Restart the installation process.',
 	'config-no-session'               => 'Your session data was lost!
 Check your php.ini and make sure <code>session.save_path</code> is set to an appropriate directory.',
 	'config-session-path-bad'         => 'Your <code>session.save_path</code> (<code>$1</code>) seems to be invalid or unwritable.',
+	'config-show-help'                => 'Help',
+	'config-hide-help'                => 'Hide help',
 	'config-your-language'            => 'Your language:',
 	'config-your-language-help'       => 'Select a language to use during the installation process.',
 	'config-wiki-language'            => 'Wiki language:',
diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index 033875a298..c87b71b99d 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -8,7 +8,7 @@
 
 /**
  * Class for setting up the MediaWiki database using MySQL.
- *
+ * 
  * @ingroup Deployment
  * @since 1.17
  */
@@ -59,11 +59,14 @@ class MysqlInstaller extends DatabaseInstaller {
 
 	public function getConnectForm() {
 		return
-			$this->getTextBox( 'wgDBserver', 'config-db-host', array(), $this->parent->getHelpBox( 'config-db-host-help' ) ) .
+			$this->getTextBox( 'wgDBserver', 'config-db-host' ) .
+			$this->parent->getHelpBox( 'config-db-host-help' ) . 
 			Html::openElement( 'fieldset' ) .
 			Html::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) .
-			$this->getTextBox( 'wgDBname', 'config-db-name', array(), $this->parent->getHelpBox( 'config-db-name-help' ) ) .
-			$this->getTextBox( 'wgDBprefix', 'config-db-prefix', array(), $this->parent->getHelpBox( 'config-db-prefix-help' ) ) .
+			$this->getTextBox( 'wgDBname', 'config-db-name' ) .
+			$this->parent->getHelpBox( 'config-db-name-help' ) .
+			$this->getTextBox( 'wgDBprefix', 'config-db-prefix' ) .
+			$this->parent->getHelpBox( 'config-db-prefix-help' ) .
 			Html::closeElement( 'fieldset' ) .
 			$this->getInstallUserBox();
 	}
@@ -117,7 +120,7 @@ class MysqlInstaller extends DatabaseInstaller {
 				$this->getVar( '_InstallPassword' ),
 				false,
 				false,
-				0,
+				0, 
 				$this->getVar( 'wgDBprefix' )
 			);
 			$status->value = $this->db;
@@ -249,12 +252,12 @@ class MysqlInstaller extends DatabaseInstaller {
 		if ( count( $parts ) != 2 ) {
 			return false;
 		}
-		$quotedUser = $conn->addQuotes( $parts[0] ) .
+		$quotedUser = $conn->addQuotes( $parts[0] ) . 
 			'@' . $conn->addQuotes( $parts[1] );
 
 		// The user needs to have INSERT on mysql.* to be able to CREATE USER
 		// The grantee will be double-quoted in this query, as required
-		$res = $conn->select( 'INFORMATION_SCHEMA.USER_PRIVILEGES', '*',
+		$res = $conn->select( 'INFORMATION_SCHEMA.USER_PRIVILEGES', '*', 
 			array( 'GRANTEE' => $quotedUser ), __METHOD__ );
 		$insertMysql = false;
 		$grantOptions = array_flip( $this->webUserPrivs );
@@ -270,7 +273,7 @@ class MysqlInstaller extends DatabaseInstaller {
 		// Check for DB-specific privs for mysql.*
 		if ( !$insertMysql ) {
 			$row = $conn->selectRow( 'INFORMATION_SCHEMA.SCHEMA_PRIVILEGES', '*',
-				array(
+				array( 
 					'GRANTEE' => $quotedUser,
 					'TABLE_SCHEMA' => 'mysql',
 					'PRIVILEGE_TYPE' => 'INSERT',
@@ -285,7 +288,7 @@ class MysqlInstaller extends DatabaseInstaller {
 		}
 
 		// Check for DB-level grant options
-		$res = $conn->select( 'INFORMATION_SCHEMA.SCHEMA_PRIVILEGES', '*',
+		$res = $conn->select( 'INFORMATION_SCHEMA.SCHEMA_PRIVILEGES', '*', 
 			array(
 				'GRANTEE' => $quotedUser,
 				'IS_GRANTABLE' => 1,
@@ -319,9 +322,9 @@ class MysqlInstaller extends DatabaseInstaller {
 		}
 		if ( count( $engines ) >= 2 ) {
 			$s .= $this->getRadioSet( array(
-				'var' => '_MysqlEngine',
-				'label' => 'config-mysql-engine',
-				'itemLabelPrefix' => 'config-mysql-',
+				'var' => '_MysqlEngine', 
+				'label' => 'config-mysql-engine', 
+				'itemLabelPrefix' => 'config-mysql-', 
 				'values' => $engines
 			));
 			$s .= $this->parent->getHelpBox( 'config-mysql-engine-help' );
@@ -372,7 +375,7 @@ class MysqlInstaller extends DatabaseInstaller {
 					$this->getVar( 'wgDBpassword' ),
 					false,
 					false,
-					0,
+					0, 
 					$this->getVar( 'wgDBprefix' )
 				);
 			} catch ( DBConnectionError $e ) {
diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php
index d9bc098a0b..cc5c6c778e 100644
--- a/includes/installer/OracleInstaller.php
+++ b/includes/installer/OracleInstaller.php
@@ -8,7 +8,7 @@
  
 /**
  * Class for setting up the MediaWiki database using Oracle.
- *
+ * 
  * @ingroup Deployment
  * @since 1.17
  */
@@ -46,7 +46,8 @@ class OracleInstaller extends DatabaseInstaller {
 			Html::element( 'legend', array(), wfMsg( 'config-db-web-account' ) ) .
 			Html::openElement( 'div', array( 'id' => 'dbOtherAccount' ) ) .
 			$this->getTextBox( 'wgDBuser', 'config-db-username' ) .
-			$this->getPasswordBox( 'wgDBpassword', 'config-db-password', array(), $this->parent->getHelpBox( 'config-db-web-help' ) ) .
+			$this->getPasswordBox( 'wgDBpassword', 'config-db-password' ) .
+			$this->parent->getHelpBox( 'config-db-web-help' ).
 			$this->getCheckBox( '_CreateDBAccount', 'config-db-web-create', array( 'disabled' => true ) ).
 			Html::closeElement( 'div' ) . Html::closeElement( 'fieldset' );
 	}
@@ -55,12 +56,14 @@ class OracleInstaller extends DatabaseInstaller {
 		$this->parent->setVar( '_InstallUser', 'sys' );
 		$this->parent->setVar( 'wgDBserver', '' );
 		return
-			$this->getTextBox( 'wgDBserver', 'config-db-host-oracle', array(), $this->parent->getHelpBox( 'config-db-host-oracle-help' ) ) .
+			$this->getTextBox( 'wgDBserver', 'config-db-host-oracle' ) .
+			$this->parent->getHelpBox( 'config-db-host-oracle-help' ) . 
 			Html::openElement( 'fieldset' ) .
 			Html::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) .
 			$this->getTextBox( 'wgDBprefix', 'config-db-prefix' ) .
 			$this->getTextBox( '_OracleDefTS', 'config-oracle-def-ts' ) .
-			$this->getTextBox( '_OracleTempTS', 'config-oracle-temp-ts', array(), $this->parent->getHelpBox( 'config-db-oracle-help' ) ) .
+			$this->getTextBox( '_OracleTempTS', 'config-oracle-temp-ts' ) .
+			$this->parent->getHelpBox( 'config-db-oracle-help' ) .
 			Html::closeElement( 'fieldset' ) .
 			$this->getInstallUserBox().
 			$this->getWebUserBox();
diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index 9d832f94ab..9a0a233b39 100644
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -8,7 +8,7 @@
 
 /**
  * Class for setting up the MediaWiki database using Postgres.
- *
+ * 
  * @ingroup Deployment
  * @since 1.17
  */
@@ -36,20 +36,23 @@ class PostgresInstaller extends DatabaseInstaller {
 
 	function getConnectForm() {
 		return
-			$this->getTextBox( 'wgDBserver', 'config-db-host', array(), $this->parent->getHelpBox( 'config-db-host-help' ) ) .
+			$this->getTextBox( 'wgDBserver', 'config-db-host' ) .
+			$this->parent->getHelpBox( 'config-db-host-help' ) . 
 			$this->getTextBox( 'wgDBport', 'config-db-port' ) .
 			Html::openElement( 'fieldset' ) .
 			Html::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) .
-			$this->getTextBox( 'wgDBname', 'config-db-name', array(), $this->parent->getHelpBox( 'config-db-name-help' ) ) .
-			$this->getTextBox( 'wgDBmwschema', 'config-db-schema', array(), $this->parent->getHelpBox( 'config-db-schema-help' ) ) .
+			$this->getTextBox( 'wgDBname', 'config-db-name' ) .
+			$this->parent->getHelpBox( 'config-db-name-help' ) .
+			$this->getTextBox( 'wgDBmwschema', 'config-db-schema' ) .
 			$this->getTextBox( 'wgDBts2schema', 'config-db-ts2-schema' ) .
+			$this->parent->getHelpBox( 'config-db-schema-help' ) .
 			Html::closeElement( 'fieldset' ) .
 			$this->getInstallUserBox();
 	}
 
 	function submitConnectForm() {
 		// Get variables from the request
-		$newValues = $this->setVarsFromRequest( array( 'wgDBserver', 'wgDBport',
+		$newValues = $this->setVarsFromRequest( array( 'wgDBserver', 'wgDBport', 
 			'wgDBname', 'wgDBmwschema', 'wgDBts2schema' ) );
 
 		// Validate them
diff --git a/includes/installer/SqliteInstaller.php b/includes/installer/SqliteInstaller.php
index d191f6e0cb..4dccdd1a4c 100644
--- a/includes/installer/SqliteInstaller.php
+++ b/includes/installer/SqliteInstaller.php
@@ -8,7 +8,7 @@
  
 /**
  * Class for setting up the MediaWiki database using SQLLite.
- *
+ * 
  * @ingroup Deployment
  * @since 1.17
  */
@@ -41,8 +41,10 @@ class SqliteInstaller extends DatabaseInstaller {
 	}
 
 	public function getConnectForm() {
-		return $this->getTextBox( 'wgSQLiteDataDir', 'config-sqlite-dir', array(), $this->parent->getHelpBox( 'config-sqlite-dir-help' ) ) .
-			$this->getTextBox( 'wgDBname', 'config-db-name', array(), $this->parent->getHelpBox( 'config-sqlite-name-help' ) );
+		return $this->getTextBox( 'wgSQLiteDataDir', 'config-sqlite-dir' ) .
+			$this->parent->getHelpBox( 'config-sqlite-dir-help' ) .
+			$this->getTextBox( 'wgDBname', 'config-db-name' ) .
+			$this->parent->getHelpBox( 'config-sqlite-name-help' );
 	}
 
 	public function submitConnectForm() {
diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index 7abe688e14..fa1a12abd4 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -613,12 +613,21 @@ class WebInstaller extends CoreInstaller {
 		array_shift( $args );
 		$args = array_map( 'htmlspecialchars', $args );
 		$text = wfMsgReal( $msg, $args, false, false, false );
-		$html = htmlspecialchars( $text );
-		//$html = $this->parse( $text, true );
+		$html = $this->parse( $text, true );
+
 		return
-            "<span class=\"mw-help-field-hint\"\n" .
-      	    "     title=\"" . $html . "\"\n" .
-    	    "     original-title=\"" . $html . "\"></span>\n";
+			"<div class=\"config-help-wrapper\">\n" .
+			"<div class=\"config-help-message\">\n" .
+			 $html .
+			"</div>\n" .
+			"<div class=\"config-show-help\">\n" .
+			"<a href=\"#\">" .
+			wfMsgHtml( 'config-show-help' ) .
+			"</a></div>\n" .
+			"<div class=\"config-hide-help\">\n" .
+			"<a href=\"#\">" .
+			wfMsgHtml( 'config-hide-help' ) .
+			"</a></div>\n</div>\n";
 	}
 
 	/**
@@ -661,7 +670,7 @@ class WebInstaller extends CoreInstaller {
 	 * Label a control by wrapping a config-input div around it and putting a
 	 * label before it.
 	 */
-	public function label( $msg, $forId, $contents, $helpData = "" ) {
+	public function label( $msg, $forId, $contents ) {
 		if ( strval( $msg ) == '' ) {
 			$labelText = '&#160;';
 		} else {
@@ -675,16 +684,11 @@ class WebInstaller extends CoreInstaller {
 		}
 
 		return
-			"<div class=\"config-block\">\n" .
-		    "  <div class=\"config-block-label\">\n" .
+			"<div class=\"config-input\">\n" .
 			Xml::tags( 'label',
 				$attributes,
 				$labelText ) . "\n" .
-			    $helpData .
-			"  </div>\n" .
-		    "  <div class=\"config-block-elements\">\n" .
-			    $contents .
-			"  </div>\n" .
+			$contents .
 			"</div>\n";
 	}
 
@@ -698,7 +702,6 @@ class WebInstaller extends CoreInstaller {
 	 *      attribs:    Additional attributes for the input element (optional)
 	 *      controlName: The name for the input element (optional)
 	 *      value:      The current value of the variable (optional)
-	 *      help:		The html for the help text (optional)
 	 */
 	public function getTextBox( $params ) {
 		if ( !isset( $params['controlName'] ) ) {
@@ -712,9 +715,7 @@ class WebInstaller extends CoreInstaller {
 		if ( !isset( $params['attribs'] ) ) {
 			$params['attribs'] = array();
 		}
-		if ( !isset( $params['help'] ) ) {
-			$params['help'] = "";
-		}
+
 		return
 			$this->label(
 				$params['label'],
@@ -728,8 +729,7 @@ class WebInstaller extends CoreInstaller {
 						'class' => 'config-input-text',
 						'tabindex' => $this->nextTabIndex()
 					)
-				),
-				$params['help']
+				)
 			);
 	}
 
@@ -744,7 +744,6 @@ class WebInstaller extends CoreInstaller {
 	 *      attribs:    Additional attributes for the input element (optional)
 	 *      controlName: The name for the input element (optional)
 	 *      value:      The current value of the variable (optional)
-	 *      help:		The html for the help text (optional)
 	 */
 	public function getPasswordBox( $params ) {
 		if ( !isset( $params['value'] ) ) {
@@ -771,7 +770,6 @@ class WebInstaller extends CoreInstaller {
 	 *      attribs:    Additional attributes for the input element (optional)
 	 *      controlName: The name for the input element (optional)
 	 *      value:      The current value of the variable (optional)
-	 *      help:		The html for the help text (optional)
 	 */
 	public function getCheckBox( $params ) {
 		if ( !isset( $params['controlName'] ) ) {
@@ -785,9 +783,7 @@ class WebInstaller extends CoreInstaller {
 		if ( !isset( $params['attribs'] ) ) {
 			$params['attribs'] = array();
 		}
-		if ( !isset( $params['help'] ) ) {
-			$params['help'] = "";
-		}
+
 		if( isset( $params['rawtext'] ) ) {
 			$labelText = $params['rawtext'];
 		} else {
@@ -807,7 +803,6 @@ class WebInstaller extends CoreInstaller {
 			) .
 			$labelText . "\n" .
 			"</label>\n" .
-			$params['help'] .
 			"</div>\n";
 	}
 
@@ -824,7 +819,6 @@ class WebInstaller extends CoreInstaller {
 	 *      commonAttribs   Attribute array applied to all items
 	 *      controlName:    The name for the input element (optional)
 	 *      value:          The current value of the variable (optional)
-	 *      help:		The html for the help text (optional)
 	 */
 	public function getRadioSet( $params ) {
 		if ( !isset( $params['controlName']  ) ) {
@@ -838,12 +832,13 @@ class WebInstaller extends CoreInstaller {
 		if ( !isset( $params['label'] ) ) {
 			$label = '';
 		} else {
-			$label = $params['label'];
-		}
-		if ( !isset( $params['help'] ) ) {
-			$params['help'] = "";
+			$label = $this->parse( wfMsgNoTrans( $params['label'] ) );
 		}
-		$s = "<ul>\n";
+
+		$s = "<label class=\"config-label\">\n" .
+			$label .
+			"</label>\n" .
+			"<ul class=\"config-settings-block\">\n";
 		foreach ( $params['values'] as $value ) {
 			$itemAttribs = array();
 
@@ -871,8 +866,7 @@ class WebInstaller extends CoreInstaller {
 		}
 
 		$s .= "</ul>\n";
-
-		return $this->label( $label, $params['controlName'], $s, $params['help'] );
+		return $s;
 	}
 
 	/**
diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index b4a013eea8..3492ca8025 100644
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -9,20 +9,20 @@
 /**
  * Output class modelled on OutputPage.
  *
- * I've opted to use a distinct class rather than derive from OutputPage here in
- * the interests of separation of concerns: if we used a subclass, there would be
- * quite a lot of things you could do in OutputPage that would break the installer,
- * that wouldn't be immediately obvious.
- *
+ * I've opted to use a distinct class rather than derive from OutputPage here in 
+ * the interests of separation of concerns: if we used a subclass, there would be 
+ * quite a lot of things you could do in OutputPage that would break the installer, 
+ * that wouldn't be immediately obvious. 
+ * 
  * @ingroup Deployment
  * @since 1.17
  */
 class WebInstallerOutput {
 	/**
 	 * The WebInstaller object this WebInstallerOutput is used by.
-	 *
+	 * 
 	 * @var WebInstaller
-	 */
+	 */	
 	public $parent;
 
 	/**
@@ -47,7 +47,7 @@ class WebInstallerOutput {
 
 	/**
 	 * Constructor.
-	 *
+	 * 
 	 * @param $parent WebInstaller
 	 */
 	public function __construct( WebInstaller $parent ) {
@@ -182,11 +182,16 @@ class WebInstallerOutput {
 	<?php echo Html::linkedStyle( $this->getCssUrl() ) . "\n"; ?>
 	<?php echo Html::inlineScript(  "var dbTypes = " . Xml::encodeJsVar( $dbTypes ) ) . "\n"; ?>
 	<?php echo $this->getJQuery() . "\n"; ?>
-	<?php echo $this->getJQueryTipsy() . "\n"; ?>
 	<?php echo Html::linkedScript( '../skins/common/config.js' ) . "\n"; ?>
 </head>
 
 <?php echo Html::openElement( 'body', array( 'class' => $this->getDir() ) ) . "\n"; ?>
+<noscript>
+<style type="text/css">
+.config-help-message { display: block; }
+.config-show-help { display: none; }
+</style>
+</noscript>
 <div id="mw-page-base"></div>
 <div id="mw-head-base"></div>
 <div id="content">
@@ -236,7 +241,6 @@ class WebInstallerOutput {
 	<title><?php $this->outputTitle(); ?></title>
 	<?php echo Html::linkedStyle( $this->getCssUrl() ) . "\n"; ?>
 	<?php echo $this->getJQuery(); ?>
-	<?php echo $this->getJQueryTipsy() . "\n"; ?>
 	<?php echo Html::linkedScript( '../skins/common/config.js' ); ?>
 </head>
 
@@ -252,7 +256,10 @@ class WebInstallerOutput {
 	public function getJQuery() {
 		return Html::linkedScript( "../resources/jquery/jquery.js" );
 	}
-	public function getJQueryTipsy() {
-		return Html::linkedScript( "../resources/jquery/jquery.tipsy.js" );
+
+	public function outputWarnings() {
+		$this->addHTML( $this->warnings );
+		$this->warnings = '';
 	}
+	
 }
diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 074d2d17b1..116829c5b2 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -8,7 +8,7 @@
 
 /**
  * Abstract class to define pages for the web installer.
- *
+ * 
  * @ingroup Deployment
  * @since 1.17
  */
@@ -16,7 +16,7 @@ abstract class WebInstallerPage {
 
 	/**
 	 * The WebInstaller object this WebInstallerPage belongs to.
-	 *
+	 * 
 	 * @var WebInstaller
 	 */
 	public $parent;
@@ -25,7 +25,7 @@ abstract class WebInstallerPage {
 	
 	/**
 	 * Constructor.
-	 *
+	 * 
 	 * @param $parent WebInstaller
 	 */
 	public function __construct( WebInstaller $parent ) {
@@ -220,15 +220,13 @@ class WebInstaller_Language extends WebInstallerPage {
 		}
 		$this->startForm();
 		$s = Html::hidden( 'LanguageRequestTime', time() ) .
-			$this->getLanguageSelector( 'UserLang', 'config-your-language', $userLang, $this->parent->getHelpBox( 'config-your-language-help' ) ) .
-			$this->getLanguageSelector( 'ContLang', 'config-wiki-language', $contLang, $this->parent->getHelpBox( 'config-wiki-language-help' ) ) .
-			$this->parent->getCheckBox(
-				array(
-					'var' => '_ExternalHTTP',
-					'label' => 'config-allow-requests',
-				    'help' => $this->parent->getHelpBox( 'config-allow-requests-help' )
-				)
-			);
+			$this->getLanguageSelector( 'UserLang', 'config-your-language', $userLang ) .
+			$this->parent->getHelpBox( 'config-your-language-help' ) .
+			$this->getLanguageSelector( 'ContLang', 'config-wiki-language', $contLang ) .
+			$this->parent->getHelpBox( 'config-wiki-language-help' ) .
+			$this->parent->getCheckBox( 
+				array( 'var' => '_ExternalHTTP', 'label' => 'config-allow-requests' )
+			) . $this->parent->getHelpBox( 'config-allow-requests-help' );
 
 		$this->addHTML( $s );
 		$this->endForm();
@@ -265,7 +263,7 @@ class WebInstaller_Welcome extends WebInstallerPage {
 		$this->parent->output->addWikiText( wfMsgNoTrans( 'config-welcome' ) );
 		$status = $this->parent->doEnvironmentChecks();
 		if ( $status ) {
-			$this->parent->output->addWikiText( wfMsgNoTrans( 'config-copyright',
+			$this->parent->output->addWikiText( wfMsgNoTrans( 'config-copyright', 
 				SpecialVersion::getCopyrightAndAuthorList() ) );
 			$this->startForm();
 			$this->endForm();
@@ -297,7 +295,7 @@ class WebInstaller_DBConnect extends WebInstallerPage {
 		$dbSupport = '';
 		foreach( $this->parent->getDBTypes() as $type ) {
 			$db = 'Database' . ucfirst( $type );
-			$dbSupport .= wfMsgNoTrans( "config-support-$type",
+			$dbSupport .= wfMsgNoTrans( "config-support-$type", 
 				call_user_func( array( $db, 'getSoftwareLink' ) ) ) . "\n";
 		}
 		$this->addHTML( $this->parent->getInfoBox(
@@ -466,22 +464,21 @@ class WebInstaller_Name extends WebInstallerPage {
 			$this->parent->getTextBox( array(
 				'var' => 'wgSitename',
 				'label' => 'config-site-name',
-			  'help' => $this->parent->getHelpBox( 'config-site-name-help' )
 			) ) .
+			$this->parent->getHelpBox( 'config-site-name-help' ) .
 			$this->parent->getRadioSet( array(
 				'var' => '_NamespaceType',
 				'label' => 'config-project-namespace',
 				'itemLabelPrefix' => 'config-ns-',
 				'values' => array( 'site-name', 'generic', 'other' ),
 				'commonAttribs' => array( 'class' => 'enableForOther', 'rel' => 'config_wgMetaNamespace' ),
-				'help' => $this->parent->getHelpBox( 'config-project-namespace-help' )
 			) ) .
 			$this->parent->getTextBox( array(
 				'var' => 'wgMetaNamespace',
 				'label' => '', //TODO: Needs a label?
 				'attribs' => array( 'readonly' => 'readonly', 'class' => 'enabledByOther' ),
-			    
 			) ) .
+			$this->parent->getHelpBox( 'config-project-namespace-help' ) .
 			$this->getFieldSetStart( 'config-admin-box' ) .
 			$this->parent->getTextBox( array(
 				'var' => '_AdminName',
@@ -496,16 +493,17 @@ class WebInstaller_Name extends WebInstallerPage {
 				'var' => '_AdminPassword2',
 				'label' => 'config-admin-password-confirm'
 			) ) .
+			$this->parent->getHelpBox( 'config-admin-help' ) .
 			$this->parent->getTextBox( array(
 				'var' => '_AdminEmail',
-				'label' => 'config-admin-email',
-			    'help' => $this->parent->getHelpBox( 'config-admin-email-help' )
+				'label' => 'config-admin-email'
 			) ) .
+			$this->parent->getHelpBox( 'config-admin-email-help' ) .
 			$this->parent->getCheckBox( array(
 				'var' => '_Subscribe',
-				'label' => 'config-subscribe',
-			    'help' => $this->parent->getHelpBox( 'config-subscribe-help' )
+				'label' => 'config-subscribe'
 			) ) .
+			$this->parent->getHelpBox( 'config-subscribe-help' ) .
 			$this->getFieldSetEnd() .
 			$this->parent->getInfoBox( wfMsg( 'config-almost-done' ) ) .
 			$this->parent->getRadioSet( array(
@@ -587,12 +585,9 @@ class WebInstaller_Name extends WebInstallerPage {
 
 		// Validate password
 		$msg = false;
-		$valid = false;
 		$pwd = $this->getVar( '_AdminPassword' );
 		$user = User::newFromName( $cname );
-		if ( ( isset ( $pwd ) ) && ( $user != null ) ) {
-    		$valid = $user->getPasswordValidity( $pwd );
-		}
+		$valid = $user->getPasswordValidity( $pwd );
 		if ( strval( $pwd ) === '' ) {
 			# $user->getPasswordValidity just checks for $wgMinimalPasswordLength.
 			# This message is more specific and helpful.
@@ -700,31 +695,31 @@ class WebInstaller_Options extends WebInstallerPage {
 			}
 			
 			$extHtml .= $this->parent->getHelpBox( 'config-extensions-help' ) .
-			$this->getFieldSetEnd();
+				$this->getFieldSetEnd();
 			$this->addHTML( $extHtml );
 		}
 
 		$this->addHTML(
 			# Uploading
 			$this->getFieldSetStart( 'config-upload-settings' ) .
-			$this->parent->getCheckBox( array(
+			$this->parent->getCheckBox( array( 
 				'var' => 'wgEnableUploads',
 				'label' => 'config-upload-enable',
 				'attribs' => array( 'class' => 'showHideRadio', 'rel' => 'uploadwrapper' ),
-			    'help' => $this->parent->getHelpBox( 'config-upload-help' )
 			) ) .
+			$this->parent->getHelpBox( 'config-upload-help' ) .
 			'<div id="uploadwrapper" style="display: none;">' .
-			$this->parent->getTextBox( array(
+			$this->parent->getTextBox( array( 
 				'var' => 'wgDeletedDirectory',
 				'label' => 'config-upload-deleted',
-			    'help' => $this->parent->getHelpBox( 'config-upload-deleted-help' )
 			) ) .
+			$this->parent->getHelpBox( 'config-upload-deleted-help' ) .
 			'</div>' .
 			$this->parent->getTextBox( array(
 				'var' => 'wgLogo',
-				'label' => 'config-logo',
-			    'help' => $this->parent->getHelpBox( 'config-logo-help' )
-			) )
+				'label' => 'config-logo'
+			) ) .
+			$this->parent->getHelpBox( 'config-logo-help' )
 		);
 		$canUse = $this->getVar( '_ExternalHTTP' ) ?
 			'config-instantcommons-good' : 'config-instantcommons-bad';
@@ -732,8 +727,8 @@ class WebInstaller_Options extends WebInstallerPage {
 			$this->parent->getCheckBox( array(
 				'var' => 'wgUseInstantCommons',
 				'label' => 'config-instantcommons',
-			    'help' => $this->parent->getHelpBox( 'config-instantcommons-help', wfMsgNoTrans( $canUse ) )
 			) ) .
+			$this->parent->getHelpBox( 'config-instantcommons-help', wfMsgNoTrans( $canUse ) ) .
 			$this->getFieldSetEnd()
 		);
 
@@ -759,9 +754,8 @@ class WebInstaller_Options extends WebInstallerPage {
 			$this->parent->getTextBox( array(
 				'var' => '_MemCachedServers',
 				'label' => 'config-memcached-servers',
-				'help' => $this->parent->getHelpBox( 'config-memcached-help' )
 			) ) .
-			'</div>' .
+			$this->parent->getHelpBox( 'config-memcached-help' ) . '</div>' .
 			$this->getFieldSetEnd()
 		);
 		$this->endForm();
diff --git a/resources/jquery/jquery.tipsy.js b/resources/jquery/jquery.tipsy.js
deleted file mode 100644
index 60e5356e92..0000000000
--- a/resources/jquery/jquery.tipsy.js
+++ /dev/null
@@ -1,202 +0,0 @@
-// tipsy, facebook style tooltips for jquery
-// version 1.0.0a
-// (c) 2008-2010 jason frame [jason@onehackoranother.com]
-// released under the MIT license
-
-(function($) {
-		
-		function Tipsy(element, options) {
-				this.$element = $(element);
-				this.options = options;
-				this.enabled = true;
-				this.fixTitle();
-		}
-		
-		Tipsy.prototype = {
-				show: function() {
-						var title = this.getTitle();
-						if (title && this.enabled) {
-								var $tip = this.tip();
-								
-								$tip.find('.tipsy-inner')[this.options.html ? 'html' : 'text'](title);
-								$tip[0].className = 'tipsy'; // reset classname in case of dynamic gravity
-								$tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).appendTo(document.body);
-								
-								var pos = $.extend({}, this.$element.offset(), {
-										width: this.$element[0].offsetWidth,
-										height: this.$element[0].offsetHeight
-								});
-								
-								var actualWidth = $tip[0].offsetWidth, actualHeight = $tip[0].offsetHeight;
-								var gravity = (typeof this.options.gravity == 'function')
-																? this.options.gravity.call(this.$element[0])
-																: this.options.gravity;
-								
-								var tp;
-								switch (gravity.charAt(0)) {
-										case 'n':
-												tp = {top: pos.top + pos.height + this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2};
-												break;
-										case 's':
-												tp = {top: pos.top - actualHeight - this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2};
-												break;
-										case 'e':
-												tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth - this.options.offset};
-												break;
-										case 'w':
-												tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width + this.options.offset};
-												break;
-								}
-								
-								if (gravity.length == 2) {
-										if (gravity.charAt(1) == 'w') {
-												tp.left = pos.left + pos.width / 2 - 15;
-										} else {
-												tp.left = pos.left + pos.width / 2 - actualWidth + 15;
-										}
-								}
-								
-								$tip.css(tp).addClass('tipsy-' + gravity);
-								
-								if (this.options.fade) {
-										$tip.stop().css({opacity: 0, display: 'block', visibility: 'visible'}).animate({opacity: this.options.opacity});
-								} else {
-										$tip.css({visibility: 'visible', opacity: this.options.opacity});
-								}
-						}
-				},
-				
-				hide: function() {
-						if (this.options.fade) {
-								this.tip().stop().fadeOut(function() { $(this).remove(); });
-						} else {
-								this.tip().remove();
-						}
-				},
-				
-				fixTitle: function() {
-						var $e = this.$element;
-						if ($e.attr('title') || typeof($e.attr('original-title')) != 'string') {
-								$e.attr('original-title', $e.attr('title') || '').removeAttr('title');
-						}
-				},
-				
-				getTitle: function() {
-						var title, $e = this.$element, o = this.options;
-						this.fixTitle();
-						var title, o = this.options;
-						if (typeof o.title == 'string') {
-								title = $e.attr(o.title == 'title' ? 'original-title' : o.title);
-						} else if (typeof o.title == 'function') {
-								title = o.title.call($e[0]);
-						}
-						title = ('' + title).replace(/(^\s*|\s*$)/, "");
-						return title || o.fallback;
-				},
-				
-				tip: function() {
-						if (!this.$tip) {
-								this.$tip = $('<div class="tipsy"></div>').html('<div class="tipsy-arrow"></div><div class="tipsy-inner"></div>');
-						}
-						return this.$tip;
-				},
-				
-				validate: function() {
-						if (!this.$element[0].parentNode) {
-								this.hide();
-								this.$element = null;
-								this.options = null;
-						}
-				},
-				
-				enable: function() { this.enabled = true; },
-				disable: function() { this.enabled = false; },
-				toggleEnabled: function() { this.enabled = !this.enabled; }
-		};
-		
-		$.fn.tipsy = function(options) {
-				
-				if (options === true) {
-						return this.data('tipsy');
-				} else if (typeof options == 'string') {
-						var tipsy = this.data('tipsy');
-						if (tipsy) tipsy[options]();
-						return this;
-				}
-				
-				options = $.extend({}, $.fn.tipsy.defaults, options);
-				
-				function get(ele) {
-						var tipsy = $.data(ele, 'tipsy');
-						if (!tipsy) {
-								tipsy = new Tipsy(ele, $.fn.tipsy.elementOptions(ele, options));
-								$.data(ele, 'tipsy', tipsy);
-						}
-						return tipsy;
-				}
-				
-				function enter() {
-						var tipsy = get(this);
-						tipsy.hoverState = 'in';
-						if (options.delayIn == 0) {
-								tipsy.show();
-						} else {
-								tipsy.fixTitle();
-								setTimeout(function() { if (tipsy.hoverState == 'in') tipsy.show(); }, options.delayIn);
-						}
-				};
-				
-				function leave() {
-						var tipsy = get(this);
-						tipsy.hoverState = 'out';
-						if (options.delayOut == 0) {
-								tipsy.hide();
-						} else {
-								setTimeout(function() { if (tipsy.hoverState == 'out') tipsy.hide(); }, options.delayOut);
-						}
-				};
-				
-				if (!options.live) this.each(function() { get(this); });
-				
-				if (options.trigger != 'manual') {
-						var binder	 = options.live ? 'live' : 'bind',
-								eventIn	 = options.trigger == 'hover' ? 'mouseenter' : 'focus',
-								eventOut = options.trigger == 'hover' ? 'mouseleave' : 'blur';
-						this[binder](eventIn, enter)[binder](eventOut, leave);
-				}
-				
-				return this;
-				
-		};
-		
-		$.fn.tipsy.defaults = {
-				delayIn: 0,
-				delayOut: 0,
-				fade: false,
-				fallback: '',
-				gravity: 'n',
-				html: false,
-				live: false,
-				offset: 0,
-				opacity: 0.8,
-				title: 'title',
-				trigger: 'hover'
-		};
-		
-		// Overwrite this method to provide options on a per-element basis.
-		// For example, you could store the gravity in a 'tipsy-gravity' attribute:
-		// return $.extend({}, options, {gravity: $(ele).attr('tipsy-gravity') || 'n' });
-		// (remember - do not modify 'options' in place!)
-		$.fn.tipsy.elementOptions = function(ele, options) {
-				return $.metadata ? $.extend({}, options, $(ele).metadata()) : options;
-		};
-		
-		$.fn.tipsy.autoNS = function() {
-				return $(this).offset().top > ($(document).scrollTop() + $(window).height() / 2) ? 's' : 'n';
-		};
-		
-		$.fn.tipsy.autoWE = function() {
-				return $(this).offset().left > ($(document).scrollLeft() + $(window).width() / 2) ? 'e' : 'w';
-		};
-		
-})(jQuery);
diff --git a/skins/common/config.css b/skins/common/config.css
index b8db0b2206..c247838159 100644
--- a/skins/common/config.css
+++ b/skins/common/config.css
@@ -6,23 +6,17 @@
 .config-section {
 	margin-top: 2em;
 }
-.config-block {
-	margin-top: 2em;
-	display: block;
 
-}
-.config-block-label {
-	display: block;
-	margin-bottom: .2em;
-}
-.config-block-label label, .config-label {
+.config-label {
+	clear: left;
 	font-weight: bold;
-	padding-right: .5em;
+	width: 10em;
+	float: left;
+	text-align: right;
+	padding-right: 1em;
 	padding-top: .2em;
 }
-.config-block-elements {
-	margin-left: 2em;
-}
+
 .config-block-elements li {
 	list-style: none;
 }
@@ -48,7 +42,7 @@
 .config-page {
 	padding: 0.5em 0.5em 0.5em 2em;
 	margin: 0.5em 0.5em 0.5em 0.5em;
-	background: #eee;
+	border: 1px solid #aaa;
 }
 
 .config-submit {
@@ -92,6 +86,29 @@
 	font-weight: bold;
 }
 
+.config-help-wrapper {
+	clear: left;
+	margin: 0 0 2em 12em;
+	padding-top: 1em;
+}
+.config-show-help, .config-hide-help {
+	margin-left: 14em;
+}
+.config-hide-help { display: none; }
+.config-show-help a, .config-hide-help a {
+	background-image: url(images/help-22.png);
+	background-position: 0 0;
+	background-repeat: no-repeat;
+	display: inline-block;
+	height: 26px;
+	padding-left: 26px;
+}
+
+.config-help-message {
+	font-size: 85%;
+	display: none;
+}
+
 .config-message {
 	display: list-item;
 	line-height: 1.5em;
@@ -142,7 +159,7 @@
 .config-cc-wrapper {
 	clear: left;
 	/* If you change this height, also change it in WebInstaller_Options::submitCC() */
-	height: 54em;
+	height: 54em; 
 }
 
 .config-plainlink a {
diff --git a/skins/common/config.js b/skins/common/config.js
index fcd1145873..10e53bb9fa 100644
--- a/skins/common/config.js
+++ b/skins/common/config.js
@@ -1,9 +1,19 @@
 (function( $ ) {
 	$( document ).ready( function() {
-
-		// Generate the tool tips
-		$( '.mw-help-field-hint' ).tipsy( { gravity : 'se', opacity: '0.9' } );
-
+		// Show/hide code for help text
+		$( '.config-show-help a' ).click( function() {
+			$(this).parent().siblings( '.config-help-message' ).show( 'slow' );
+			$(this).parent().siblings( '.config-hide-help' ).show();
+			$(this).parent().hide();
+			return false;
+		} );
+		$( '.config-hide-help a' ).click( function() {
+			$(this).parent().siblings( '.config-help-message' ).hide( 'slow' );
+			$(this).parent().siblings( '.config-show-help' ).show();
+			$(this).parent().hide();
+			return false;
+		} );
+		
 		// Show/hide code for DB-specific options
 		// FIXME: Do we want slow, fast, or even non-animated (instantaneous) showing/hiding here?
 		$( '.dbRadio' ).each( function() { $( '#' + $(this).attr( 'rel' ) ).hide(); } );
diff --git a/skins/common/images/help-22.png b/skins/common/images/help-22.png
new file mode 100644
index 0000000000000000000000000000000000000000..273a49cca913b91aba4546cc6e5f832badb60a3f
GIT binary patch
literal 4373
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
P00000NkvXXu0mjf1OPnm

literal 0
HcmV?d00001

diff --git a/skins/common/images/help-question-hover.gif b/skins/common/images/help-question-hover.gif
deleted file mode 100644
index 515138dbe14f473361157d8c5b31c14b8796c24c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1246
zcmZ?wbhEHb<YwSz*v!Ddow5Ag=N}2v4o%&8t!3@`Q@3BM6|Y@>^zP1!PwqVb$Plx@
zzH|XYz|8;u|1*Gr;(zW4-v9-d#F9iHZDU_ikeHmETB4AYnx2_wtMq>NekFy>6kDZm
zQ(pt$0_W6>OpmIf)Zi+=kmRcDWXlvKdpiZ23ag6Tg51=SM1_jnoV;SI3R|Vbl>DSr
zD<B&rtgoa1R#K8}tK<lhPypHKoL`ixV5(=Jn`~fapkQXGXJ~9<Zf>rlU}Ruupl@KL
zZ)l`zXl`X}WMyEW00l}w+lo@stb$zJpmqUywn`Z#B?VUc`sL;2dgaD?`9<mahL)C=
zATx}Nbb%^#i!1X=5-W7`ij`p|xTF>*7iAWdWaj57fJ{tG$}cUkRRX#c;)UD-UthSv
zdBu8Q59uZ6=jvA^7U&!58R+Ncg8T(mU0f2Bif{&2)x{x|1*!T$sm1xFMaii^<;pP4
zz_7z_5lA7>HCFybnZQU%%yG$2F3nBNEAe!(RRYTBrDUd985mg@7#f<J7?>Lwm{}Ma
zTAI0-IJy|S8JU=yIGMT_z|6p=*T~V_(bdt!z{%3h+0f9%&C<ov(b2@w!o<kP$;rsk
z8K&1Wuec;JFF6%vZzj-Qh+bniyn3yii&7Iy@{2<9^K)P+ARr^ZB)>Q#zd*q`*i^wc
zF*!32#0NzW#J4V~MVV!(DQ-pixeDO$waUa|zninU8;ZY8-CP}=-5f1k3{6cfja-$W
zdQ->=Gku_A^g)RODY3wWfGH5fgeQF<2cCIS^ME;~2$(e(|Nr~@=l8FlKfZta`sMSd
zk00K@d;8|~tCugHKYRM*@uP<i?%%t6=k~3eH?Cj1dgbz^ix<wHJA3Bzsgoy;A3J*F
z@S%eT_V3%fXZNn1JGO7zx@GgGjT_dlTf1iUs+B92FI&1~@uGzb=FgiuXZEa_Gp0|Q
zI%V>ti4*$!dV9LNIy>6iT3ec%8XM~CYHO;iDl5v%N=u513Jdb{a&xk?GBeWCQd5$X
z5)<O%Vq>DCA|t}XLPLUs0t5X0e0{vVJU!gqTwR=<93AZKY;CNqEG^8<Oihf9fZ0+{
zS4Ue*Q$t-%RYh4zQ9)i#Rz_M%QbJrzR76-vP=KG0mxr5+lY^a&m4%s!k%2++Ckwco
z(E*X5GKzskyI`Z|${dU5GmnZ$Tvza#q~WTZ)-1H5$Bn^LBANNat*HG{>}OXkpA@3i
I&B0&|03G+cuK)l5

diff --git a/skins/common/images/help-question.gif b/skins/common/images/help-question.gif
deleted file mode 100644
index b4fc9c5b20151033e2fe97e5ae51caa037bdf6b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmZ?wbhEHb<YwSz*v!E2|NnnqU*E}-Cr3s`K7amv$BrFSrcC+#`EzP&>V*pz3JVL@
ztXXsW_U$7_jxd0M;!hSZtpg%KW-zd52ef#uWU+WY^Q?&ky9%=-5066H(Sj9?+Z0?R
Xl3739irTNmdv?|GNg-NI91PX~38*lg

diff --git a/skins/common/images/tipsy-arrow.gif b/skins/common/images/tipsy-arrow.gif
deleted file mode 100644
index 9f1a15b6a69189c3dbd0270d50739d35504eb6b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 205
zcmV;;05bnaNk%w1VGRHc0K@<Q_xJbK^Z(oK_HWMg)$;$t=Jw0!_LtrHg4Xwq*YvdK
z`|R}hb<p)`%=F^$_MhDKgw*tj*!T4I_h8EOn%?=R<NCYm{M_&Mxa9S^<@Lku{gT`G
zX3O-#?ER73_@d$ZA^8LV00000EC2ui01W^Q000F_;1P^u861OUmex>2D;X64RK*np
z0K!C=go$7Wcu-7~2NAGnbV!=UVhPB2NE-|lAYmv13Wj70Fdza519_MDB-T3z#{u76
HwjlsJ9E)xP

diff --git a/skins/common/shared.css b/skins/common/shared.css
index b64e6c3cca..c9a5770fd3 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -917,23 +917,3 @@ ol:lang(bn) li {
 	list-style-type: -moz-bengali;
 	list-style-type: bengali;
 }
-
-/* tooltip styles */
-.mw-help-field-hint {
-	width: 11px;
-	height: 24px;
-	display: inline-block;
-	padding: 0px;
-	margin-left: 2px;
-	margin-bottom: -8px;
-	background: url('images/help-question.gif') 0 50% no-repeat;
-}
-.mw-help-field-hint:hover {
-	background: url('images/help-question-hover.gif') 0 50% no-repeat;
-}
-.tipsy { padding: 5px 5px 10px; font-size: 12px; position: absolute; z-index: 100000; overflow: visible; }
-.tipsy-inner { padding: 5px 8px 4px 8px; background-color: #d6f3ff; color: black; border: 1px solid #5dc9f4; max-width: 300px; text-align: left; }
-.tipsy-arrow { position: absolute; background: url( 'images/tipsy-arrow.gif' ) no-repeat top left; width: 13px; height: 13px; }
-.tipsy-se .tipsy-arrow { bottom: -2px; right: 10px; background-position: 0% 100%; }
-
-
-- 
2.20.1