[Slim-Checkins] r10658 - in /trunk/server: HTML/EN/ HTML/EN/settings/ HTML/EN/settings/player/ HTML/EN/settings/server/ HTML/Fishbone/ HTML/Handheld/ HTML/Moser/ HTML/NBMU/ HTML/Nokia770/ Slim/Web/Settings/Server/

kdf at svn.slimdevices.com kdf at svn.slimdevices.com
Fri Nov 10 23:19:20 PST 2006


Author: kdf
Date: Fri Nov 10 23:19:20 2006
New Revision: 10658

URL: http://svn.slimdevices.com?rev=10658&view=rev
Log:
Bug: 3267
Description: settingsheader.html -> settings/header.html
	- settingsfooter.html -> settings/header.html
	- server settings pages to settings/server
	- redirect links from home pages


Added:
    trunk/server/HTML/EN/settings/footer.html
    trunk/server/HTML/EN/settings/header.html
    trunk/server/HTML/EN/settings/server/
    trunk/server/HTML/EN/settings/server/basic.html
    trunk/server/HTML/EN/settings/server/behavior.html
    trunk/server/HTML/EN/settings/server/debugging.html
    trunk/server/HTML/EN/settings/server/filetypes.html
    trunk/server/HTML/EN/settings/server/formatting.html
    trunk/server/HTML/EN/settings/server/interface.html
    trunk/server/HTML/EN/settings/server/networking.html
    trunk/server/HTML/EN/settings/server/performance.html
    trunk/server/HTML/EN/settings/server/security.html
Removed:
    trunk/server/HTML/EN/settings/basic.html
    trunk/server/HTML/EN/settings/behavior.html
    trunk/server/HTML/EN/settings/debugging.html
    trunk/server/HTML/EN/settings/filetypes.html
    trunk/server/HTML/EN/settings/formatting.html
    trunk/server/HTML/EN/settings/interface.html
    trunk/server/HTML/EN/settings/networking.html
    trunk/server/HTML/EN/settings/performance.html
    trunk/server/HTML/EN/settings/security.html
    trunk/server/HTML/EN/settingsfooter.html
    trunk/server/HTML/EN/settingsheader.html
Modified:
    trunk/server/HTML/EN/home.html
    trunk/server/HTML/EN/settings/player/audio.html
    trunk/server/HTML/EN/settings/player/display.html
    trunk/server/HTML/EN/setup.html
    trunk/server/HTML/Fishbone/pageheader.html
    trunk/server/HTML/Handheld/pagefooter.html
    trunk/server/HTML/Moser/home.html
    trunk/server/HTML/NBMU/home.html
    trunk/server/HTML/Nokia770/home.html
    trunk/server/HTML/Nokia770/pagefooter.html
    trunk/server/Slim/Web/Settings/Server/Basic.pm
    trunk/server/Slim/Web/Settings/Server/Behavior.pm
    trunk/server/Slim/Web/Settings/Server/Debugging.pm
    trunk/server/Slim/Web/Settings/Server/FileTypes.pm
    trunk/server/Slim/Web/Settings/Server/Network.pm
    trunk/server/Slim/Web/Settings/Server/Performance.pm
    trunk/server/Slim/Web/Settings/Server/Security.pm
    trunk/server/Slim/Web/Settings/Server/TextFormatting.pm
    trunk/server/Slim/Web/Settings/Server/UserInterface.pm

Modified: trunk/server/HTML/EN/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/home.html?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/HTML/EN/home.html (original)
+++ trunk/server/HTML/EN/home.html Fri Nov 10 23:19:20 2006
@@ -57,7 +57,7 @@
 	<div>[% "SETTINGS" | string | upper %]</div>
 	<ul>
 	[%- IF not noserver %]
-		<li><a href="[% webroot %]settings/basic.html?player=[% playerURI %]">[% "SERVER_SETTINGS" | string %]</a></li>
+		<li><a href="[% webroot %]settings/server/basic.html?player=[% playerURI %]">[% "SERVER_SETTINGS" | string %]</a></li>
 	[%- END %]
 
 	[%- USE Clients; players = Clients.get("name"); FOREACH client = players; %]

Added: trunk/server/HTML/EN/settings/footer.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/footer.html?rev=10658&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/footer.html (added)
+++ trunk/server/HTML/EN/settings/footer.html Fri Nov 10 23:19:20 2006
@@ -1,0 +1,26 @@
+<!-- Begin settingsfooter.html -->
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+
+[% IF versionInfo %]<p>
+
+	<div class="settingSection">
+
+		<div class="groupHead">[% "INFORMATION_DIAGSTRING" | string | upper  %]</div>
+
+		<p>[% versionInfo %]</p>
+
+		[% IF newVersion %]
+			<p>[% newVersion %]</p>
+		[% END %]
+
+	</div>
+
+</p>[% END %]
+
+</form>
+
+<p></p>
+<!-- End settingsfooter.html -->
+[% PROCESS pagefooter.html %]
+

Added: trunk/server/HTML/EN/settings/header.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/header.html?rev=10658&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/header.html (added)
+++ trunk/server/HTML/EN/settings/header.html Fri Nov 10 23:19:20 2006
@@ -1,0 +1,35 @@
+<!-- Begin settingsheader.html -->
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		[% IF playerid %]
+			[% "PLAYER_SETTINGS" | string %] [% IF playername %][% "FOR" | string %] [% playername %][% END %]
+		[% ELSE %]
+			[% "SERVER_SETTINGS" | string %]
+		[% END %]
+
+		 / <a href="[% webroot %][% path %][% IF playerid %]?playerid=[% playerid | uri %][% END %]">[% page | string %]</a>
+
+	[% END %]
+
+	[% pageHeaderInfo = BLOCK %]
+		[%- PROCESS setting_chooser.html setting_chooser_noHome = 1 %]
+	[% END %]
+
+[% END %]
+
+[% pagetitle = page | string; pageicon = 'settings'; noSpacer = 1; PROCESS pageheader.html %] 
+
+<div class="statusarea">
+	[% IF warning %]
+		[% warning %]
+	[% END %]
+</div>
+
+<form method="post" action="[% webroot %][% path %][% IF playerid %]?playerid=[% playerid | uri %][% END %]">
+
+	<input type=hidden value="[% page %]" name="page">
+	[% IF playerid %]<input type=hidden value="[% playerid %]" name="playerid">[% END %]
+
+<!-- End settingsheader.html -->

