[Slim-Checkins] r10618 - in /trunk/server: HTML/EN/ HTML/EN/settings/ HTML/EN/settings/player/ Slim/Player/ Slim/Web/

kdf at svn.slimdevices.com kdf at svn.slimdevices.com
Tue Nov 7 19:33:00 PST 2006


Author: kdf
Date: Tue Nov  7 19:32:59 2006
New Revision: 10618

URL: http://svn.slimdevices.com?rev=10618&view=rev
Log:
Bug: 3267
Description: 
 - move setup pages into their own folder HTML/EN/settings for server settings and HTML/EN/settings/player for player settings pages.  
 - Added some skeletal tempaltes for future conversion of the player setting pages.  
 - clean up pagehandler setup
 - init the new links on startup


Added:
    trunk/server/HTML/EN/settings/
    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/player/
    trunk/server/HTML/EN/settings/player/alarm.html
    trunk/server/HTML/EN/settings/player/audio.html
    trunk/server/HTML/EN/settings/player/basic.html
    trunk/server/HTML/EN/settings/player/display.html
    trunk/server/HTML/EN/settings/player/menu.html
    trunk/server/HTML/EN/settings/player/remote.html
    trunk/server/HTML/EN/settings/security.html
Removed:
    trunk/server/HTML/EN/debugging.html
    trunk/server/HTML/EN/setupbehavior.html
    trunk/server/HTML/EN/setupfiletypes.html
    trunk/server/HTML/EN/setupformatting.html
    trunk/server/HTML/EN/setupinterface.html
    trunk/server/HTML/EN/setupnetworking.html
    trunk/server/HTML/EN/setupperformance.html
    trunk/server/HTML/EN/setupsecurity.html
Modified:
    trunk/server/Slim/Player/TranscodingHelper.pm
    trunk/server/Slim/Web/HTTP.pm
    trunk/server/Slim/Web/Pages.pm
    trunk/server/Slim/Web/Setup.pm

