[Slim-Checkins] r10657 - in /trunk/server/HTML/EN: ./ settings/ settings/player/

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

Author: kdf
Date: Fri Nov 10 19:10:24 2006
New Revision: 10657

URL: http://svn.slimdevices.com?rev=10657&view=rev
Log:
Bug: n/a
Description: 
	- created a settingsheader and settingsfooter template for common framing of settings pages.  skins may want to customise as some relocate the settings menu options.
	- updates to settings templates to use the header/footer
	- blank out the play settings pages to standard generic forms
	- update basic player and player display settings, disabled for now.
	

Added:
    trunk/server/HTML/EN/settingsfooter.html
    trunk/server/HTML/EN/settingsheader.html
Modified:
    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/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

Modified: trunk/server/HTML/EN/settings/basic.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/basic.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/basic.html (original)
+++ trunk/server/HTML/EN/settings/basic.html Fri Nov 10 19:10:24 2006
@@ -1,40 +1,13 @@
-[% FILTER null %]
-
-	[% pwd_list = BLOCK %]
-
-		[% "SERVER_SETTINGS" | string %]
-
-		 / <a href="[% webroot %][% 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="[% webroot %][% path %]">
-
-	<input type=hidden value="[% page %]" name="page">
+[% PROCESS settingsheader.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 language == option.key %]selected [% END %]value="[% option.key %]">[% option.value %]</option>
+			<option [% IF prefs.language == option.key %]selected [% END %]value="[% option.key %]">[% option.value %]</option>
 		[%- END -%]
 		
 		</select>
@@ -45,13 +18,13 @@
 		<div class="prefHead">[% "SETUP_AUDIODIR" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_AUDIODIR_DESC" | string %]</div>
 
-		<input type="text" class="stdedit" name="audiodir" id="artfolder" value="[% audiodir %]" size="40">
+		<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="artfolder" value="[% playlistdir %]" size="40">
+		<input type="text" class="stdedit" name="playlistdir" id="playlistdir" value="[% prefs.playlistdir %]" size="40">
 	</div>
 
 	<div class="settingSection">
@@ -74,66 +47,46 @@
 		<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 itunesavailable %]
+		[% 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 itunes %]selected [% END %]value="0">[% 'DONT_USE_ITUNES' | getstring %]</option>
-			<option [% IF itunes %]selected [% END %]value="1">[% 'USE_ITUNES' | getstring %]</option>
+			<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 musicmagicavailable %]
+		[% 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 musicmagic %]selected [% END %]value="0">[% 'DONT_USE_MUSICMAGIC' | getstring %]</option>
-			<option [% IF musicmagic %]selected [% END %]value="1">[% 'USE_MUSICMAGIC' | getstring %]</option>
+			<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 moodlogicavailable %]
+		[% 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 moodlogic %]selected [% END %]value="0">[% 'DONT_USE_MOODLOGIC' | getstring %]</option>
-			<option [% IF moodlogic %]selected [% END %]value="1">[% 'USE_MOODLOGIC' | getstring %]</option>
+			<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>
-
-	<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>
-
-[% PROCESS pagefooter.html %]
+	[% END %]
+	
+[% PROCESS settingsfooter.html %]

Modified: trunk/server/HTML/EN/settings/behavior.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/behavior.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/behavior.html (original)
+++ trunk/server/HTML/EN/settings/behavior.html Fri Nov 10 19:10:24 2006
@@ -1,32 +1,7 @@
-[% FILTER null %]
-
-	[% pwd_list = BLOCK %]
-
-		<a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
-
-		 / <a href="[% webroot %][% 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="[% webroot %][% path %]">
-
-	<input type=hidden value="[% page %]" name="page">
+[% PROCESS settingsheader.html %]
 
 	<div class="settingSection">
+
 		<div class="groupHead">[% "SETUP_COMPOSERINARTISTS" | string | upper %]</div>
 		<div class="groupDesc">[% "SETUP_COMPOSERINARTISTS_DESC" | string %]</div>
 
