[Slim-Checkins] r10660 - in /trunk/server/HTML/EN/settings/player:
alarm.html basic.html menu.html remote.html
kdf at svn.slimdevices.com
kdf at svn.slimdevices.com
Sat Nov 11 15:37:33 PST 2006
Author: kdf
Date: Sat Nov 11 15:37:32 2006
New Revision: 10660
URL: http://svn.slimdevices.com?rev=10660&view=rev
Log:
bug: 3267
Description: alarm settings page
- tables for basic setting page
- fix for header PROCESS directive
Modified:
trunk/server/HTML/EN/settings/player/alarm.html
trunk/server/HTML/EN/settings/player/basic.html
trunk/server/HTML/EN/settings/player/menu.html
trunk/server/HTML/EN/settings/player/remote.html
Modified: trunk/server/HTML/EN/settings/player/alarm.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/alarm.html?rev=10660&r1=10659&r2=10660&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/player/alarm.html (original)
+++ trunk/server/HTML/EN/settings/player/alarm.html Sat Nov 11 15:37:32 2006
@@ -1,10 +1,57 @@
-[% PROCESS settings/header.html
-
+[% PROCESS settings/header.html %]
<div class="settingSection">
+ <div class="groupHead">[% "SETUP_GROUP_ALARM" | string | upper %]</div>
+ <div class="groupDesc">[% "SETUP_GROUP_ALARM_DESC" | string %]</div>
-
+ <input type=hidden name="alarmfadeseconds" value="0" />
+ <input type=checkbox [% IF alarmfadeseconds %]checked [% END %] class="stdedit" name="alarmfadeseconds" id="alarmfadeseconds" value="1" />
+ <label for="alarmfadeseconds" class="stdlabel">[% "ALARM_FADE" | string %][% "COLON" | string %]</label>
</div>
+ [% FOREACH day = [0 ..7] %]
+ <div class="settingSection">
+
+ <div class="groupHead">[% "ALARM_DAY$day" | string | upper %]</div>
+
+ <table><tr>
+ <td><label for="alarm[% day %]" class="stdlabel">[% "SETUP_ALARM" | string %][% "COLON" | string %]</label></td>
+ <td><select class="stdedit" name="alarm[% day %]" id="alarm[% day %]">
+
+ [% FOREACH option = {
+ '1' => 'ON',
+ '0' => 'OFF',
+ } %]
+ <option [% IF prefs.alarm.$day == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
+ [%- END -%]
+
+ </select></td>
+ </tr>
+
+ <tr>
+ <td><label for="alarmtime[% day %]" class="stdlabel">[% "ALARM_SET" | string %][% "COLON" | string %]</label></td>
+ <td><input type="text" class="stdedit" name="alarmtime[% day %]" id="alarmtime$day" value="[% prefs.alarmtime.$day %]" size="15"></td>
+ </tr>
+
+ <tr>
+ <td><label for="alarmvolume[% day %]" class="stdlabel">[% "SETUP_ALARMVOLUME" | string %][% "COLON" | string %]</label></td>
+ <td><input type="text" class="stdedit" name="alarmvolume[% day %]" id="alarmvolume[% day %]" value="[% prefs.alarmvolume.$day %]" size="15"></td>
+ </tr>
+
+ <tr>
+ <td><label for="alarmplaylist[% day %]" class="stdlabel">[% "ALARM_SELECT_PLAYLIST" | string %][% "COLON" | string %]</label></td>
+ <td><select class="stdedit" name="alarmplaylist[% day %]" id="alarmplaylist[% day %]">
+
+ [% FOREACH option = playlistOptions %]
+ <option [% IF prefs.alarmplaylist.$day == option.key %]selected [% END %]value="[% option.key %]">[% option.value | getstring %]</option>
+ [%- END -%]
+
+ </select></td>
+ </tr>
+ </table>
+
+ </div>
+ [% END %]
+
[% PROCESS settings/footer.html %]
Modified: trunk/server/HTML/EN/settings/player/basic.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/basic.html?rev=10660&r1=10659&r2=10660&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/player/basic.html (original)
+++ trunk/server/HTML/EN/settings/player/basic.html Sat Nov 11 15:37:32 2006
@@ -5,7 +5,7 @@
<div class="prefHead">[% "SETUP_PLAYERNAME" | string | upper %]</div>
<div class="prefDesc">[% "SETUP_PLAYERNAME_DESC" | string %]</div>
- <input type="text" class="stdedit" name="playername" id="playername" value="[% prefs.playername %]" size="40">
+ <input type="text" class="stdedit" name="playername" id="playername" value="[% prefs.playername %]" size="20">
</div>
@@ -96,8 +96,9 @@
<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">
+ <table><tr>
+ <td><label for="screensaver" class="stdlabel">[% "SETUP_SCREENSAVER_CHOOSE" | string %]</label></td>
+ <td><select class="stdedit" name="screensaver" id="screensaver">
[% FOREACH option = screensavers.keys %]
@@ -105,11 +106,12 @@
[%- END -%]
- </select>
+ </select></td>
+ </tr>
- <br>
- <label for="idlesaver" class="stdlabel">[% "SETUP_IDLESAVER_CHOOSE" | string %]</label>
- <select class="stdedit" name="idlesaver" id="idlesaver">
+ <tr>
+ <td><label for="idlesaver" class="stdlabel">[% "SETUP_IDLESAVER_CHOOSE" | string %]</label></td>
+ <td><select class="stdedit" name="idlesaver" id="idlesaver">
[% FOREACH option = screensavers.keys %]
@@ -117,11 +119,12 @@
[%- END -%]
- </select>
-
- <br>
- <label for="offsaver" class="stdlabel">[% "SETUP_OFFSAVER_CHOOSE" | string %]</label>
- <select class="stdedit" name="offsaver" id="offsaver">
+ </select></td>
+ </tr>
+
+ <tr>
+ <td><label for="offsaver" class="stdlabel">[% "SETUP_OFFSAVER_CHOOSE" | string %]</label></td>
+ <td><select class="stdedit" name="offsaver" id="offsaver">
[% FOREACH option = screensavers.keys %]
@@ -129,11 +132,14 @@
[%- 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">
+ </select></td>
+ </tr>
+
+ <tr>
+ <td><label for="screensavertimeout" class="stdlabel">[% "SETUP_SCREENSAVERTIMEOUT_CHOOSE" | string %]</label></td>
+ <td><input type="text" class="stdedit" name="screensavertimeout" id="screensavertimeout" value="[% prefs.screensavertimeout %]" size="15"></td>
+ </tr>
+ </table>
</div>
Modified: trunk/server/HTML/EN/settings/player/menu.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/menu.html?rev=10660&r1=10659&r2=10660&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/player/menu.html (original)
+++ trunk/server/HTML/EN/settings/player/menu.html Sat Nov 11 15:37:32 2006
@@ -1,4 +1,4 @@
-[% PROCESS settings/header.html
+[% PROCESS settings/header.html %]
<div class="settingSection">
Modified: trunk/server/HTML/EN/settings/player/remote.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/player/remote.html?rev=10660&r1=10659&r2=10660&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/player/remote.html (original)
+++ trunk/server/HTML/EN/settings/player/remote.html Sat Nov 11 15:37:32 2006
@@ -1,4 +1,4 @@
-[% PROCESS settings/header.html
+[% PROCESS settings/header.html %]
<div class="settingSection">
More information about the checkins
mailing list