From cd32f37c8dd348e9d62996207ded9acadc458e54 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Mon, 11 Apr 2005 22:54:14 +0000
Subject: [PATCH] * Re-arranging the tabs on topic, e.g. time-related stuff
 togather.

---
 includes/SpecialPreferences.php | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 1fd14965b6..0c1fd47057 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -608,8 +608,8 @@ class PreferencesForm {
 		}
 		$wgOut->addHTML( "</fieldset>\n\n" );
 		
-		# Date format
-		#
+                # Date format
+                #
 		if ($dateopts) {
 			$wgOut->addHTML( "<fieldset>\n<legend>$dateFormat</legend>\n" );
 			foreach($dateopts as $key => $option) {
@@ -619,11 +619,24 @@ class PreferencesForm {
 			}
 			$wgOut->addHTML( "</fieldset>\n\n");
 		}
-		
-		# Textbox rows, cols
+
+		# Time zone
 		#
+		
 		$nowlocal = $wgLang->time( $now = wfTimestampNow(), true );
 		$nowserver = $wgLang->time( $now, false );
+		 
+		$wgOut->addHTML( "<fieldset>
+			<legend>$timezone</legend>
+			<div><b>$tzServerTime:</b>" .  $nowserver . "</div>
+			<div><b>$ltz:</b> $nowlocal</div>
+			<div><label>$tzo*: <input type='text' name=\"wpHourDiff\" value=\"" . htmlspecialchars( $this->mHourDiff ) . "\" size='6' /></label></div>
+			<div><input type=\"button\" value=\"$tzGuess\" onclick=\"javascript:guessTimezone()\" id=\"guesstimezonebutton\" style=\"display:none\" /></div>
+			<div class='prefsectiontip'>* {$tzt}</div>
+		</fieldset>\n\n" );		
+		
+		# Editing
+		#
 		$wgOut->addHTML( "<fieldset>
 	<legend>$tbs</legend>\n
 		<div>
@@ -638,17 +651,8 @@ class PreferencesForm {
 		$this->getToggle( "minordefault" ) . 
 		$this->getToggle( "externaleditor" ) .
 		"
-	</fieldset>
+	</fieldset>");
 	
-	<fieldset>
-		<legend>$timezone</legend>
-		<div><b>$tzServerTime:</b> $nowserver</div>
-		<div><b>$ltz:</b> $nowlocal</div>
-		<div><label>$tzo*: <input type='text' name=\"wpHourDiff\" value=\"" . htmlspecialchars( $this->mHourDiff ) . "\" size='6' /></label></div>
-		<div><input type=\"button\" value=\"$tzGuess\" onclick=\"javascript:guessTimezone()\" id=\"guesstimezonebutton\" style=\"display:none\" /></div>
-		<div class='prefsectiontip'>* {$tzt}</div>
-	</fieldset>\n\n" );
-
 		$shownumberswatching = ($wgRCShowWatchingUsers) ? $this->getToggle('shownumberswatching') : '';
 
 		$wgOut->addHTML( "
-- 
2.20.1