From 9d5b03a7f23d36772ad9a27331ce8623a858483d Mon Sep 17 00:00:00 2001
From: Tom Gilder <tomgilder@users.mediawiki.org>
Date: Tue, 11 Oct 2005 02:52:38 +0000
Subject: [PATCH] More preferences simplification

---
 includes/SpecialPreferences.php | 18 ++++++++++--------
 languages/Language.php          |  3 ++-
 skins/monobook/main.css         |  1 +
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index e20da141e5..9911815bdc 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -379,7 +379,7 @@ class PreferencesForm {
 			if ( empty($name) )
 				$name = wfMsg( 'blanknamespace' );
 
-			$r1 .= "<label><input type='checkbox' value='1' name='wpNs$i' {$checked}/>{$name}</label>\n";
+			$r1 .= "<label><input type='checkbox' value='1' name='wpNs$i' {$checked}/> {$name}</label><br />\n";
 		}
 		return $r1;
 	}
@@ -695,23 +695,25 @@ class PreferencesForm {
 
                 # Date format
                 #
+		# Date/Time
+		#
+
+		$wgOut->addHTML( "<fieldset>\n<legend>" . wfMsg( 'datetime' ) . "</legend>\n" );
+
 		if ($dateopts) {
-			$wgOut->addHTML( "<fieldset>\n<legend>" . wfMsg('dateformat') . "</legend>\n" );
+			$wgOut->addHTML( "<fieldset>\n<legend>" . wfMsg( 'dateformat' ) . "</legend>\n" );
 			foreach($dateopts as $key => $option) {
 				($key == $this->mDate) ? $checked = ' checked="checked"' : $checked = '';
 				$wgOut->addHTML( "<div><label><input type='radio' name=\"wpDate\" ".
 					"value=\"$key\"$checked /> $option</label></div>\n" );
 			}
-			$wgOut->addHTML( "</fieldset>\n\n");
+			$wgOut->addHTML( "</fieldset>\n" );
 		}
 
-		# Time zone
-		#
-
 		$nowlocal = $wgLang->time( $now = wfTimestampNow(), true );
 		$nowserver = $wgLang->time( $now, false );
 
-		$wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'timezonelegend' ) . '</legend><table>' .
+		$wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'timezonelegend' ). '</legend><table>' .
 		 	$this->addRow( wfMsg( 'servertime' ), $nowserver ) .
 			$this->addRow( wfMsg( 'localtime' ), $nowlocal ) .
 			$this->addRow(
@@ -720,7 +722,7 @@ class PreferencesForm {
 			) . "<tr><td colspan='2'>
 				<input type='button' value=\"" . wfMsg( 'guesstimezone' ) ."\"
 				onclick='javascript:guessTimezone()' id='guesstimezonebutton' style='display:none;' />
-				</td></tr></table>
+				</td></tr></table></fieldset>
 			<div class='prefsectiontip'>¹" .  wfMsg( 'timezonetext' ) . "</div>
 		</fieldset>\n\n" );
 
diff --git a/languages/Language.php b/languages/Language.php
index 0c3df79314..5e84f7726c 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -857,6 +857,7 @@ See [[Project:User preferences help]] for help deciphering the options.",
 'skin'			=> 'Skin',
 'math'			=> 'Math',
 'dateformat'		=> 'Date format',
+'datetime'		=> 'Date/time',
 'math_failure'		=> 'Failed to parse',
 'math_unknown_error'	=> 'unknown error',
 'math_unknown_function'	=> 'unknown function ',
@@ -866,7 +867,7 @@ See [[Project:User preferences help]] for help deciphering the options.",
 'math_bad_tmpdir'	=> 'Can\'t write to or create math temp directory',
 'math_bad_output'	=> 'Can\'t write to or create math output directory',
 'math_notexvc'	=> 'Missing texvc executable; please see math/README to configure.',
-'prefs-personal' => 'User data',
+'prefs-personal' => 'User profile',
 'prefs-rc' => 'Recent changes',
 'prefs-misc' => 'Misc',
 'saveprefs'		=> 'Save Preferences',
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 5f2d1d1590..d01c96c849 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -956,6 +956,7 @@ head:first-child+body #footer li { white-space: nowrap; }
 }
 #prefcontrol {
     padding-top: 2em;
+    clear: left;
 }
 #preferences {
     margin: 0;
-- 
2.20.1