@@ -48,6 +23,7 @@
 	
 		<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>
@@ -174,10 +150,5 @@
 
 	</div>
 
-	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
-</form>
+[% PROCESS settingsfooter.html %]
 
-<p></p>
-
-[% PROCESS pagefooter.html %]
-

Modified: trunk/server/HTML/EN/settings/debugging.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/debugging.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/debugging.html (original)
+++ trunk/server/HTML/EN/settings/debugging.html Fri Nov 10 19:10:24 2006
@@ -1,24 +1,4 @@
-[% FILTER null %]
-
-	[% pwd_list = BLOCK %]
-
-		<a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
-
-		 / <a href="[% webroot %][% 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="[% webroot %][% path %]">
-
-	<input type=hidden value="[% page %]" name="page">
+[% PROCESS settingsheader.html %]
 
 	<div class="settingSection">
 
@@ -53,11 +33,4 @@
 
 	</div>
 
-	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
-</form>
-
-</div>
-
-<p></p>
-
-[% PROCESS pagefooter.html %]
+[% PROCESS settingsfooter.html %]

Modified: trunk/server/HTML/EN/settings/filetypes.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/filetypes.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/filetypes.html (original)
+++ trunk/server/HTML/EN/settings/filetypes.html Fri Nov 10 19:10:24 2006
@@ -1,30 +1,4 @@
-[% FILTER null %]
-
-	[% pwd_list = BLOCK %]
-
-		<a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
-
-		 / <a href="[% webroot %][% 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="[% webroot %][% path %]">
-
-	<input type=hidden value="[% page %]" name="page">
+[% PROCESS settingsheader.html %]
 
 	<div class="settingSection">
 
@@ -71,9 +45,4 @@
 
 	</div>
 
-	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
-</form>
-
-<p></p>
-
-[% PROCESS pagefooter.html %]
+[% PROCESS settingsfooter.html %]

Modified: trunk/server/HTML/EN/settings/formatting.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/formatting.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/formatting.html (original)
+++ trunk/server/HTML/EN/settings/formatting.html Fri Nov 10 19:10:24 2006
@@ -1,30 +1,4 @@
-[% FILTER null %]
-
-	[% pwd_list = BLOCK %]
-
-		<a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
-
-		 / <a href="[% webroot %][% 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="[% webroot %][% path %]">
-
-	<input type=hidden value="[% page %]" name="page">
+[% PROCESS settingsheader.html %]
 
 	<div class="settingSection">
 
@@ -112,10 +86,5 @@
 	
 	</div>
 
-	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
-</form>
+[% PROCESS settingsfooter.html %]
 
-<p></p>
-
-[% PROCESS pagefooter.html %]
-

Modified: trunk/server/HTML/EN/settings/interface.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/interface.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/interface.html (original)
+++ trunk/server/HTML/EN/settings/interface.html Fri Nov 10 19:10:24 2006
@@ -1,30 +1,4 @@
-[% FILTER null %]
-
-	[% pwd_list = BLOCK %]
-
-		<a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
-
-		 / <a href="[% webroot %][% 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="[% webroot %][% path %]">
-
-	<input type=hidden value="[% page %]" name="page">
+[% PROCESS settingsheader.html %]
 
 	<div class="settingSection">
 
@@ -68,10 +42,5 @@
 
 	</div>
 
-	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
-</form>
+[% PROCESS settingsfooter.html %]
 
-<p></p>
-
-[% PROCESS pagefooter.html %]
-

Modified: trunk/server/HTML/EN/settings/networking.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/networking.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/networking.html (original)
+++ trunk/server/HTML/EN/settings/networking.html Fri Nov 10 19:10:24 2006
@@ -1,30 +1,4 @@
-[% FILTER null %]
-
-	[% pwd_list = BLOCK %]
-
-		<a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
-
-		 / <a href="[% webroot %][% 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="[% webroot %][% path %]">
-
-	<input type=hidden value="[% page %]" name="page">
+[% PROCESS settingsheader %]
 
 	<div class="settingSection">
 
