From 39e676805168d487d7a415c5a25c45aa177cae9b Mon Sep 17 00:00:00 2001
From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Thu, 20 May 2004 11:02:27 +0000
Subject: [PATCH] moved section help texts inside the fieldsets, added help
 string for user data, some css styling for the text

---
 includes/SpecialPreferences.php | 5 +++--
 languages/Language.php          | 3 +++
 stylesheets/common.css          | 4 ++++
 stylesheets/monobook/main.css   | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 7bdcf8d6f9..ff805b5073 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -350,7 +350,8 @@ class PreferencesForm {
 	<div><label>$npw: <input type='password' name=\"wpNewpass\" value=\"{$this->mNewpass}\" size='20' /></label></div>
 	<div><label>$rpw: <input type='password' name=\"wpRetypePass\" value=\"{$this->mRetypePass}\" size='20' /></label></div>
 	" . $this->getToggle( "rememberpassword" ) . "
-	</fieldset>\n</fieldset>\n" );
+	</fieldset>
+	<div class='prefsectiontip'>".wfMsg('prefs-help-userdata')."</div>\n</fieldset>\n" );
 
 	
 		# Quickbar setting
@@ -430,6 +431,7 @@ class PreferencesForm {
 		<div><b>$ltz:</b> $nowlocal</div>
 		<div><label>$tzo*: <input type='text' name=\"wpHourDiff\" value=\"{$this->mHourDiff}\" size='6' /></label></div>
 		<div><input type=\"button\" value=\"$tzGuess\" onClick=\"javascript:guessTimezone()\" /></div>
+		<div class='prefsectiontip'>* {$tzt}</div>
 	</fieldset>\n\n" );
 
 		$wgOut->addHTML( "
@@ -471,7 +473,6 @@ class PreferencesForm {
 		<input type='submit' name=\"wpReset\" value=\"$rsp\" />
 	</div>
 	
-	<div>* {$tzt}</div>
 	</div>
 	
 	</form>\n" );
diff --git a/languages/Language.php b/languages/Language.php
index 4c3b035ccb..4a9e5fcbb0 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -636,6 +636,9 @@ Don't forget to change your {{SITENAME}} preferences.",
 "yournick"		=> "Your nickname (for signatures)",
 "emailforlost"	=> "Fields marked with a star (*) are optional.  Storing an email address enables people to contact you through the website without you having to reveal your 
 email address to them, and it can be used to send you a new password if you forget it.<br /><br />Your real name, if you choose to provide it, will be used for giving you attribution for your work.",
+'prefs-help-userdata' => '* <strong>Real name</strong> (optional): if you choose to provide it this will be used for giving you attribution for your work.<br/>
+* <strong>Email</strong> (optional): Enables people to contact you through the website without you having to reveal your 
+email address to them, and it can be used to send you a new password if you forget it.',
 "loginerror"	=> "Login error",
 "nocookiesnew"	=> "The user account was created, but you are not logged in. {{SITENAME}} uses cookies to log in users. You have cookies disabled. Please enable them, then log in with your new username and password.",
 "nocookieslogin"	=> "{{SITENAME}} uses cookies to log in users. You have cookies disabled. Please enable them and try again.",
diff --git a/stylesheets/common.css b/stylesheets/common.css
index 89ebd702da..1d7d5455a8 100644
--- a/stylesheets/common.css
+++ b/stylesheets/common.css
@@ -137,5 +137,9 @@ img.tex { vertical-align: middle; }
     float: left;
     margin-top: 1em;
 }
+div.prefsectiontip { 
+    font-size: 94%;
+    margin-top: 1em;
+}
 fieldset.prefsection { margin-top: 1em }
 fieldset.operaprefsection { margin-left: 15em }
diff --git a/stylesheets/monobook/main.css b/stylesheets/monobook/main.css
index b279bed8db..c2d1bed52c 100644
--- a/stylesheets/monobook/main.css
+++ b/stylesheets/monobook/main.css
@@ -809,6 +809,10 @@ form #content {
     float: left;
     margin-top: 1em;
 }
+div.prefsectiontip { 
+    font-size: 95%;
+    margin-top: 1em;
+}
 fieldset.operaprefsection { margin-left: 15em }
 
 /* 
-- 
2.20.1