From c240735547fdc8dcc7e1301a2cb45d5ebc35d675 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Thu, 7 Apr 2005 15:35:45 +0000
Subject: [PATCH] * Now only displays the quickbar setting if the user is using
 the   cologneblue or standard skin * Removed msg:qbsettingsnote (I'll remove
 it from the language files later) * Moved the imagemaxsize setting out of the
 RC tab into the misc tab.

---
 includes/SpecialPreferences.php | 40 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 07eef4ea94..1fd14965b6 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -561,18 +561,17 @@ class PreferencesForm {
 	</fieldset>
 	<div class='prefsectiontip'>".$prefs_help_realname.wfMsg('prefs-help-email').$prefs_help_email_enotif."</div>\n</fieldset>\n" );
 
-	
 		# Quickbar setting
 		#
-		$wgOut->addHtml( "<fieldset>\n<legend>$qb</legend>\n" );
-		for ( $i = 0; $i < count( $qbs ); ++$i ) {
-			if ( $i == $this->mQuickbar ) { $checked = ' checked="checked"'; }
-			else { $checked = ""; }
-			$wgOut->addHTML( "<div><label><input type='radio' name=\"wpQuickbar\"
-	value=\"$i\"$checked /> {$qbs[$i]}</label></div>\n" );
+		if ($this->mSkin == 'cologneblue' || $this->mSkin == 'standard') {
+			$wgOut->addHtml( "<fieldset>\n<legend>$qb</legend>\n" );
+			for ( $i = 0; $i < count( $qbs ); ++$i ) {
+				if ( $i == $this->mQuickbar ) { $checked = ' checked="checked"'; }
+				else { $checked = ""; }
+				$wgOut->addHTML( "<div><label><input type='radio' name=\"wpQuickbar\" value=\"$i\"$checked />{$qbs[$i]}</label></div>\n" );
+			}
+			$wgOut->addHtml( "</fieldset>\n\n" );
 		}
-		$wgOut->addHtml('<div class="prefsectiontip">'.wfMsg('qbsettingsnote').'</div>');
-		$wgOut->addHtml( "</fieldset>\n\n" );
 
 		# Skin setting
 		#
@@ -594,8 +593,7 @@ class PreferencesForm {
 			if( $skinkey == $wgDefaultSkin ) {
 				$sn .= ' (' . wfMsg( 'default' ) . ')';
 			}
-			$wgOut->addHTML( "<div><label><input type='radio' name=\"wpSkin\"
-	value=\"$skinkey\"$checked /> {$sn}</label></div>\n" );
+			$wgOut->addHTML( "<div><label><input type='radio' name=\"wpSkin\" value=\"$skinkey\"$checked /> {$sn}</label></div>\n" );
 		}
 		$wgOut->addHTML( "</fieldset>\n\n" );
 
@@ -659,15 +657,6 @@ class PreferencesForm {
 		$this->getToggle( "hideminor" ) . $shownumberswatching .
 		$this->getToggle( "usenewrc" ) . $this->getToggle('showupdated', wfMsg('updatedmarker')) .
 		"<div><label>$stt: <input type='text' name=\"wpStubs\" value=\"$this->mStubs\" size='6' /></label></div>
-                <div><label>".wfMsg('imagemaxsize')."<select name=\"wpImageSize\">");
-		
-		$imageLimitOptions='';
-		foreach ( $wgImageLimits as $index => $limits ) {
-			$selected = ($index == $this->mImageSize) ? 'selected="selected"' : '';
-			$imageLimitOptions .= "<option value=\"{$index}\" {$selected}>{$limits[0]}x{$limits[1]}</option>\n";
-		}
-		$wgOut->addHTML( "{$imageLimitOptions}</select></label></div>
-
 	</fieldset>
 	
 	<fieldset>
@@ -686,6 +675,17 @@ class PreferencesForm {
 		# Various checkbox options
 		#
 		$wgOut->addHTML("<fieldset><legend>".wfMsg('prefs-misc')."</legend>");
+
+		$wgOut->addHTML( '<div><label>' . wfMsg('imagemaxsize') . "<select name=\"wpImageSize\">");
+
+		$imageLimitOptions='';
+		foreach ( $wgImageLimits as $index => $limits ) {
+			$selected = ($index == $this->mImageSize) ? 'selected="selected"' : '';
+			$imageLimitOptions .= "<option value=\"{$index}\" {$selected}>{$limits[0]}x{$limits[1]}</option>\n";
+		}
+		$wgOut->addHTML( "{$imageLimitOptions}</select></label></div>" );
+
+
 		foreach ( $togs as $tname ) {
 			if( !array_key_exists( $tname, $this->mUsedToggles ) ) {
 				$wgOut->addHTML( $this->getToggle( $tname ) );
-- 
2.20.1