Added: trunk/server/HTML/EN/settings/basic.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/basic.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/basic.html (added)
+++ trunk/server/HTML/EN/settings/basic.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,105 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="/[% path %]">[% 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="/[% path %]">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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_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>-->
+
+		<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>
+
+	</div>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Added: trunk/server/HTML/EN/settings/behavior.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/behavior.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/behavior.html (added)
+++ trunk/server/HTML/EN/settings/behavior.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,183 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="/[% path %]">[% 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="/[% path %]">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Added: trunk/server/HTML/EN/settings/debugging.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/debugging.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/debugging.html (added)
+++ trunk/server/HTML/EN/settings/debugging.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,69 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		[% IF playerid %]
+
+			[% "PLAYER_SETTINGS" | string %] [% IF playername %][% "FOR" | string %] [% playername %][% END %]
+
+		[% ELSE %]
+
+			<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		[%END %] / <a href="/[% path %]">[% 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 %] 
+
+<form method="post" action="/[% path %]">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+</div>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]

Added: trunk/server/HTML/EN/settings/filetypes.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/filetypes.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/filetypes.html (added)
+++ trunk/server/HTML/EN/settings/filetypes.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,79 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="/[% path %]">[% 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="/[% path %]">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]

Added: trunk/server/HTML/EN/settings/formatting.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/formatting.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/formatting.html (added)
+++ trunk/server/HTML/EN/settings/formatting.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,121 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="/[% path %]">[% 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="/[% path %]">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Added: trunk/server/HTML/EN/settings/interface.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/interface.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/interface.html (added)
+++ trunk/server/HTML/EN/settings/interface.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,75 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="/[% path %]">[% 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="/[% path %]">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Added: trunk/server/HTML/EN/settings/networking.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/networking.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/networking.html (added)
+++ trunk/server/HTML/EN/settings/networking.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,103 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="/[% path %]">[% 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>
+[% path %]
+<form method="post" action="/[% path %]">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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 = wmaoptions.nsort %]
+			<option [% IF maxWMArate == option %]selected [% END %]value="[% option %]">[% wmaoptions.$option %]</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>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Added: trunk/server/HTML/EN/settings/performance.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/performance.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/performance.html (added)
+++ trunk/server/HTML/EN/settings/performance.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,109 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="/[% path %]">[% 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="/[% path %]">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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 forkedWeb.size %]
+		<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>
+		[% END %]
+
+		[% IF forkedStreaming.size %]
+		<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>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Added: trunk/server/HTML/EN/settings/player/alarm.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/alarm.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/player/alarm.html (added)
+++ trunk/server/HTML/EN/settings/player/alarm.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,105 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="setupserverbasic.html">[% 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="setupserverbasic.html">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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_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>-->
+
+		<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>
+
+	</div>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Added: trunk/server/HTML/EN/settings/player/audio.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/audio.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/player/audio.html (added)
+++ trunk/server/HTML/EN/settings/player/audio.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,105 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="setupserverbasic.html">[% 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="setupserverbasic.html">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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_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>-->
+
+		<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>
+
+	</div>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Added: trunk/server/HTML/EN/settings/player/basic.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/basic.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/player/basic.html (added)
+++ trunk/server/HTML/EN/settings/player/basic.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,105 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="setupserverbasic.html">[% 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="setupserverbasic.html">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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_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>-->
+
+		<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>
+
+	</div>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Added: trunk/server/HTML/EN/settings/player/display.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/display.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/player/display.html (added)
+++ trunk/server/HTML/EN/settings/player/display.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,105 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="setupserverbasic.html">[% 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="setupserverbasic.html">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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_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>-->
+
+		<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>
+
+	</div>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Added: trunk/server/HTML/EN/settings/player/menu.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/menu.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/player/menu.html (added)
+++ trunk/server/HTML/EN/settings/player/menu.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,105 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="setupserverbasic.html">[% 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="setupserverbasic.html">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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_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>-->
+
+		<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>
+
+	</div>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Added: trunk/server/HTML/EN/settings/player/remote.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/remote.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/player/remote.html (added)
+++ trunk/server/HTML/EN/settings/player/remote.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,105 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="setupserverbasic.html">[% 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="setupserverbasic.html">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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_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>-->
+
+		<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>
+
+	</div>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Added: trunk/server/HTML/EN/settings/security.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/security.html?rev=10618&view=auto
==============================================================================
--- trunk/server/HTML/EN/settings/security.html (added)
+++ trunk/server/HTML/EN/settings/security.html Tue Nov  7 19:32:59 2006
@@ -1,0 +1,87 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="/[% path %]">[% 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="/[% path %]">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<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>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Modified: trunk/server/Slim/Player/TranscodingHelper.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/TranscodingHelper.pm?rev=10618&r1=10617&r2=10618&view=diff
==============================================================================
--- trunk/server/Slim/Player/TranscodingHelper.pm (original)
+++ trunk/server/Slim/Player/TranscodingHelper.pm Tue Nov  7 19:32:59 2006
@@ -160,7 +160,9 @@
 
 			$command = undef;
 
-			$log->warn("   couldn't find  binary for: $1");
+			$@ = $1;
+
+			$log->warn("   couldn't find binary for: $1");
 		}
 	}
 

Modified: trunk/server/Slim/Web/HTTP.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/HTTP.pm?rev=10618&r1=10617&r2=10618&view=diff
==============================================================================
--- trunk/server/Slim/Web/HTTP.pm (original)
+++ trunk/server/Slim/Web/HTTP.pm Tue Nov  7 19:32:59 2006
@@ -441,7 +441,7 @@
 
 				return;
 
-			} elsif ($path =~ m|^/(.+?)/.*| && $path !~ m{^/(?:html|music|plugins)/}i) {
+			} elsif ($path =~ m|^/(.+?)/.*| && $path !~ m{^/(?:html|music|plugins|settings)/}i) {
 
 				my $desiredskin = $1;
 
@@ -828,7 +828,7 @@
 
 		# if we match one of the page functions as defined above,
 		# execute that, and hand it a callback to send the data.
-		
+
 		# fork for certain read-only operations i.e. browsedb
 		if ( $forkFunctions{$path} && $^O !~ /Win32/ && Slim::Utils::Prefs::get('forkedWeb') ) {
 

Modified: trunk/server/Slim/Web/Pages.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Pages.pm?rev=10618&r1=10617&r2=10618&view=diff
==============================================================================
--- trunk/server/Slim/Web/Pages.pm (original)
+++ trunk/server/Slim/Web/Pages.pm Tue Nov  7 19:32:59 2006
@@ -42,15 +42,6 @@
 	Slim::Web::HTTP::addPageFunction(qr/^setup\.(?:htm|xml)/,\&Slim::Web::Setup::setup_HTTP);
 	Slim::Web::HTTP::addPageFunction(qr/^tunein\.(?:htm|xml)/,\&tuneIn);
 	Slim::Web::HTTP::addPageFunction(qr/^update_firmware\.(?:htm|xml)/,\&update_firmware);
-	Slim::Web::HTTP::addPageFunction(qr/^debugging\.(?:htm|xml)/, \&Slim::Web::Setup::handleDebugSettings);
-	Slim::Web::HTTP::addPageFunction(qr/^setupfiletypes\.(?:htm|xml)/, \&Slim::Web::Setup::handleFileTypeSettings);
-	Slim::Web::HTTP::addPageFunction(qr/^setupperformance\.(?:htm|xml)/, \&Slim::Web::Setup::handlePerformanceSettings);
-	Slim::Web::HTTP::addPageFunction(qr/^setupbehavior\.(?:htm|xml)/, \&Slim::Web::Setup::handleBehaviorSettings);
-	Slim::Web::HTTP::addPageFunction(qr/^setupsecurity\.(?:htm|xml)/, \&Slim::Web::Setup::handleSecuritySettings);
-	Slim::Web::HTTP::addPageFunction(qr/^setupnetworking\.(?:htm|xml)/, \&Slim::Web::Setup::handleNetworkingSettings);
-	Slim::Web::HTTP::addPageFunction(qr/^setupformatting\.(?:htm|xml)/, \&Slim::Web::Setup::handleFormattingSettings);
-	Slim::Web::HTTP::addPageFunction(qr/^setupinterface\.(?:htm|xml)/, \&Slim::Web::Setup::handleInterfaceSettings);
-	#Slim::Web::HTTP::addPageFunction(qr/^setupserverbasic\.(?:htm|xml)/, \&Slim::Web::Setup::handleBasicServerSettings);
 
 	# pull in the memory usage module if requested.
 	if (logger('server.memory')->is_info) {

Modified: trunk/server/Slim/Web/Setup.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Setup.pm?rev=10618&r1=10617&r2=10618&view=diff
==============================================================================
--- trunk/server/Slim/Web/Setup.pm (original)
+++ trunk/server/Slim/Web/Setup.pm Tue Nov  7 19:32:59 2006
@@ -1341,9 +1341,7 @@
 
 	,'BASIC_SERVER_SETTINGS' => {
 
-		'children' => [qw(BASIC_SERVER_SETTINGS INTERFACE_SETTINGS BEHAVIOR_SETTINGS 
-				FORMATS_SETTINGS FORMATTING_SETTINGS SECURITY_SETTINGS 
-				PERFORMANCE_SETTINGS NETWORK_SETTINGS DEBUGGING_SETTINGS)],
+		'children' => [qw(BASIC_SERVER_SETTINGS)],
 
 		'title'    => string('BASIC_SERVER_SETTINGS'),
 		'singleChildLinkText' => string('ADDITIONAL_SERVER_SETTINGS'),
@@ -1548,39 +1546,8 @@
 				}
 			}
 		}, #end of setup{'RADIO'}
-	'INTERFACE_SETTINGS'   => { },# end of setup{'INTERFACE_SETTINGS'} hash
-
-	'FORMATS_SETTINGS'     => { },
-
-	'BEHAVIOR_SETTINGS'    => { }, #end of setup{'behavior'} hash
-
-	'FORMATTING_SETTINGS'  => { }, #end of setup{'FORMATTING_SETTINGS'} hash
-
-	'SECURITY_SETTINGS'    => { }, #end of setup{'security'} hash
-
-	'PERFORMANCE_SETTINGS' => { }, #end of setup{'performance'} hash
-	
-	'NETWORK_SETTINGS'     => { }, #end of setup{'network'} hash
-
-	# This is handled by handleDebugSettings()
-	'DEBUGGING_SETTINGS'   => { },
-
 	); #end of setup hash
-
-	# Bug 2724 - only show the mDNS settings if we have a binary for it.
-	if (Slim::Utils::Misc::findbin('mDNSResponderPosix')) {
-
-		push @{$setup{'NETWORK_SETTINGS'}{'Groups'}{'Default'}{'PrefOrder'}}, 'mDNSname';
-	}
-	
-	# Add forking performance options for non-Windows
-	if ( $^O !~ /Win32/ ) {
-
-		push @{ $setup{'PERFORMANCE_SETTINGS'}->{'Groups'}->{'Default'}->{'PrefOrder'} },
-			'forkedWeb',
-			'forkedStreaming';
-	}
-
+	
 	if (scalar(keys %{Slim::Utils::PluginManager::installedPlugins()})) {
 		
 		addChildren('BASIC_SERVER_SETTINGS', 'PLUGINS');
@@ -1595,6 +1562,26 @@
 sub initSetup {
 	initSetupConfig();
 	fillAlarmOptions();
+
+	Slim::Web::HTTP::addPageFunction(qr/^settings\/debugging\.(?:htm|xml)/,   \&Slim::Web::Setup::handleDebugSettings);
+	Slim::Web::HTTP::addPageFunction(qr/^settings\/filetypes\.(?:htm|xml)/,   \&Slim::Web::Setup::handleFileTypeSettings);
+	Slim::Web::HTTP::addPageFunction(qr/^settings\/performance\.(?:htm|xml)/, \&Slim::Web::Setup::handlePerformanceSettings);
+	Slim::Web::HTTP::addPageFunction(qr/^settings\/behavior\.(?:htm|xml)/,    \&Slim::Web::Setup::handleBehaviorSettings);
+	Slim::Web::HTTP::addPageFunction(qr/^settings\/security\.(?:htm|xml)/,    \&Slim::Web::Setup::handleSecuritySettings);
+	Slim::Web::HTTP::addPageFunction(qr/^settings\/networking\.(?:htm|xml)/,  \&Slim::Web::Setup::handleNetworkingSettings);
+	Slim::Web::HTTP::addPageFunction(qr/^settings\/formatting\.(?:htm|xml)/,  \&Slim::Web::Setup::handleFormattingSettings);
+	Slim::Web::HTTP::addPageFunction(qr/^settings\/interface\.(?:htm|xml)/,   \&Slim::Web::Setup::handleInterfaceSettings);
+	#Slim::Web::HTTP::addPageFunction(qr/^settings\/basic\.(?:htm|xml)/,       \&Slim::Web::Setup::handleBasicServerSettings);
+
+	Slim::Web::Pages->addPageLinks('setup', { "DEBUGGING_SETTINGS"   => 'settings/debugging.html' });
+	Slim::Web::Pages->addPageLinks('setup', { "FORMATS_SETTINGS"     => 'settings/filetypes.html' });
+	Slim::Web::Pages->addPageLinks('setup', { "PERFORMANCE_SETTINGS" => 'settings/performance.html' });
+	Slim::Web::Pages->addPageLinks('setup', { "BEHAVIOR_SETTINGS"    => 'settings/behavior.html' });
+	Slim::Web::Pages->addPageLinks('setup', { "SECURITY_SETTINGS"    => 'settings/security.html' });
+	Slim::Web::Pages->addPageLinks('setup', { "NETWORK_SETTINGS"     => 'settings/networking.html' });
+	Slim::Web::Pages->addPageLinks('setup', { "FORMATTING_SETTINGS"  => 'settings/formatting.html' });
+	Slim::Web::Pages->addPageLinks('setup', { "INTERFACE_SETTINGS"   => 'settings/interface.html' });
+#	Slim::Web::Pages->addPageLinks('setup', { "BASIC_SERVER_SETTINGS" => 'settings/setupbasicserver.html' });
 }
 
 sub handleFileTypeSettings {
@@ -1674,7 +1661,7 @@
 	$paramRef->{'disabledextensionsaudio'}  = Slim::Utils::Prefs::get('disabledextensionsaudio');
 	$paramRef->{'disabledextensionsplaylist'} = Slim::Utils::Prefs::get('disabledextensionsplaylist');
 
-	return Slim::Web::HTTP::filltemplatefile('setupfiletypes.html', $paramRef);
+	return Slim::Web::HTTP::filltemplatefile('settings\filetypes.html', $paramRef);
 }
 
 sub handleDebugSettings {
@@ -1723,7 +1710,7 @@
 	$paramRef->{'debugServerLog'}  = Slim::Utils::Log->serverLogFile;
 	$paramRef->{'debugScannerLog'} = Slim::Utils::Log->scannerLogFile;
 
-	return Slim::Web::HTTP::filltemplatefile('debugging.html', $paramRef);
+	return Slim::Web::HTTP::filltemplatefile('settings\debugging.html', $paramRef);
 }
 
 sub handlePerformanceSettings {
@@ -1736,6 +1723,14 @@
 					serverPriority
 					scannerPriority
 				);
+
+	# Add forking performance options for non-Windows
+	if ( $^O !~ /Win32/ ) {
+
+		push @prefs,
+			'forkedWeb',
+			'forkedStreaming';
+	}
 
 	# If this is a settings update
 	if ($paramRef->{'submit'}) {
@@ -1765,7 +1760,7 @@
 		$paramRef->{$pref} = Slim::Utils::Prefs::get($pref);
 	}
 	
-	return Slim::Web::HTTP::filltemplatefile('setupperformance.html', $paramRef);
+	return Slim::Web::HTTP::filltemplatefile('settings/performance.html', $paramRef);
 }
 
 sub handleBasicServerSettings {
@@ -1800,7 +1795,7 @@
 		$paramRef->{$pref} = Slim::Utils::Prefs::get($pref);
 	}
 	
-	return Slim::Web::HTTP::filltemplatefile('setupserverbasic.html', $paramRef);
+	return Slim::Web::HTTP::filltemplatefile('settings/basic.html', $paramRef);
 }
 
 sub handleNetworkingSettings {
@@ -1816,6 +1811,12 @@
 					tcpWriteMaximum
 					udpChunkSize
 				);
+
+	# Bug 2724 - only show the mDNS settings if we have a binary for it.
+	if (Slim::Utils::Misc::findbin('mDNSResponderPosix')) {
+
+		push @prefs, 'mDNSname';
+	}
 
 	# If this is a settings update
 	if ($paramRef->{'submit'}) {
@@ -1875,7 +1876,7 @@
 							};
 	
 	
-	return Slim::Web::HTTP::filltemplatefile('setupnetworking.html', $paramRef);
+	return Slim::Web::HTTP::filltemplatefile('settings/networking.html', $paramRef);
 }
 
 sub handleSecuritySettings {
@@ -1908,7 +1909,7 @@
 		$paramRef->{$pref} = Slim::Utils::Prefs::get($pref);
 	}
 	
-	return Slim::Web::HTTP::filltemplatefile('setupsecurity.html', $paramRef);
+	return Slim::Web::HTTP::filltemplatefile('settings/security.html', $paramRef);
 }
 
 sub handleFormattingSettings {
@@ -1978,7 +1979,7 @@
 	$paramRef->{'shortdateoptions'} = Slim::Utils::DateTime::shortDateFormats;
 	$paramRef->{'timeoptions'}      = Slim::Utils::DateTime::timeFormats;
 	
-	return Slim::Web::HTTP::filltemplatefile('setupformatting.html', $paramRef);
+	return Slim::Web::HTTP::filltemplatefile('settings/formatting.html', $paramRef);
 }
 
 sub handleInterfaceSettings {
@@ -2047,7 +2048,7 @@
 	
 	$paramRef->{'skinoptions'} = {skins(1)};
 	
-	return Slim::Web::HTTP::filltemplatefile('setupinterface.html', $paramRef);
+	return Slim::Web::HTTP::filltemplatefile('settings/interface.html', $paramRef);
 }
 
 sub handleBehaviorSettings {
@@ -2104,7 +2105,7 @@
 		$paramRef->{$pref} = Slim::Utils::Prefs::get($pref);
 	}
 	
-	return Slim::Web::HTTP::filltemplatefile('setupbehavior.html', $paramRef);
+	return Slim::Web::HTTP::filltemplatefile('settings/behavior.html', $paramRef);
 }
 
 sub getSetupOptions {
@@ -2675,47 +2676,7 @@
 		
 		} else {
 
-			# global setup pages, need to do this at startup too
-			if ($page eq "DEBUGGING_SETTINGS") {
-
-				Slim::Web::Pages->addPageLinks('setup', { $page => 'debugging.html' });
-
-			} elsif ($page eq "FORMATS_SETTINGS") {
-
-				Slim::Web::Pages->addPageLinks('setup', { $page => 'setupfiletypes.html' });
-
-			} elsif ($page eq "PERFORMANCE_SETTINGS") {
-
-				Slim::Web::Pages->addPageLinks('setup', { $page => 'setupperformance.html' });
-
-			} elsif ($page eq "BEHAVIOR_SETTINGS") {
-
-				Slim::Web::Pages->addPageLinks('setup', { $page => 'setupbehavior.html' });
-
-			} elsif ($page eq "SECURITY_SETTINGS") {
-
-				Slim::Web::Pages->addPageLinks('setup', { $page => 'setupsecurity.html' });
-
-			} elsif ($page eq "NETWORK_SETTINGS") {
-
-				Slim::Web::Pages->addPageLinks('setup', { $page => 'setupnetworking.html' });
-
-			} elsif ($page eq "FORMATTING_SETTINGS") {
-
-				Slim::Web::Pages->addPageLinks('setup', { $page => 'setupformatting.html' });
-
-			} elsif ($page eq "INTERFACE_SETTINGS") {
-
-				Slim::Web::Pages->addPageLinks('setup', { $page => 'setupinterface.html' });
-
-#			} elsif ($page eq "BASIC_SERVER_SETTINGS") {
-
-#				Slim::Web::Pages->addPageLinks('setup', { $page => 'setupbasicserver.html' });
-
-			} else {
-
 				Slim::Web::Pages->addPageLinks('setup', { $page => "setup.html?page=$page" });
-			}
 		}
 	}
 }



More information about the checkins mailing list