Modified: trunk/server/HTML/EN/settings/player/audio.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/audio.html?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/player/audio.html (original)
+++ trunk/server/HTML/EN/settings/player/audio.html Fri Nov 10 23:19:20 2006
@@ -1,10 +1,301 @@
-[% PROCESS settingsheader.html
-
-	<div class="settingSection">
-
-
-
-
-	</div>
+[% PROCESS settingsheader.html %]
+[% warning %]
+	[% IF prefs.exists('synchronize') %]
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_SYNCHRONIZE" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SYNCHRONIZE_DESC" | string %]</div>
+
+		<select class="stdedit" name="synchronize" id="synchronize">
+
+		[% FOREACH option = syncGroups %]
+			<option [% IF prefs.syncronize == option.key %]selected [% END %]value="[% option.key %]">[% option.value %]</option>
+		[%- END -%]
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_SYNCVOLUME" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SYNCVOLUME_DESC" | string %]</div>
+
+		<select class="stdedit" name="syncVolume" id="syncVolume">
+
+		[% FOREACH option = {
+			'1' => 'SETUP_SYNCVOLUME_ON',
+			'0' => 'SETUP_SYNCVOLUME_OFF'
+		} %]
+			<option [% IF prefs.syncVolume == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_SYNCPOWER" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SYNCPOWER_DESC" | string %]</div>
+
+		<select class="stdedit" name="syncPower" id="syncPower">
+
+		[% FOREACH option = {
+			'1' => 'SETUP_SYNCPOWER_ON',
+			'0' => 'SETUP_SYNCPOWER_OFF'
+		} %]
+			<option [% IF prefs.syncPower == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select>
+
+	</div>
+	[% END %]
+
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_POWERONRESUME" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_POWERONRESUME_DESC" | string %]</div>
+
+		<select class="stdedit" name="powerOnResume" id="powerOnResume">
+
+		[% FOREACH option = {
+			'PauseOff-NoneOn'     => 'SETUP_POWERONRESUME_PAUSEOFF_NONEON',
+			'PauseOff-PlayOn'     => 'SETUP_POWERONRESUME_PAUSEOFF_PLAYON',
+			'StopOff-PlayOn'      => 'SETUP_POWERONRESUME_STOPOFF_PLAYON',
+			'StopOff-NoneOn'      => 'SETUP_POWERONRESUME_STOPOFF_NONEON',
+			'StopOff-ResetPlayOn' => 'SETUP_POWERONRESUME_STOPOFF_RESETPLAYON',
+			'StopOff-ResetOn'     => 'SETUP_POWERONRESUME_STOPOFF_RESETON',
+		} %]
+			<option [% IF prefs.powerOnResume == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select>
+
+		[% IF prefs.exists('powerOffDac') %]
+		<div class="prefHead">[% "SETUP_POWEROFFDAC" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_POWEROFFDAC_DESC" | string %]</div>
+
+		<select class="stdedit" name="powerOffDac" id="powerOffDac">
+
+		[% FOREACH option = {
+			'1' => 'POWEROFFDAC_WHENOFF',
+			'0' => 'POWEROFFDAC_ALWAYSON'
+		} %]
+			<option [% IF prefs.powerOffDac == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select>
+		[% END %]
+
+		[% IF prefs.exists('disableDac') %]
+		<div class="prefHead">[% "SETUP_DISABLEDAC" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_DISABLEDAC_DESC" | string %]</div>
+
+		<select class="stdedit" name="disableDac" id="disableDac">
+
+		[% FOREACH option = {
+			'1' => 'DISABLEDAC_WHENOFF',
+			'0' => 'DISABLEDAC_ALWAYSON'
+		} %]
+			<option [% IF prefs.disableDac == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select>
+		[% END %]
+
+	</div>
+
+	[% IF prefs.exists('transitionType') %]
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_TRANSITIONTYPE" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_TRANSITIONTYPE_DESC" | string %]</div>
+
+		<select class="stdedit" name="transitionType" id="transitionType">
+
+		[% FOREACH option = {
+			'0' => 'TRANSITION_NONE',
+			'1' => 'TRANSITION_CROSSFADE',
+			'2' => 'TRANSITION_FADE_IN',
+			'3' => 'TRANSITION_FADE_OUT',
+			'4' => 'TRANSITION_FADE_IN_OUT',
+		} %]
+			<option [% IF prefs.transitionType == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_TRANSITIONDURATION" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_TRANSITIONDURATION_DESC" | string %]</div>
+
+		<input type="text" class="stdedit" name="transitionDuration" id="transitionDuration" value="[% prefs.transitionDuration %]" size="15">
+
+	</div>
+	[% END %]
+
+	[% IF prefs.exists('digitalVolumeControl') %]
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_DIGITALVOLUMECONTROL" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_DIGITALVOLUMECONTROL_DESC" | string %]</div>
+
+		<select class="stdedit" name="digitalVolumeControl" id="digitalVolumeControl">
+
+		[% FOREACH option = {
+			'1' => 'SETUP_DIGITALVOLUMECONTROL_ON',
+			'0' => 'SETUP_DIGITALVOLUMECONTROL_OFF'
+		} %]
+			<option [% IF prefs.digitalVolumeControl == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select>
+
+		[% IF prefs.exists('preampVolumeControl') %]
+		<div class="prefHead">[% "SETUP_PREAMPVOLUMECONTROL" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_PREAMPVOLUMECONTROL_DESC" | string %]</div>
+
+		<input type="text" class="stdedit" name="preampVolumeControl" id="preampVolumeControl" value="[% prefs.preampVolumeControl %]" size="15">
+		[% END %]
+
+		<div class="prefHead">[% "SETUP_MP3SILENCEPRELUDE" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_MP3SILENCEPRELUDE_DESC" | string %]</div>
+
+		<input type="text" class="stdedit" name="mp3SilencePrelude" id="mp3SilencePrelude" value="[% prefs.mp3SilencePrelude %]" size="15">
+
+		[% IF prefs.exists('digitalOutputEncoding') %]
+		<div class="prefHead">[% "SETUP_DIGITALOUTPUTENCODING" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_DIGITALOUTPUTENCODING_DESC" | string %]</div>
+
+		<select class="stdedit" name="digitalOutputEncoding" id="digitalOutputEncoding">
+
+		[% FOREACH option = {
+			'0' => 'DIGITALOUTPUTENCODING_SPDIF',
+			'1' => 'DIGITALOUTPUTENCODING_AESEBU',
+		} %]
+			<option [% IF prefs.digitalOutputEncoding == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select>
+		[% END %]
+
+		[% IF prefs.exists('clockSource') %]
+		<div class="prefHead">[% "SETUP_CLOCKSOURCE" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_CLOCKSOURCE_DESC" | string %]</div>
+
+		<select class="stdedit" name="clockSource" id="clockSource">
+
+		[% FOREACH option = {
+			'0' => 'CLOCKSOURCE_INTERNAL',
+			'1' => 'CLOCKSOURCE_WORD_CLOCK',
+			'2' => 'AUDIO_SOURCE_BALANCED_AES',
+			'3' => 'AUDIO_SOURCE_BNC_SPDIF',
+			'4' => 'AUDIO_SOURCE_RCA_SPDIF',
+			'5' => 'AUDIO_SOURCE_OPTICAL_SPDIF',
+		} %]
+			<option [% IF prefs.clockSource == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select>
+		[% END %]
+
+		[% IF prefs.exists('polarityInversion') %]
+		<div class="prefHead">[% "SETUP_POLARITYINVERSION" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_POLARITYINVERSION_DESC" | string %]</div>
+
+		<select class="stdedit" name="polarityInversion" id="polarityInversion">
+
+		[% FOREACH option = {
+			'0' => 'POLARITYINVERSION_NORMAL',
+			'3' => 'POLARITYINVERSION_INVERTED',
+		} %]
+			<option [% IF prefs.polarityInversion == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select>
+		[% END %]
+
+	</div>
+	[% END %]
+
+	[% IF prefs.exists('wordClockOutput') %]
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_WORDCLOCKOUTPUT" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_WORDCLOCKOUTPUT_DESC" | string %]</div>
+
+		<select class="stdedit" name="wordClockOutput" id="wordClockOutput">
+
+		[% FOREACH option = {
+			'1' => 'WORDCLOCKOUTPUT_GENERATECLOCK',
+			'0' => 'WORDCLOCKOUTPUT_PASSTHROUGH',
+		} %]
+			<option [% IF prefs.wordClockOutput == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select>
+
+	</div>
+	[% END %]
+
+	<div class="settingSection">
+
+		<div class="groupHead">[% "SETUP_MAXBITRATE" | string | upper %]</div>
+		
+		<div class="groupDesc">
+		[% IF allowNoLimit %]
+			[% "SETUP_MAXBITRATE_DESC" | string %]
+		[% ELSE %]
+			[% "SETUP_MP3BITRATE_DESC" | string %]
+		[% END %]
+		
+		[% IF lamefound %]
+			[% "SETUP_LAME_FOUND" | string %]
+		[% ELSE %]
+			[% "SETUP_LAME_FOUND" | string %]
+		[% END %]
+		</div>
+
+		<select class="stdedit" name="maxBitrate" id="maxBitrate">
+		
+		[% IF allowNoLimit %]
+			<option [% IF prefs.maxBitrate == '0' %]selected [% END %]value="0">[% "NO_LIMIT" | string %]</option>
+		[% END %]
+		[% FOREACH option = ['64', '96', '128', '160', '192', '256', '320'] %]
+			<option [% IF prefs.maxBitrate == option %]selected [% END %]value="[% option %]">[% option %] [% "KBPS" | string %]</option>
+		[%- END -%]
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_LAMEQUALITY" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_LAMEQUALITY_DESC" | string %]</div>
+
+		<select class="stdedit" name="lameQuality" id="lameQuality">
+
+		[% FOREACH option = [0 .. 9] %]
+			<option [% IF prefs.lameQuality == option %]selected [% END %]value="[%option %]">
+				[% option %] [% IF loop.first %] ([% "LAME0" | string %])
+				[% ELSIF loop.last %] ([% "LAME9" | string %])[% END %]
+			</option>
+		[%- END -%]
+		
+		</select>
+
+	</div>
+
+	[% IF prefs.exists('wordClockOutput') %]
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_REPLAYGAINMODE" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_REPLAYGAINMODE_DESC" | string %]</div>
+
+		<select class="stdedit" name="replayGainMode" id="replayGainMode">
+
+		[% FOREACH option = {
+			'0' => 'REPLAYGAIN_DISABLED',
+			'1' => 'REPLAYGAIN_TRACK_GAIN',
+			'2' => 'REPLAYGAIN_ALBUM_GAIN',
+			'3' => 'REPLAYGAIN_SMART_GAIN',
+		} %]
+			<option [% IF prefs.replayGainMode == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select>
+
+	</div>
+	[% END %]
 
 [% PROCESS settingsfooter.html %]

Modified: trunk/server/HTML/EN/settings/player/display.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/display.html?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/player/display.html (original)
+++ trunk/server/HTML/EN/settings/player/display.html Fri Nov 10 23:19:20 2006
@@ -192,9 +192,7 @@
 
 		[% FOREACH option = {
 			'0' => 'SETUP_SCROLLMODE_DEFAULT',
-
 			'1' => 'SETUP_SCROLLMODE_SCROLLONCE',
-
 			'2' => 'SETUP_SCROLLMODE_NOSCROLL'
 		} %]
 			<option [% IF prefs.scrollMode == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>

Added: trunk/server/HTML/EN/settings/server/basic.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/basic.html?rev=10658&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/server/basic.html (added)
+++ trunk/server/HTML/EN/settings/server/basic.html Fri Nov 10 23:19:20 2006
@@ -1,0 +1,92 @@
+[% PROCESS settings/header.html %]
+
+	<div class="settingSection">
+		<div class="prefHead">[% "SETUP_LANGUAGE" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_LANGUAGE_DESC" | string %]</div>
+
+		<select class="stdedit" name="language" id="language">
+
+		[% FOREACH option = languageoptions %]
+			<option [% IF prefs.language == option.key %]selected [% END %]value="[% option.key %]">[% option.value %]</option>
+		[%- END -%]
+		
+		</select>
+
+	</div>
+
+	<div class="settingSection">
+		<div class="prefHead">[% "SETUP_AUDIODIR" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_AUDIODIR_DESC" | string %]</div>
+
+		<input type="text" class="stdedit" name="audiodir" id="audiodir" value="[% prefs.audiodir %]" size="40">
+
+
+		<div class="prefHead">[% "SETUP_PLAYLISTDIR" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_PLAYLISTDIR_DESC" | string %]</div>
+
+		<input type="text" class="stdedit" name="playlistdir" id="playlistdir" value="[% prefs.playlistdir %]" size="40">
+	</div>
+
+	<div class="settingSection">
+	
+		<div class="groupHead">[% "SETUP_RESCAN" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_RESCAN_DESC" | string %]</div>
+
+		<select class="stdedit" name="rescantype" id="rescantype">
+
+		[% FOREACH option = {
+			'1rescan'   => 'SETUP_STANDARDRESCAN',
+			'2wipedb'   => 'SETUP_WIPEDB',
+			'3playlist' => 'SETUP_PLAYLISTRESCAN',
+		} %]
+			<option value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select>
+		
+		<p><input name="rescan" type="submit" class="stdclick" value="[% "SETUP_RESCAN_BUTTON" | string %]"></p>
+	</div>
+
+	[% IF prefs.exists('itunes') || prefs.exists('musicmagic') || prefs.exists('moodlogic') %]
+	<div class="settingSection">
+		
+		[% IF prefs.exists('itunes') %]
+		<div class="prefHead">[% "ITUNES" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_ITUNES_DESC" | string %]</div>
+
+		<select class="stdedit" name="itunes" id="itunes">
+
+			<option [% IF NOT prefs.itunes %]selected [% END %]value="0">[% 'DONT_USE_ITUNES' | getstring %]</option>
+			<option [% IF prefs.itunes %]selected [% END %]value="1">[% 'USE_ITUNES' | getstring %]</option>
+		
+		</select>
+		[% END %]
+
+		[% IF prefs.exists('musicmagic') %]
+		<div class="prefHead">[% "SETUP_MUSICMAGIC" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_MUSICMAGIC_DESC" | string %]</div>
+
+		<select class="stdedit" name="musicmagic" id="musicmagic">
+
+			<option [% IF NOT prefs.musicmagic %]selected [% END %]value="0">[% 'DONT_USE_MUSICMAGIC' | getstring %]</option>
+			<option [% IF prefs.musicmagic %]selected [% END %]value="1">[% 'USE_MUSICMAGIC' | getstring %]</option>
+		
+		</select>
+		[% END %]
+		
+		[% IF prefs.exists('moodlogic') %]
+		<div class="prefHead">[% "SETUP_MOODLOGIC" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_MOODLOGIC_DESC" | string %]</div>
+
+		<select class="stdedit" name="moodlogic" id="moodlogic">
+
+			<option [% IF NOT prefs.moodlogic %]selected [% END %]value="0">[% 'DONT_USE_MOODLOGIC' | getstring %]</option>
+			<option [% IF prefs.moodlogic %]selected [% END %]value="1">[% 'USE_MOODLOGIC' | getstring %]</option>
+		
+		</select>
+		[% END %]
+	
+	</div>
+	[% END %]
+	
+[% PROCESS settings/footer.html %]

Added: trunk/server/HTML/EN/settings/server/behavior.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/behavior.html?rev=10658&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/server/behavior.html (added)
+++ trunk/server/HTML/EN/settings/server/behavior.html Fri Nov 10 23:19:20 2006
@@ -1,0 +1,154 @@
+[% PROCESS settings/header.html %]
+
+	<div class="settingSection">
+
+		<div class="groupHead">[% "SETUP_COMPOSERINARTISTS" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_COMPOSERINARTISTS_DESC" | string %]</div>
+
+		<input type=hidden name="composerInArtists" value="0" />
+		<input type=checkbox [% IF composerInArtists %]checked [% END %] class="stdedit" name="composerInArtists" id="composerInArtists" value="1" />
+		<label for="composerInArtists" class="stdlabel">[% "COMPOSER" | string %]</label><br>
+
+		<input type=hidden name="conductorInArtists" value="0" />
+		<input type=checkbox [% IF conductorInArtists %]checked [% END %] class="stdedit" name="conductorInArtists" id="conductorInArtists" value="1" />
+		<label for="conductorInArtists" class="stdlabel">[% "CONDUCTOR" | string %]</label><br>
+
+		<input type=hidden name="bandInArtists" value="0" />
+		<input type=checkbox [% IF bandInArtists %]checked [% END %] class="stdedit" name="bandInArtists" id="bandInArtists" value="1" />
+		<label for="bandInArtists" class="stdlabel">[% "BAND" | string %]</label>
+
+	</div>
+	
+	<div class="settingSection">
+	
+		<div class="groupHead">[% "SETUP_VARIOUSARTISTS" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_VARIOUSARTISTAUTOIDENTIFICATION_DESC" | string %]</div>
+
+		<select class="stdedit" name="variousArtistAutoIdentification" id="variousArtistAutoIdentification">
+
+			<option [% IF NOT variousArtistAutoIdentification %]selected [% END %]value="0">[% 'SETUP_VARIOUSARTISTAUTOIDENTIFICATION_0' | getstring %]</option>
+			<option [% IF variousArtistAutoIdentification %]selected [% END %]value="1">[% 'SETUP_VARIOUSARTISTAUTOIDENTIFICATION_1' | getstring %]</option>
+		
+		</select>
+
+		<div class="prefDesc">[% "SETUP_USEBANDASALBUMARTIST_DESC" | string %]</div>
+
+		<select class="stdedit" name="useBandAsAlbumArtist" id="useBandAsAlbumArtist">
+
+			<option [% IF NOT useBandAsAlbumArtist %]selected [% END %]value="0">[% 'SETUP_USEBANDASALBUMARTIST_0' | getstring %]</option>
+			<option [% IF useBandAsAlbumArtist %]selected [% END %]value="1">[% 'SETUP_USEBANDASALBUMARTIST_1' | getstring %]</option>
+		
+		</select>
+
+		<div class="prefDesc">[% "SETUP_VARIOUSARTISTSSTRING_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="variousArtistsString" id="variousArtistsString" value="[% variousArtistsString %]" size="40">
+
+	</div>
+	
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_DISPLAYTEXTTIMEOUT" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_DISPLAYTEXTTIMEOUT_DESC" | string %]</div>
+
+		[% "SETUP_DISPLAYTEXTTIMEOUT_CHOOSE" | string %]<input type=text class="stdedit" name="displaytexttimeout" id="displaytexttimeout" value="[% displaytexttimeout %]" size="15">
+
+		<div class="prefHead">[% "SETUP_CHECKVERSION" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_CHECKVERSION_DESC" | string %]</div>
+
+		<select class="stdedit" name="checkVersion" id="checkVersion">
+
+			<option [% IF NOT checkVersion %]selected [% END %]value="0">[% 'SETUP_CHECKVERSION_0' | string %]</option>
+			<option [% IF checkVersion %]selected [% END %]value="1">[% 'SETUP_CHECKVERSION_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_NOGENREFILTER" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_NOGENREFILTER_DESC" | string %]</div>
+
+		<select class="stdedit" name="noGenreFilter" id="noGenreFilter">
+
+			<option [% IF NOT noGenreFilter %]selected [% END %]value="0">[% 'SETUP_NOGENREFILTER_0' | string %]</option>
+			<option [% IF noGenreFilter%]selected [% END %]value="1">[% 'SETUP_NOGENREFILTER_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_PLAYTRACKALBUM" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_PLAYTRACKALBUM_DESC" | string %]</div>
+
+		<select class="stdedit" name="playtrackalbum" id="playtrackalbum">
+
+			<option [% IF NOT playtrackalbum %]selected [% END %]value="0">[% 'SETUP_PLAYTRACKALBUM_0' | string %]</option>
+			<option [% IF playtrackalbum %]selected [% END %]value="1">[% 'SETUP_PLAYTRACKALBUM_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_SEARCHSUBSTRING" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SEARCHSUBSTRING_DESC" | string %]</div>
+
+		<select class="stdedit" name="searchSubString" id="searchSubString">
+
+			<option [% IF NOT searchSubString %]selected [% END %]value="0">[% 'SETUP_SEARCHSUBSTRING_0' | string %]</option>
+			<option [% IF searchSubString %]selected [% END %]value="1">[% 'SETUP_SEARCHSUBSTRING_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_IGNOREDARTICLES" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_IGNOREDARTICLES_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="ignoredarticles" id="ignoredarticles" value="[% ignoredarticles %]" size="40">
+
+		<div class="prefHead">[% "SETUP_SPLITLIST" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SPLITLIST_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="splitList" id="splitList" value="[% splitList %]" size="40">
+
+		<div class="prefHead">[% "SETUP_BROWSEAGELIMIT" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_BROWSEAGELIMIT_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="browseagelimit" id="browseagelimit" value="[% browseagelimit %]" size="15">
+
+		<div class="prefHead">[% "SETUP_GROUPDISCS" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_GROUPDISCS_DESC" | string %]</div>
+
+		<select class="stdedit" name="groupdiscs" id="groupdiscs">
+
+			<option [% IF NOT groupdiscs %]selected [% END %]value="0">[% 'SETUP_GROUPDISCS_0' | string %]</option>
+			<option [% IF groupdiscs %]selected [% END %]value="1">[% 'SETUP_GROUPDISCS_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_PERSISTPLAYLISTS" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_PERSISTPLAYLISTS_DESC" | string %]</div>
+
+		<select class="stdedit" name="persistPlaylists" id="persistPlaylists">
+
+			<option [% IF NOT persistPlaylists %]selected [% END %]value="0">[% 'SETUP_PERSISTPLAYLISTS_0' | string %]</option>
+			<option [% IF persistPlaylists %]selected [% END %]value="1">[% 'SETUP_PERSISTPLAYLISTS_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_RESHUFFLEONREPEAT" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_RESHUFFLEONREPEAT_DESC" | string %]</div>
+
+		<select class="stdedit" name="reshuffleOnRepeat" id="reshuffleOnRepeat">
+
+			<option [% IF NOT reshuffleOnRepeat %]selected [% END %]value="0">[% 'SETUP_RESHUFFLEONREPEAT_0' | string %]</option>
+			<option [% IF reshuffleOnRepeat %]selected [% END %]value="1">[% 'SETUP_RESHUFFLEONREPEAT_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_SAVESHUFFLED" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SAVESHUFFLED_DESC" | string %]</div>
+
+		<select class="stdedit" name="saveShuffled" id="saveShuffled">
+
+			<option [% IF NOT saveShuffled %]selected [% END %]value="0">[% 'SETUP_SAVESHUFFLED_0' | string %]</option>
+			<option [% IF saveShuffled %]selected [% END %]value="1">[% 'SETUP_SAVESHUFFLED_1' | string %]</option>
+		
+		</select>
+
+	</div>
+
+[% PROCESS settings/footer.html %]
+

Added: trunk/server/HTML/EN/settings/server/debugging.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/debugging.html?rev=10658&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/server/debugging.html (added)
+++ trunk/server/HTML/EN/settings/server/debugging.html Fri Nov 10 23:19:20 2006
@@ -1,0 +1,36 @@
+[% PROCESS settings/header.html %]
+
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_DEBUG_SERVER_LOG" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_DEBUG_SERVER_LOG_DESC" | string %]</div>
+
+		[% debugServerLog %]
+
+		<div class="prefHead">[% "SETUP_DEBUG_SCANNER_LOG" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_DEBUG_SCANNER_LOG_DESC" | string %]</div>
+
+		[% debugScannerLog %]
+
+		<div class="prefHead">[% "DEBUGGING_SETTINGS" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_GROUP_DEBUG_DESC" | string %]</div>
+
+		[% FOREACH category = categories %]
+
+			<p>
+			<select class="stdedit" name="[% category.name %]" id="[% category.name %]">
+
+			[%- FOREACH value = logLevels -%]
+				<option [% IF value == category.current %]selected[% END %] value="[% value %]">[% "SETUP_DEBUG_LEVEL_$value" | string %]</option>
+			[%- END -%]
+
+			</select>
+
+			<label for="[% category.name %]" class="stdlabel">([% category.name %]) - [% category.label %]</label>
+			</p>
+
+		[% END %]
+
+	</div>
+
+[% PROCESS settings/footer.html %]

Added: trunk/server/HTML/EN/settings/server/filetypes.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/filetypes.html?rev=10658&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/server/filetypes.html (added)
+++ trunk/server/HTML/EN/settings/server/filetypes.html Fri Nov 10 23:19:20 2006
@@ -1,0 +1,48 @@
+[% PROCESS settings/header.html %]
+
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_DISABLEDEXTENSIONSAUDIO" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_DISABLEDEXTENSIONSAUDIO_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="disabledextensionsaudio" id="disabledextensionsaudio" value="[% disabledextensionsaudio %]" size="40">
+
+		<div class="prefHead">[% "SETUP_DISABLEDEXTENSIONSPLAYLIST" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_DISABLEDEXTENSIONSPLAYLIST_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="disabledextensionsplaylist" id="disabledextensionsplaylist" value="[% disabledextensionsplaylist %]" size="40">
+
+		<div class="prefHead">[% "SETUP_GROUP_FORMATS_CONVERSION" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_GROUP_FORMATS_CONVERSION_DESC" | string %]</div>
+
+		<table border="0" cellspacing="0" width="100%">
+			<tr><th>[% 'FILE_FORMAT' | string %]</th><th>[% 'STREAM_FORMAT' | string %]</th><th>[% 'DECODER' | string %]</th></tr>
+	
+			[% FOREACH format = formats %]
+				[% frame = format.input != loop.prev.input %]
+				[% IF frame %]
+					<tr style="height: 5px;"><td class="[% odd ? "odd" : "even" %]" colspan="3"></td></tr>
+					[% odd = (not odd) %]<tr style="height: 5px;"><td class="[% odd ? "odd" : "even" %]" colspan="3"></td></tr>
+				[% END %]
+				<tr>
+				<td class="[% odd ? "odd" : "even" %]">[% IF frame %][% format.input | string %][% END %]</td>
+				
+				<td class="[% odd ? "odd" : "even" %]"><label for="[% format.profile %]" class="stdlabel">[% format.output | string %]</label></td>
+				
+				<td class="[% odd ? "odd" : "even" %]">
+					<select class="stdedit" name="[% format.profile %]" id="[% format.profile %]">
+		
+					[%- FOREACH value = format.binaries -%]
+						<option [% IF loop.index == format.enabled %]selected [% END %]value="[% value %]">[% value | getstring %]</option>
+					[%- END -%]
+					
+					</select>
+				</td>
+				</tr>
+			[% END %]
+			<tr style="height: 5px;"><td class="[% odd ? "odd" : "even" %]" colspan="3"></td></tr>
+		</table>
+
+	</div>
+
+[% PROCESS settings/footer.html %]

Added: trunk/server/HTML/EN/settings/server/formatting.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/formatting.html?rev=10658&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/server/formatting.html (added)
+++ trunk/server/HTML/EN/settings/server/formatting.html Fri Nov 10 23:19:20 2006
@@ -1,0 +1,90 @@
+[% PROCESS settings/header.html %]
+
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_LONGDATEFORMAT" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_LONGDATEFORMAT_DESC" | string %]</div>
+
+		<select class="stdedit" name="longdateFormat" id="longdateFormat">
+
+		[% FOREACH option = longdateoptions.keys %]
+
+			<option [% IF longdateFormat == option %]selected [% END %]value="[% option %]">[% longdateoptions.$option %]</option>
+
+		[%- END -%]
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_SHORTDATEFORMAT" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SHORTDATEFORMAT_DESC" | string %]</div>
+
+		<select class="stdedit" name="shortdateFormat" id="shortdateFormat">
+
+		[% FOREACH option = shortdateoptions.keys %]
+
+			<option [% IF shortdateFormat == option %]selected [% END %]value="[% option %]">[% shortdateoptions.$option %]</option>
+
+		[%- END -%]
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_TIMEFORMAT" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_TIMEFORMAT_DESC" | string %]</div>
+
+		<select class="stdedit" name="timeFormat" id="timeFormat">
+
+		[% FOREACH option = timeoptions.keys %]
+
+			<option [% IF timeFormat == option %]selected [% END %]value="[% option %]">[% timeoptions.$option %]</option>
+
+		[%- END -%]
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_SHOWARTIST" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SHOWARTIST_DESC" | string %]</div>
+
+		<select class="stdedit" name="showArtist" id="showArtist">
+
+			<option [% IF NOT showArtist %]selected [% END %]value="0">[% 'DISABLED' | getstring %]</option>
+			<option [% IF showArtist %]selected [% END %]value="1">[% 'ENABLED' | getstring %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_SHOWYEAR" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SHOWYEAR_DESC" | string %]</div>
+
+		<select class="stdedit" name="showYear" id="showYear">
+
+			<option [% IF NOT showYears %]selected [% END %]value="0">[% 'DISABLED' | getstring %]</option>
+			<option [% IF showYear %]selected [% END %]value="1">[% 'ENABLED' | getstring %]</option>
+		
+		</select>
+
+	</div>
+
+	<div class="settingSection">
+	
+		<div class="groupHead">[% "SETUP_TITLEFORMAT" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_GROUP_TITLEFORMATS_DESC" | string %]</div>
+		
+		[% FOREACH format = titleFormat %]
+			<input type=radio [% IF titleFormatWeb == loop.index %]checked [% END %]value="[% loop.index %]" name="titleFormatWeb">
+			<input type="text" class="stdedit" name="titleFormat[% loop.index %]" id="titleFormat[% loop.index %]" value="[% format %]" size="40"><br>
+		[% END %]
+	
+	</div>
+
+	<div class="settingSection">
+
+		<div class="groupHead">[% "SETUP_GUESSFILEFORMATS" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_GROUP_GUESSFILEFORMATS_DESC" | string %]</div>
+
+		[% FOREACH format = guessFileFormats %]
+			<input type="text" class="stdedit" name="guessFileFormats[% loop.index %]" id="guessFileFormats[% loop.index %]" value="[% format %]" size="40"><br>
+		[% END %]
+	
+	</div>
+
+[% PROCESS settings/footer.html %]
+

Added: trunk/server/HTML/EN/settings/server/interface.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/interface.html?rev=10658&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/server/interface.html (added)
+++ trunk/server/HTML/EN/settings/server/interface.html Fri Nov 10 23:19:20 2006
@@ -1,0 +1,46 @@
+[% PROCESS settings/header.html %]
+
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_SKIN" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SKIN_DESC" | string %]</div>
+
+		<select class="stdedit" name="skin" id="skin">
+
+		[% FOREACH option = skinoptions.keys %]
+
+			<option [% IF skin == option %]selected [% END %]value="[% option %]">[% skinoptions.$option %]</option>
+
+		[%- END -%]
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_ITEMSPERPAGE" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_ITEMSPERPAGE_DESC" | string %]</div>
+
+		<input type="text" class="stdedit" name="itemsPerPage" id="itemsPerPage" value="[% itemsPerPage %]" size="15">
+
+		<div class="prefHead">[% "SETUP_REFRESHRATE" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_REFRESHRATE_DESC" | string %]</div>
+
+		<input type="text" class="stdedit" name="refreshRate" id="refreshRate" value="[% refreshRate %]" size="15">
+
+		<div class="prefHead">[% "SETUP_COVERART" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_COVERART_DESC" | string %]</div>
+
+		<input type="text" class="stdedit" name="coverArt" id="coverArtID" value="[% coverArt %]" size="20">
+
+		<div class="prefHead">[% "SETUP_ARTFOLDER" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_ARTFOLDER_DESC" | string %]</div>
+
+		<input type="text" class="stdedit" name="artfolder" id="artfolder" value="[% artfolder %]" size="40">
+
+		<div class="prefHead">[% "SETUP_THUMBSIZE" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_THUMBSIZE_DESC" | string %]</div>
+
+		<input type="text" class="stdedit" name="thumbSize" id="thumbSize" value="[% thumbSize %]" size="15">
+
+	</div>
+
+[% PROCESS settings/footer.html %]
+

Added: trunk/server/HTML/EN/settings/server/networking.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/networking.html?rev=10658&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/server/networking.html (added)
+++ trunk/server/HTML/EN/settings/server/networking.html Fri Nov 10 23:19:20 2006
@@ -1,0 +1,73 @@
+[% PROCESS settings/header %]
+
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_WEBPROXY" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_WEBPROXY_DESC" | string %]</div>
+
+		<label for="webproxy" class="stdlabel">[% "SETUP_WEBPROXY_CHOOSE" | string %]</label>
+		<input type=text class="stdedit" name="webproxy" id="webproxy" value="[% webproxy %]" size="40">
+
+		<div class="prefHead">[% "SETUP_HTTPPORT" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_HTTPPORT_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="httpport" id="httpport" value="[% httpport %]" size="15">
+
+		<div class="prefHead">[% "SETUP_BUFFERSECS" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_BUFFERSECS_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="bufferSecs" id="bufferSecs" value="[% bufferSecs %]" size="15">
+
+		<div class="prefHead">[% "SETUP_REMOTESTREAMTIMEOUT" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_REMOTESTREAMTIMEOUT_DESC" | string %]</div>
+
+		<label for="remotestreamtimeout" class="stdlabel">[% "SETUP_REMOTESTREAMTIMEOUT_CHOOSE" | string %]</label>
+		<input type=text class="stdedit" name="remotestreamtimeout" id="remotestreamtimeout" value="[% remotestreamtimeout %]" size="15">
+
+		<div class="prefHead">[% "SETUP_MAXWMARATE" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_MAXWMARATE_DESC" | string %]</div>
+
+		<select class="stdedit" name="maxWMArate" id="maxWMArate">
+
+		[% FOREACH option = ['9999', '32', '64', '96', '128', '160', '192', '256', '320'] %]
+			<option [% IF maxWMArate == option %]selected [% END %]value="[% option %]">
+				[% IF option == 9999 %][% "NO_LIMIT" | string %][% ELSE %][% option %] [% 'KBPS' | string %][% END %]</option>
+		[%- END -%]
+
+		</select>
+
+		[% IF mDNSname.size %]
+		<div class="prefHead">[% "SETUP_MDNSNAME" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_MDNSNAME_DESC" | string %]</div>
+		
+		<label for="mDNSname" class="stdlabel">[% "SETUP_MDNSNAME_CHOOSE" | string %]</label>
+		<input type=text class="stdedit" name="mDNSname" id="mDNSname" value="[% mDNSname %]" size="20">
+		[% END %]
+
+	</div>
+	<div class="settingSection">
+
+		<div class="groupHead">[% "SETUP_GROUP_TCP_PARAMS" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_GROUP_TCP_PARAMS_DESC" | string %]</div>
+				
+		<table border="0" width="100%">
+		<tr>
+		<td><label for="tcpReadMaximum" class="stdlabel">[% "SETUP_TCPREADMAXIMUM_CHOOSE" | string %]</label></td>
+		<td><input type="text" class="stdedit" name="tcpReadMaximum" id="tcpReadMaximum" value="[% tcpReadMaximum %]" size="15"></td>
+		</tr>
+		
+		<tr>
+		<td><label for="tcpWriteMaximum" class="stdlabel">[% "SETUP_TCPWRITEMAXIMUM_CHOOSE" | string %]</label></td>
+		<td><input type="text" class="stdedit" name="tcpWriteMaximum" id="tcpWriteMaximum" value="[% tcpWriteMaximum %]" size="15"></td>
+		</tr>
+		
+		<tr>
+		<td><label for="udpChunkSize" class="stdlabel">[% "SETUP_UDPCHUNKSIZE_CHOOSE" | string %]</label></td>
+		<td><input type="text" class="stdedit" name="udpChunkSize" id="udpChunkSize" value="[% udpChunkSize %]" size="15"></td>
+		</tr>
+		</table>
+		
+	</div>
+
+[% PROCESS settings/footer.html %]
+

Added: trunk/server/HTML/EN/settings/server/performance.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/performance.html?rev=10658&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/server/performance.html (added)
+++ trunk/server/HTML/EN/settings/server/performance.html Fri Nov 10 23:19:20 2006
@@ -1,0 +1,76 @@
+[% PROCESS settings/header.html %]
+
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_DISABLESTATISTICS" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_DISABLESTATISTICS_DESC" | string %]</div>
+
+		<select class="stdedit" name="disableStatistics" id="disableStatistics">
+
+			<option [% IF NOT disableStatistics %]selected [% END %]value="0">[% 'SETUP_ENABLE_STATISTICS' | getstring %]</option>
+			<option [% IF disableStatistics %]selected [% END %]value="1">[% 'SETUP_DISABLE_STATISTICS' | getstring %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_ITEMSPERPASS" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_ITEMSPERPASS_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="itemsPerPass" id="itemsPerPass" value="[% itemsPerPass %]" size="15">
+
+		<div class="prefHead">[% "SETUP_PREFSWRITEDELAY" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_PREFSWRITEDELAY_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="prefsWriteDelay" id="prefsWriteDelay" value="[% prefsWriteDelay %]" size="15">
+
+		<div class="prefHead">[% "SETUP_SERVERPRIORITY" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SERVERPRIORITY_DESC" | string %]</div>
+		
+		<select class="stdedit" name="serverPriority" id="serverPriority">
+
+		[% option = "" %]
+		<option [% IF serverPriority == option %]selected [% END %]value="[% option %]">[% option %] [% options.$option | getstring %]</option>
+		[% FOREACH option = [-20..20] %]
+			<option [% IF serverPriority == option %]selected [% END %]value="[% option %]">[% option %] [% options.$option | getstring %]</option>
+		[%- END -%]
+
+		</select>
+
+		<div class="prefHead">[% "SETUP_SCANNERPRIORITY" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SCANNERPRIORITY_DESC" | string %]</div>
+
+		<select class="stdedit" name="scannerPriority" id="scannerPriority">
+
+		[% option = "" %]
+		<option [% IF scannerPriority == option %]selected [% END %]value="[% option %]">[% option %] [% options.$option | getstring %]</option>
+		[% FOREACH option = [-20..20] %]
+			<option [% IF scannerPriority == option %]selected [% END %]value="[% option %]">[% option %] [% options.$option | getstring %]</option>
+		[%- END -%]
+
+		</select>
+
+		[% IF forkingPrefs %]
+		<div class="prefHead">[% "SETUP_FORKEDWEB" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_FORKEDWEB_DESC" | string %]</div>
+
+		<select class="stdedit" name="forkedWeb" id="forkedWeb">
+
+			<option [% IF NOT forkedWeb %]selected [% END %]value="0">[% 'SETUP_FORKEDWEB_DISABLE' | getstring %]</option>
+			<option [% IF forkedWeb %]selected [% END %]value="1">[% 'SETUP_FORKEDWEB_ENABLE' | getstring %]</option>
+		
+		</select>
+		
+		<div class="prefHead">[% "SETUP_FORKEDSTREAMING" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_FORKEDSTREAMING_DESC" | string %]</div>
+
+		<select class="stdedit" name="forkedStreaming" id="forkedStreaming">
+
+			<option [% IF NOT forkedStreaming %]selected [% END %]value="0">[% 'SETUP_FORKEDSTREAMING_DISABLE' | getstring %]</option>
+			<option [% IF forkedStreaming %]selected [% END %]value="1">[% 'SETUP_FORKEDSTREAMING_ENABLE' | getstring %]</option>
+		
+		</select>
+		[% END %]
+
+	</div>
+
+[% PROCESS settings/footer.html %]
+

Added: trunk/server/HTML/EN/settings/server/security.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/security.html?rev=10658&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/server/security.html (added)
+++ trunk/server/HTML/EN/settings/server/security.html Fri Nov 10 23:19:20 2006
@@ -1,0 +1,56 @@
+[% PROCESS settings/header.html %]
+
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_AUTHORIZE" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_AUTHORIZE_DESC" | string %]</div>
+
+		<select class="stdedit" name="authorize" id="authorize">
+
+			<option [% IF NOT authorize %]selected [% END %]value="0">[% 'SETUP_NO_AUTHORIZE' | getstring %]</option>
+			<option [% IF authorize %]selected [% END %]value="1">[% 'SETUP_AUTHORIZE' | getstring %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_USERNAME" | string | upper %]</div>
+
+		<input type="text" class="stdedit" name="username" id="username" value="[% username %]" size="40">
+
+		<div class="prefHead">[% "SETUP_PASSWORD" | string | upper %]</div>
+
+		<input type="password" class="stdedit" name="password" id="password" value="[% password %]" size="40">
+	
+	</div>
+
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_IPFILTER_HEAD" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_IPFILTER_DESC" | string %]</div>
+
+		<select class="stdedit" name="filterHosts" id="filterHosts">
+
+			<option [% IF NOT filterHosts %]selected [% END %]value="0">[% 'SETUP_NO_IPFILTER' | getstring %]</option>
+			<option [% IF filterHosts %]selected [% END %]value="1">[% 'SETUP_IPFILTER' | getstring %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_FILTERRULE_HEAD" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_FILTERRULE_DESC" | string %]</div>
+
+		<input type="text" class="stdedit" name="allowedHosts" id="allowedHosts" value="[% allowedHosts %]" size="40">
+
+		<div class="prefHead">[% "SETUP_CSRFPROTECTIONLEVEL" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_CSRFPROTECTIONLEVEL_DESC" | string %]</div>
+
+		<select class="stdedit" name="csrfProtectionLevel" id="csrfProtectionLevel">
+
+			<option [% IF csrfProtectionLevel == 0 %]selected [% END %]value="0">[% 'NONE' | getstring %]</option>
+			<option [% IF csrfProtectionLevel == 1 %]selected [% END %]value="1">[% 'MEDIUM' | getstring %]</option>
+			<option [% IF csrfProtectionLevel == 2 %]selected [% END %]value="2">[% 'HIGH' | getstring %]</option>
+		
+		</select>
+	
+	</div>
+
+[% PROCESS settings/footer.html %]
+

Modified: trunk/server/HTML/EN/setup.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/setup.html?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/HTML/EN/setup.html (original)
+++ trunk/server/HTML/EN/setup.html Fri Nov 10 23:19:20 2006
@@ -8,7 +8,7 @@
 
 		[% ELSE %]
 
-			<a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
+			<a href="[% webroot %]settings/server/basic.html">[% "SERVER_SETTINGS" | string %]</a>
 
 		[%END %] / <a href="setup.html?page=[% page %]">[% page | string %]</a>
 

Modified: trunk/server/HTML/Fishbone/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Fishbone/pageheader.html?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/HTML/Fishbone/pageheader.html (original)
+++ trunk/server/HTML/Fishbone/pageheader.html Fri Nov 10 23:19:20 2006
@@ -119,7 +119,7 @@
 		<a id="homelink" onload="style.fontWeight='bold';" href="" target="browser" onclick="selectLink(this,'[% page %]');" onMouseOver="homelink();setLink(this);" onMouseOut="document.getElementById('homelink').innerHTML = '[% "HOME" | string %]';">[% "HOME" | string %]</a>
 		 / 
 		[% IF not nosetup && not noserver %]
-			<a href="[% webroot %]settings/basic.html?player=[% playerURI %][% IF nofolder %]&nofolder=1[% END %]" target="browser" onclick="selectLink(this,1)">[% "SERVER_SETTINGS" | string %]</a>
+			<a href="[% webroot %]settings/server/basic.html?player=[% playerURI %][% IF nofolder %]&nofolder=1[% END %]" target="browser" onclick="selectLink(this,1)">[% "SERVER_SETTINGS" | string %]</a>
 			 / 
 		[% END %]
 		<a href="[% webroot %]home.html?page=help&player=[% playerURI %][% IF nofolder %]&nofolder=1[% END %]" target="browser" onclick="selectLink(this,1)">[% "HELP" | string %]</a></nobr>

Modified: trunk/server/HTML/Handheld/pagefooter.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Handheld/pagefooter.html?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/HTML/Handheld/pagefooter.html (original)
+++ trunk/server/HTML/Handheld/pagefooter.html Fri Nov 10 23:19:20 2006
@@ -11,7 +11,7 @@
 	    		[% UNLESS nosetup %]
 	    			[% "SETTINGS" | string %]
 	    			[% UNLESS noserver %]
-	    				<a href="[% webroot %]settings/basic.html">[% "SERVER" | string %]</a> /
+	    				<a href="[% webroot %]settings/server/basic.html">[% "SERVER" | string %]</a> /
 	    			[% END %]
 	    			<a href="[% webroot %]setup.html?player=[% playerURI %]&amp;playerid=[% playerURI %]&amp;page=BASIC_PLAYER_SETTINGS">[% "PLAYER" | string %]</a> -- 
 	    		[% END %]<a href="[% webroot %]hitlist.html?player=[% playerURI %]">[% "STATISTICS" | string %]</a> -- 

Modified: trunk/server/HTML/Moser/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Moser/home.html?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/HTML/Moser/home.html (original)
+++ trunk/server/HTML/Moser/home.html Fri Nov 10 23:19:20 2006
@@ -32,7 +32,7 @@
  [%- UNLESS nosetup %]
   <h4>[% "SETTINGS" | string %]</h4>
   <ul>
-    <li><a href="settings/basic.html?player=[% playerURI %]">[% "SERVER_SETTINGS" | string %]</a></li>
+    <li><a href="settings/server/basic.html?player=[% playerURI %]">[% "SERVER_SETTINGS" | string %]</a></li>
   [%- FOREACH client = players %]
     <li><a href="setup.html?page=BASIC_PLAYER_SETTINGS&amp;player=[% playerURI %]&amp;playerid=[% client.id | uri %]">
       [%- "PLAYER_SETTINGS" | string %][% IF client.name %] [% "FOR" | string %] [% client.name %][% END %]</a></li>

Modified: trunk/server/HTML/NBMU/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/NBMU/home.html?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/HTML/NBMU/home.html (original)
+++ trunk/server/HTML/NBMU/home.html Fri Nov 10 23:19:20 2006
@@ -62,7 +62,7 @@
       <p>[% IF not nosetup %] </p>
       <h4><font color="#999999">[% "SETTINGS" | string %]</font></h4>
       <ul>
-        <li> <a href="settings/basic.html?player=[% playerURI %]">[% "SERVER_SETTINGS" | string %]</a> 
+        <li> <a href="settings/server/basic.html?player=[% playerURI %]">[% "SERVER_SETTINGS" | string %]</a> 
           [% player_list %] </li>
 [% IF additionalLinks.settings %]
     [% FOREACH key = additionalLinks.settings.keys %]

Modified: trunk/server/HTML/Nokia770/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/home.html?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/home.html (original)
+++ trunk/server/HTML/Nokia770/home.html Fri Nov 10 23:19:20 2006
@@ -133,7 +133,7 @@
 	<div>[% "SETTINGS" | string | upper %]</div>
 	<ul>
 	[%- IF not noserver %]
-		<li><a href="settings/basic.html">[% "SERVER_SETTINGS" | string %]</a></li>
+		<li><a href="settings/server/basic.html">[% "SERVER_SETTINGS" | string %]</a></li>
 	[%- END %]
 
 	[%- USE Clients; players = Clients.get("name"); FOREACH client = players; %]
@@ -187,7 +187,7 @@
 	<tr>
 		<td align="right">
 			<a href="[% webroot %]html/about.html" class = 'statusbartext'>[% "ABOUT_SHORT" | string %]</a>&nbsp;|&nbsp;
-			<a href="[% webroot %]settings/basic.html" class = "statusbartext">[% "SERVER_SETTINGS" | string %]</a>&nbsp;|&nbsp;
+			<a href="[% webroot %]settings/server/basic.html" class = "statusbartext">[% "SERVER_SETTINGS" | string %]</a>&nbsp;|&nbsp;
 			<a class = 'statusbartext' href="[% webroot %]setup.html?page=BASIC_PLAYER_SETTINGS&player=[% playerURI %]&playerid=[% playerURI %]">[% "PLAYER_SETTINGS" | string %]</a>
 		</td>
 		<td width="4"></td>

Modified: trunk/server/HTML/Nokia770/pagefooter.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/pagefooter.html?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/pagefooter.html (original)
+++ trunk/server/HTML/Nokia770/pagefooter.html Fri Nov 10 23:19:20 2006
@@ -11,7 +11,7 @@
 	</td>
 	<td align="right">
 		<a href="[% webroot %]html/about.html" class = 'statusbartext'>[% "ABOUT_SHORT" | string %]</a>&nbsp;|&nbsp;
-		<a href="[% webroot %]settings/basic.html" class = "statusbartext">[% "SERVER_SETTINGS" | string %]</a>&nbsp;|&nbsp;
+		<a href="[% webroot %]settings/server/basic.html" class = "statusbartext">[% "SERVER_SETTINGS" | string %]</a>&nbsp;|&nbsp;
 		<a class = 'statusbartext' href="[% webroot %]setup.html?page=BASIC_PLAYER_SETTINGS&player=[% playerURI %]&playerid=[% playerURI %]">[% "PLAYER_SETTINGS" | string %]</a>
 [% IF isplayer %]
 		&nbsp;|&nbsp;

Modified: trunk/server/Slim/Web/Settings/Server/Basic.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/Basic.pm?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/Basic.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/Basic.pm Fri Nov 10 23:19:20 2006
@@ -17,7 +17,7 @@
 }
 
 sub page {
-	return 'settings/basic.html';
+	return 'settings/server/basic.html';
 }
 
 sub handler {

Modified: trunk/server/Slim/Web/Settings/Server/Behavior.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/Behavior.pm?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/Behavior.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/Behavior.pm Fri Nov 10 23:19:20 2006
@@ -15,7 +15,7 @@
 }
 
 sub page {
-	return 'settings/behavior.html';
+	return 'settings/server/behavior.html';
 }
 
 sub handler {

Modified: trunk/server/Slim/Web/Settings/Server/Debugging.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/Debugging.pm?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/Debugging.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/Debugging.pm Fri Nov 10 23:19:20 2006
@@ -18,7 +18,7 @@
 }
 
 sub page {
-	return 'settings/debugging.html';
+	return 'settings/server/debugging.html';
 }
 
 sub handler {

Modified: trunk/server/Slim/Web/Settings/Server/FileTypes.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/FileTypes.pm?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/FileTypes.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/FileTypes.pm Fri Nov 10 23:19:20 2006
@@ -19,7 +19,7 @@
 }
 
 sub page {
-	return 'settings/filetypes.html';
+	return 'settings/server/filetypes.html';
 }
 
 sub handler {

Modified: trunk/server/Slim/Web/Settings/Server/Network.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/Network.pm?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/Network.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/Network.pm Fri Nov 10 23:19:20 2006
@@ -19,7 +19,7 @@
 }
 
 sub page {
-	return 'settings/networking.html';
+	return 'settings/server/networking.html';
 }
 
 sub handler {

Modified: trunk/server/Slim/Web/Settings/Server/Performance.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/Performance.pm?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/Performance.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/Performance.pm Fri Nov 10 23:19:20 2006
@@ -15,7 +15,7 @@
 }
 
 sub page {
-	return 'settings/performance.html';
+	return 'settings/server/performance.html';
 }
 
 sub handler {

Modified: trunk/server/Slim/Web/Settings/Server/Security.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/Security.pm?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/Security.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/Security.pm Fri Nov 10 23:19:20 2006
@@ -15,7 +15,7 @@
 }
 
 sub page {
-	return 'settings/security.html';
+	return 'settings/server/security.html';
 }
 
 sub handler {

Modified: trunk/server/Slim/Web/Settings/Server/TextFormatting.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/TextFormatting.pm?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/TextFormatting.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/TextFormatting.pm Fri Nov 10 23:19:20 2006
@@ -15,7 +15,7 @@
 }
 
 sub page {
-	return 'settings/formatting.html';
+	return 'settings/server/formatting.html';
 }
 
 sub handler {

Modified: trunk/server/Slim/Web/Settings/Server/UserInterface.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/UserInterface.pm?rev=10658&r1=10657&r2=10658&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/UserInterface.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/UserInterface.pm Fri Nov 10 23:19:20 2006
@@ -21,7 +21,7 @@
 }
 
 sub page {
-	return 'settings/interface.html';
+	return 'settings/server/interface.html';
 }
 
 sub handler {



More information about the checkins mailing list