@@ -55,8 +29,9 @@
 
 		<select class="stdedit" name="maxWMArate" id="maxWMArate">
 
-		[% FOREACH option = wmaoptions.nsort %]
-			<option [% IF maxWMArate == option %]selected [% END %]value="[% option %]">[% wmaoptions.$option %]</option>
+		[% 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>
@@ -64,6 +39,7 @@
 		[% 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 %]
@@ -93,10 +69,5 @@
 		
 	</div>
 
-	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
-</form>
+[% PROCESS settingsfooter.html %]
 
-<p></p>
-
-[% PROCESS pagefooter.html %]
-

Modified: trunk/server/HTML/EN/settings/performance.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/performance.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/performance.html (original)
+++ trunk/server/HTML/EN/settings/performance.html Fri Nov 10 19:10:24 2006
@@ -1,30 +1,4 @@
-[% FILTER null %]
-
-	[% pwd_list = BLOCK %]
-
-		<a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
-
-		 / <a href="[% webroot %][% 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="[% webroot %][% path %]">
-
-	<input type=hidden value="[% page %]" name="page">
+[% PROCESS settingsheader.html %]
 
 	<div class="settingSection">
 
@@ -98,10 +72,5 @@
 
 	</div>
 
-	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
-</form>
+[% PROCESS settingsfooter.html %]
 
-<p></p>
-
-[% PROCESS pagefooter.html %]
-

Modified: trunk/server/HTML/EN/settings/player/alarm.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/alarm.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/player/alarm.html (original)
+++ trunk/server/HTML/EN/settings/player/alarm.html Fri Nov 10 19:10:24 2006
@@ -1,105 +1,10 @@
-[% 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">
+[% PROCESS settingsheader.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_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 %]
-
+[% PROCESS settingsfooter.html %]

Modified: trunk/server/HTML/EN/settings/player/audio.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/audio.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/player/audio.html (original)
+++ trunk/server/HTML/EN/settings/player/audio.html Fri Nov 10 19:10:24 2006
@@ -1,105 +1,10 @@
-[% 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">
+[% PROCESS settingsheader.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_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 %]
-
+[% PROCESS settingsfooter.html %]

Modified: trunk/server/HTML/EN/settings/player/basic.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/basic.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/player/basic.html (original)
+++ trunk/server/HTML/EN/settings/player/basic.html Fri Nov 10 19:10:24 2006
@@ -1,105 +1,169 @@
-[% 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">
+[% PROCESS settingsheader.html %]
 
 	<div class="settingSection">
 
-		<div class="prefHead">[% "SETUP_DISABLESTATISTICS" | string | upper %]</div>
-		<div class="prefDesc">[% "SETUP_DISABLESTATISTICS_DESC" | string %]</div>
+		<div class="prefHead">[% "SETUP_PLAYERNAME" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_PLAYERNAME_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>
+		<input type="text" class="stdedit" name="playername" id="playername" value="[% prefs.playername %]" size="40">
 
 	</div>
 
-	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
-</form>
+	<div class="settingSection">
+	
+		<div class="groupHead">[% "SETUP_TITLEFORMAT" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_GROUP_TITLEFORMATS_DESC" | string %]</div>
+		
+		<table width="100%">
+		<tr><th>[% 'SETUP_CURRENT' | string | upper %]</th><th>&nbsp</th><th>[% 'DISPLAY_SETTINGS' | string | upper %]</th><th>&nbsp</th></tr>
+		[% FOREACH format = prefs.titleFormat %]
+			<tr><td><input type=radio [% IF prefs.titleFormatCurr == loop.index %]checked [% END %]value="[% loop.index %]" name="titleFormatCurr"></td><td>
+			</td><td>
+			
+			<select class="stdedit" name="titleFormat[% loop.index %]" id="titleFormat[% loop.index %]">
+			[% num = loop.index %][% last = loop.max %]
+			[% FOREACH option = titleFormatOptions.keys %]
+	
+				<option [% IF prefs.titleFormat.$num == option %]selected [% ELSIF num == last && option == '-1' %]selected [% END %]value="[% option %]">[% titleFormatOptions.$option %]</option>
+	
+			[%- END -%]
+			
+			</select>
+		
+			</td><td></td></tr>
+		[% END %]
+		</table>
+	
+	</div>
+	
+	<div class="settingSection">
+	
+		<div class="groupHead">[% "SETUP_PLAYINGDISPLAYMODE" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_PLAYINGDISPLAYMODE_DESC" | string %]</div>
+		
+		<table width="100%">
+		<tr><th>[% 'SETUP_CURRENT' | string | upper %]</th><th></th><th>[% 'SETUP_FORMATS' | string | upper %]</th><th></th></tr>
+		[% FOREACH format = prefs.playingDisplayModes %]
+			<tr><td><input type=radio [% IF prefs.playingDisplayMode == loop.index %]checked [% END %]value="[% loop.index %]" name="playingDisplayMode"></td><td>
+			</td><td>
+			
+			<select class="stdedit" name="playingDisplayModes[% loop.index %]" id="playingDisplayModes[% loop.index %]">
+			[% num = loop.index %][% last = loop.max %]
+			
+			[% FOREACH option = playingDisplayOptions.keys %]
+	
+				<option [% IF prefs.playingDisplayModes.$num == option %]selected [% ELSIF num == last && option == '-1' %]selected [% END %]value="[% option %]">[% playingDisplayOptions.$option %]</option>
+	
+			[%- END -%]
+			
+			</select>
+		
+			</td><td></td></tr>
+		[% END %]
+		</table>
+	
+	</div>
 
-<p></p>
+	<div class="settingSection">
+	
+		<div class="groupHead">[% "SETUP_VISUALIZERMODE" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_VISUALIZERMODE_DESC" | string %]</div>
+		
+		<table width="100%">
+		<tr><th>[% 'SETUP_CURRENT' | string | upper %]</th><th>[% 'DISPLAY_SETTINGS' | string | upper %]</th><th></th></tr>
+		[% FOREACH format = prefs.visualModes %]
+			<tr><td><input type=radio [% IF prefs.visualMode == loop.index %]checked [% END %]value="[% loop.index %]" name="visualMode"></td><td>
+			
+			<select class="stdedit" name="visualModes[% loop.index %]" id="visualModes[% loop.index %]">
+			[% num = loop.index %][% last = loop.max %]
+			
+			[% FOREACH option = visualModeOptions.keys %]
+	
+				<option [% IF prefs.visualModes.$num == option %]selected [% ELSIF num == last && option == '-1' %]selected [% END %]value="[% option %]">[% visualModeOptions.$option %]</option>
+	
+			[%- END -%]
+			
+			</select>
+		
+			</td><td></td></tr>
+		[% END %]
+		</table>
+	
+	</div>
 
-[% PROCESS pagefooter.html %]
+	<div class="settingSection">
+	
+		<div class="groupHead">[% "SCREENSAVERS" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_SCREENSAVER_DESC" | string %]</div>
 
+		<label for="screensaver" class="stdlabel">[% "SETUP_SCREENSAVER_CHOOSE" | string %]</label>
+		<select class="stdedit" name="screensaver" id="screensaver">
+
+		[% FOREACH option = screensavers.keys %]
+
+			<option [% IF prefs.screensaver == option %]selected [% END %]value="[% option %]">[% screensavers.$option | string %]</option>
+
+		[%- END -%]
+		
+		</select>
+		
+		<br>
+		<label for="idlesaver" class="stdlabel">[% "SETUP_IDLESAVER_CHOOSE" | string %]</label>
+		<select class="stdedit" name="idlesaver" id="idlesaver">
+
+		[% FOREACH option = screensavers.keys %]
+
+			<option [% IF prefs.idlesaver == option %]selected [% END %]value="[% option %]">[% screensavers.$option | string %]</option>
+
+		[%- END -%]
+		
+		</select>
+		
+		<br>
+		<label for="offsaver" class="stdlabel">[% "SETUP_OFFSAVER_CHOOSE" | string %]</label>
+		<select class="stdedit" name="offsaver" id="offsaver">
+
+		[% FOREACH option = screensavers.keys %]
+
+			<option [% IF prefs.offsaver == option %]selected [% END %]value="[% option %]">[% screensavers.$option | string %]</option>
+
+		[%- END -%]
+		
+		</select>
+		
+		<br>
+		<label for="screensavertimeout" class="stdlabel">[% "SETUP_SCREENSAVERTIMEOUT_CHOOSE" | string %]</label>
+		<input type="text" class="stdedit" name="screensavertimeout" id="screensavertimeout" value="[% prefs.screensavertimeout %]" size="15">
+
+	</div>
+
+	<div class="settingSection">
+	
+		<div class="prefHead">[% "FORGET_PLAYER" | string | upper %]</div>
+		<div class="prefDesc">[% "FORGET_PLAYER_DESC" | string %]</div>
+	
+		<p>
+			<a href="[% webroot %]index.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerid | uri %]" target="_top">[% "FORGET_PLAYER_LINK" | string %]</a>
+		</p>
+	
+		<div class="prefHead">[% "INFORMATION_MENU_PLAYER" | string | upper %]</div>
+	
+		[% IF ipaddress %]
+			<p>[% "PLAYER_IP_ADDRESS" | string %] [% ipaddress %]</p>
+		[% END %]
+	
+		[% IF macaddress %]
+			<p>[% "PLAYER_MAC_ADDRESS" | string %] [% macaddress %]</p>
+		[% END %] 
+	
+		[% IF signalstrength %]
+			<p>[% "INFORMATION_PLAYER_SIGNAL_STRENGTH" | string %][% "COLON" | string %] [% signalstrength %]%</p>
+		[% END %] 
+	
+		[% IF voltage %]
+			<p>[% "INFORMATION_PLAYER_VOLTAGE" | string %][% "COLON" | string %] [% voltage %]VAC</p>
+		[% END %] 
+	
+	</div>
+
+[% 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=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/player/display.html (original)
+++ trunk/server/HTML/EN/settings/player/display.html Fri Nov 10 19:10:24 2006
@@ -1,105 +1,264 @@
-[% 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>
+[% PROCESS settingsheader.html %]
+
+	[% IF prefs.exists('powerOnBrightness') %]
+	<div class="settingSection">
+	
+		[% BLOCK brightnessoptions %]
+		[% FOREACH option = [ 0 .. maxBrightness ] %]
+
+			<option [% IF current == option %]selected [% END %]value="[%option %]">
+				[% option %] [% IF loop.first %] ([% "BRIGHTNESS_DARK" | string %])
+				[% ELSIF loop.last %] ([% "BRIGHTNESS_BRIGHTEST" | string %])[% END %]
+			</option>
+
+		[%- END -%]
+		[% END %]
+
+	
+		<div class="groupHead">[% 'SETUP_GROUP_BRIGHTNESS' | string | upper %]</div>
+		<div class="groupDesc">[% 'SETUP_GROUP_BRIGHTNESS_DESC' | string %]</div>
+
+		<table><tr>
+		<td><label for="powerOnBrightness" class="stdlabel">[% "SETUP_POWERONBRIGHTNESS_CHOOSE" | string %]</label></td>
+		<td></td>
+		<td><select class="stdedit" name="powerOnBrightness" id="powerOnBrightness">
+
+		[% PROCESS brightnessoptions current = prefs.powerOnBrightness %]
+		
+		</select></td>
+		</tr>
+
+		<tr>
+		<td><label for="powerOffBrightness" class="stdlabel">[% "SETUP_POWEROFFBRIGHTNESS_CHOOSE" | string %]</label></td>
+		<td></td>
+		<td><select class="stdedit" name="powerOffBrightness" id="powerOffBrightness">
+
+		[% PROCESS brightnessoptions current = prefs.powerOffBrightness %]
+		
+		</select></td>
+		</tr>
+
+		<tr>
+		<td><label for="idleBrightness" class="stdlabel">[% "SETUP_IDLEBRIGHTNESS_CHOOSE" | string %]</label></td>
+		<td></td>
+		<td><select class="stdedit" name="idleBrightness" id="idleBrightness">
+
+		[% PROCESS brightnessoptions current = prefs.idleBrightness %]
+		
+		</select></td>
+		</tr>
+		
+		<tr>
+		<td><label for="offsaver" class="stdlabel">[% "SETUP_AUTOBRIGHTNESS_CHOOSE" | string %]</label></td>
+		<td></td>
+		<td><select class="stdedit" name="autobrightness" id="autobrightness">
+
+		[% FOREACH option = {
+			'1'   => 'SETUP_AUTOBRIGHTNESS_ON',
+			'0'   => 'SETUP_AUTOBRIGHTNESS_OFF',
+		} %]
+			<option [% IF prefs.autobrightness == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select></td>
+		</tr>
+		</table>
+
+	</div>
+	[% END %]
+
+	[% IF prefs.exists('activeFont') %]
+	<div class="settingSection">
+	
+		<div class="groupHead">[% "SETUP_ACTIVEFONT" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_ACTIVEFONT_DESC" | string %]</div>
+		
+		<table>
+		[% FOREACH format = prefs.activeFont %]
+			<tr><td><input type=radio [% IF prefs.activeFont_curr == loop.index %]checked [% END %]value="[% loop.index %]" name="activeFont_curr"></td><td>
+			</td><td>
+			
+			<select class="stdedit" name="activeFont[% loop.index %]" id="activeFont[% loop.index %]">
+			[% num = loop.index %][% last = loop.max %]
+			[% FOREACH option = fontOptions.keys %]
+	
+				<option [% IF prefs.activeFont.$num == fontOptions.$option %]selected [% ELSIF num == last && option == '-1' %]selected [% END %]value="[% fontOptions.$option %]">[% fontOptions.$option %]</option>
+	
+			[%- END -%]
+			
+			</select>
+		
+			</td><td></td></tr>
+		[% END %]
+		</table>
+	
+	</div>
+	
+	<div class="settingSection">
+	
+		<div class="groupHead">[% "SETUP_IDLEFONT" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_IDLEFONT_DESC" | string %]</div>
+		
+		<table>
+		[% FOREACH format = prefs.idleFont %]
+			<tr><td><input type=radio [% IF prefs.idleFont_curr == loop.index %]checked [% END %]value="[% loop.index %]" name="idleFont_curr"></td><td>
+			</td><td>
+			
+			<select class="stdedit" name="idleFont[% loop.index %]" id="idleFont[% loop.index %]">
+			[% num = loop.index %][% last = loop.max %]
+			
+			[% FOREACH option = fontOptions.keys %]
+	
+				<option [% IF prefs.idleFont.$num == fontOptions.$option %]selected [% ELSIF num == last && option == '-1' %]selected [% END %]value="[% fontOptions.$option %]">[% fontOptions.$option %]</option>
+	
+			[%- END -%]
+			
+			</select>
+		
+			</td><td></td></tr>
+		[% END %]
+		</table>
+	
+	</div>
+	[% END %]
+	
+	[% IF prefs.exists('doublesize') %]
+	<div class="settingSection">
+
+		<div class="groupHead">[% "SETUP_DOUBLESIZE" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_DOUBLESIZE_DESC" | string %]</div>
+
+		<br>
+		<table><tr>
+		<td><label for="doublesize" class="stdlabel">[% "SETUP_DOUBLESIZE" | string %][% "COLON" | string %]</label></td>
+		<td></td>
+		<td><select class="stdedit" name="doublesize" id="doublesize">
+
+		[% FOREACH option = {
+			'1'   => 'LARGE',
+			'0'   => 'SMALL',
+		} %]
+			<option [% IF prefs.doublesize == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select></td>
+		</tr>
+
+		<tr>
+		<td><label for="offDisplaySize" class="stdlabel">[% "SETUP_OFFDISPLAYSIZE" | string %][% "COLON" | string %]</label></td>
+		<td>&nbsp;</td>
+		<td><select class="stdedit" name="offDisplaySize" id="offDisplaySize">
+
+		[% FOREACH option = {
+			'1'   => 'LARGE',
+			'0'   => 'SMALL',
+		} %]
+			<option [% IF prefs.offDisplaySize == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
+		
+		</select></td>
+		</tr></table>
+
+	</div>
+
+	<div class="settingSection">
+
+		<div class="groupHead">[% "SETUP_LARGETEXTFONT" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_LARGETEXTFONT_DESC" | string %]</div>
+
+		<br>
+		<label for="largeTextFont" class="stdlabel">[% "SETUP_LARGETEXTFONT_CHOOSE" | string %]</label>
+		<select class="stdedit" name="largeTextFont" id="largeTextFont">
+
+		[% FOREACH option = {
+			'1'   => 'SETUP_LARGETEXTFONT_1',
+			'0'   => 'SETUP_LARGETEXTFONT_0',
+		} %]
+			<option [% IF prefs.largeTextFont == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+		[%- END -%]
 		
 		</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>
+	</div>
+	[% END %]
+
+	[% IF prefs.exists('scrollMode') %]
+	<div class="settingSection">
+
+		<div class="groupHead">[% "SETUP_SCROLLMODE" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_SCROLLMODE_DESC" | string %]</div>
+
+		<select class="stdedit" name="doublesize" id="scrollMode">
+
+		[% 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>
+		[%- END -%]
 		
 		</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 %]
-
+	</div>
+
+	<div class="settingSection">
+
+		<div class="groupHead">[% "SETUP_SCROLLRATE" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_SCROLLRATE_DESC" | string %]</div>
+
+		<table><tr>
+		<td><label for="scrollRate" class="stdlabel">[% "SINGLE-LINE" | string %] [% "SETUP_SCROLLRATE" | string %][% "COLON" | string %]</label></td>
+		<td></td>
+		<td><input type="text" class="stdedit" name="scrollRate" id="scrollRate" value="[% prefs.scrollRate %]" size="15"></td>
+		</tr>
+
+		<tr>
+		<td><label for="scrollRateDouble" class="stdlabel">[% "DOUBLE-LINE" | string %] [% "SETUP_SCROLLRATE" | string %][% "COLON" | string %]</label></td>
+		<td></td>
+		<td><input type="text" class="stdedit" name="scrollRateDouble" id="scrollRateDouble" value="[% prefs.scrollRateDouble %]" size="15"></td>
+		</tr>
+		</table>
+
+	</div>
+
+	<div class="settingSection">
+
+		<div class="groupHead">[% "SETUP_SCROLLPAUSE" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_SCROLLPAUSE_DESC" | string %]</div>
+
+		<table><tr>
+		<td><label for="scrollPause" class="stdlabel">[% "SINGLE-LINE" | string %] [% "SETUP_SCROLLPAUSE" | string %][% "COLON" | string %]</label></td>
+		<td></td>
+		<td><input type="text" class="stdedit" name="scrollPause" id="scrollPause" value="[% prefs.scrollPause %]" size="15"></td>
+		</tr>
+		
+		<tr>
+		<td><label for="scrollPauseDouble" class="stdlabel">[% "DOUBLE-LINE" | string %] [% "SETUP_SCROLLPAUSE" | string %][% "COLON" | string %]</label></td>
+		<td></td>
+		<td><input type="text" class="stdedit" name="scrollPauseDouble" id="scrollPauseDouble" value="[% prefs.scrollPauseDouble %]" size="15"></td>
+		</tr>
+		</table>
+
+	</div>
+	[% END %]
+
+	[% IF prefs.exists('scrollPixels') %]
+	<div class="settingSection">
+
+		<div class="groupHead">[% "SETUP_SCROLLPIXELS" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_SCROLLPIXELS_DESC" | string %]</div>
+
+		<label for="scrollPixels" class="stdlabel">[% "SINGLE-LINE" | string %] [% "SETUP_SCROLLPIXELS" | string %][% "COLON" | string %]</label>
+		<input type="text" class="stdedit" name="scrollPixels" id="scrollPixels" value="[% prefs.scrollPixels %]" size="15">
+
+		<br>
+		<label for="scrollPixelsDouble" class="stdlabel">[% "DOUBLE-LINE" | string %] [% "SETUP_SCROLLPIXELS" | string %][% "COLON" | string %]</label>
+		<input type="text" class="stdedit" name="scrollPixelsDouble" id="scrollPixelsDouble" value="[% prefs.scrollPixelsDouble %]" size="15">
+
+	</div>
+	[% END %]
+
+[% PROCESS settingsfooter.html %]

Modified: trunk/server/HTML/EN/settings/player/menu.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/menu.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/player/menu.html (original)
+++ trunk/server/HTML/EN/settings/player/menu.html Fri Nov 10 19:10:24 2006
@@ -1,105 +1,10 @@
-[% 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">
+[% PROCESS settingsheader.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_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 %]
-
+[% PROCESS settingsfooter.html %]

Modified: trunk/server/HTML/EN/settings/player/remote.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/remote.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/player/remote.html (original)
+++ trunk/server/HTML/EN/settings/player/remote.html Fri Nov 10 19:10:24 2006
@@ -1,105 +1,10 @@
-[% 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">
+[% PROCESS settingsheader.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_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 %]
-
+[% PROCESS settingsfooter.html %]

Modified: trunk/server/HTML/EN/settings/security.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/security.html?rev=10657&r1=10656&r2=10657&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/security.html (original)
+++ trunk/server/HTML/EN/settings/security.html Fri Nov 10 19:10:24 2006
@@ -1,30 +1,4 @@
-[% FILTER null %]
-
-	[% pwd_list = BLOCK %]
-
-		<a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
-
-		 / <a href="[% webroot %][% 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="[% webroot %][% path %]">
-
-	<input type=hidden value="[% page %]" name="page">
+[% PROCESS settingsheader.html %]
 
 	<div class="settingSection">
 
@@ -78,10 +52,5 @@
 	
 	</div>
 
-	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
-</form>
+[% PROCESS settingsfooter.html %]
 
-<p></p>
-
-[% PROCESS pagefooter.html %]
-

Added: trunk/server/HTML/EN/settingsfooter.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settingsfooter.html?rev=10657&view=auto
==============================================================================
--- trunk/server/HTML/EN/settingsfooter.html (added)
+++ trunk/server/HTML/EN/settingsfooter.html Fri Nov 10 19:10:24 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/settingsheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settingsheader.html?rev=10657&view=auto
==============================================================================
--- trunk/server/HTML/EN/settingsheader.html (added)
+++ trunk/server/HTML/EN/settingsheader.html Fri Nov 10 19:10:24 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 -->

More information about the checkins mailing list