[Slim-Checkins] r10635 - in /trunk/server/HTML: EN/ EN/html/
EN/settings/ Fishbone/
Fishbone/html/ Handheld/ Moser/ NBMU/ Nokia770/
kdf at svn.slimdevices.com
kdf at svn.slimdevices.com
Wed Nov 8 23:24:29 PST 2006
Author: kdf
Date: Wed Nov 8 23:24:28 2006
New Revision: 10635
URL: http://svn.slimdevices.com?rev=10635&view=rev
Log:
Bug: 3267
Description:
- use webroot for all settings pages
- enable new basic settings
- rework settings_chooser to allow skins to choose pulldown or tablist by using the 'useTabList' variable in cmdwrappers
- added some styles to Nokia skin to support the new common setup pages
- make player change scripts aware of the new settings pages
- waved dead chicken vigourously to make it all work
Modified:
trunk/server/HTML/EN/home.html
trunk/server/HTML/EN/html/common.js
trunk/server/HTML/EN/setting_chooser.html
trunk/server/HTML/EN/setting_tablist.html
trunk/server/HTML/EN/settings/basic.html
trunk/server/HTML/EN/settings/behavior.html
trunk/server/HTML/EN/settings/debugging.html
trunk/server/HTML/EN/settings/filetypes.html
trunk/server/HTML/EN/settings/formatting.html
trunk/server/HTML/EN/settings/interface.html
trunk/server/HTML/EN/settings/networking.html
trunk/server/HTML/EN/settings/performance.html
trunk/server/HTML/EN/settings/security.html
trunk/server/HTML/EN/setup.html
trunk/server/HTML/Fishbone/html/scripts.js
trunk/server/HTML/Fishbone/pageheader.html
trunk/server/HTML/Handheld/cmdwrappers_Handheld
trunk/server/HTML/Handheld/pagefooter.html
trunk/server/HTML/Moser/cmdwrappers
trunk/server/HTML/Moser/home.html
trunk/server/HTML/Moser/pageheader.html
trunk/server/HTML/NBMU/home.html
trunk/server/HTML/Nokia770/cmdwrappers
trunk/server/HTML/Nokia770/home.html
trunk/server/HTML/Nokia770/pagefooter.html
trunk/server/HTML/Nokia770/pageheader.html
trunk/server/HTML/Nokia770/slimserver.css
Modified: trunk/server/HTML/EN/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/home.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/home.html (original)
+++ trunk/server/HTML/EN/home.html Wed Nov 8 23:24:28 2006
@@ -57,11 +57,11 @@
<div>[% "SETTINGS" | string | upper %]</div>
<ul>
[%- IF not noserver %]
- <li><a href="setup.html?page=BASIC_SERVER_SETTINGS&player=[% playerURI %]">[% "SERVER_SETTINGS" | string %]</a></li>
+ <li><a href="[% webroot %]settings/basic.html?player=[% playerURI %]">[% "SERVER_SETTINGS" | string %]</a></li>
[%- END %]
[%- USE Clients; players = Clients.get("name"); FOREACH client = players; %]
- <li><a href="setup.html?page=BASIC_PLAYER_SETTINGS&player=[% playerURI %]&playerid=[% client.id | uri %]">[% "PLAYER_SETTINGS" | string %][% IF client.name %] [% "FOR" | string %] [% client.name %][% END %]</a></li>
+ <li><a href="[% webroot %]setup.html?page=BASIC_PLAYER_SETTINGS&player=[% playerURI %]&playerid=[% client.id | uri %]">[% "PLAYER_SETTINGS" | string %][% IF client.name %] [% "FOR" | string %] [% client.name %][% END %]</a></li>
[%- END %]
[%- FOREACH key = additionalLinks.settings.keys %]
Modified: trunk/server/HTML/EN/html/common.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/common.js?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/common.js (original)
+++ trunk/server/HTML/EN/html/common.js Wed Nov 8 23:24:28 2006
@@ -149,8 +149,9 @@
parent.playlist.location="playlist.html?player"+newPlayer;
window.location="status_header.html?player"+newPlayer;
- if (doc.location.href.indexOf('setup') == -1 &&
- doc.location.href.indexOf('home') == -1) {
+ if (doc.location.href.indexOf('setup') == -1 &&
+ doc.location.href.indexOf('home') == -1 &&
+ doc.location.href.indexOf('settings' == -1) {
for (var j=0;j < doc.document.links.length; j++) {
var myString = new String(doc.document.links[j].href);
Modified: trunk/server/HTML/EN/setting_chooser.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/setting_chooser.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/setting_chooser.html (original)
+++ trunk/server/HTML/EN/setting_chooser.html Wed Nov 8 23:24:28 2006
@@ -1,3 +1,19 @@
+[% IF useTabList %]
+
+ [% IF playerid %][% links = additionalLinks.playersetup %][% ELSE %][% links = additionalLinks.setup %][% END %]
+ [% IF links %]
+ [% IF style == "list" %]<div id="setuptabs"><ul>[% END %]
+ [% FOREACH link = links %]
+ [% IF style == "list" %]
+ <li [% IF page == link.key %] id="currtab"[% END %]>
+ [%- ELSIF loop.index > 0%]<span class="bar">|</span>[% END %]
+ <a href="[% webroot %][% link.value %]player=[% playerURI %][% IF playerid %]&playerid=[% playerid %][% END %]">[% link.key | string %]</a>[% IF style == "list" %]</li>[% END %]
+ [% END %]
+ [% IF style == "list" %]</ul></div>[% END %]
+ [% END %]
+
+[% ELSE %]
+
[% BLOCK addSetupLinks %]
[% IF setuplinks %]
[% FOREACH link = setuplinks %]
@@ -6,24 +22,14 @@
[% END %]
[% END %]
-[% BLOCK addPluginLinks %]
- [% IF setuplinks %]
- [% FOREACH link = setuplinks %]
- <option [% IF page == link.key %]selected[% END %] value="[% link.key %]" label="PLUGIN: [% link.key | string %]">PLUGIN: [% link.key | string %]</option>
- [% END %]
- [% END %]
-[% END %]
-
<form name="setup_chooser" method="get" action="[% webroot %]setup.html" target="header">
<select NAME="browse" class="stdedit" style="width:17em;" onchange="chooseSettings(selectedIndex,options[selectedIndex].value)">
[% UNLESS setting_chooser_noHome %]<option [% IF page == "HOME" %]selected[% END %] value="HOME" label="[% "HOME" | string %]">[% "HOME" | string %]</option>[% END %]
- [% IF playerid %]<option [% IF page == "BASIC_PLAYER_SETTINGS" %]selected[% END %] value="BASIC_PLAYER_SETTINGS" label="[% "BASIC_PLAYER_SETTINGS" | string %]">[% "BASIC_PLAYER_SETTINGS" | string %]</option>
- [% ELSE %]<option [% IF page == "BASIC_SERVER_SETTINGS" %]selected[% END %] value="BASIC_SERVER_SETTINGS" label="[% "BASIC_SERVER_SETTINGS" | string %]">[% "BASIC_SERVER_SETTINGS" | string %]</option>[% END %]
+ [% IF playerid %]<option [% IF page == "BASIC_PLAYER_SETTINGS" %]selected[% END %] value="BASIC_PLAYER_SETTINGS" label="[% "BASIC_PLAYER_SETTINGS" | string %]">[% "BASIC_PLAYER_SETTINGS" | string %]</option>[% END %]
[% IF playerid %][% PROCESS addSetupLinks setuplinks=additionalLinks.playersetup %]
- [%# PROCESS addPluginLinks setuplinks=additionalLinks.playerplugin %]
[% ELSE %][% PROCESS addSetupLinks setuplinks=additionalLinks.setup %][% END %]
- [%# PROCESS addPluginLinks setuplinks=additionalLinks.plugin %]
</select>
<input type=hidden value="[% page %]" name="page">
<input type=hidden value="[% playerid | uri %]" name="playerid">
</FORM>
+[% END %]
Modified: trunk/server/HTML/EN/setting_tablist.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/setting_tablist.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/setting_tablist.html (original)
+++ trunk/server/HTML/EN/setting_tablist.html Wed Nov 8 23:24:28 2006
@@ -1,5 +1,4 @@
- [% IF additionalLinks.setup %][% links = additionalLinks.setup %][% END %]
- [% IF additionalLinks.playersetup && playerid %][% links = additionalLinks.playersetup %][% END %]
+ [% IF playerid %][% links = additionalLinks.playersetup %][% ELSE %][% links = additionalLinks.setup %][% END %]
[% IF links %]
[% IF style == "list" %]<div id="setuptabs"><ul>[% END %]
[% FOREACH link = links %]
Modified: trunk/server/HTML/EN/settings/basic.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/basic.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/basic.html (original)
+++ trunk/server/HTML/EN/settings/basic.html Wed Nov 8 23:24:28 2006
@@ -2,9 +2,9 @@
[% pwd_list = BLOCK %]
- <a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+ [% "SERVER_SETTINGS" | string %]
- / <a href="/[% path %]">[% page | string %]</a>
+ / <a href="[% webroot %][% path %]">[% page | string %]</a>
[% END %]
@@ -22,7 +22,7 @@
[% END %]
</div>
-<form method="post" action="/[% path %]">
+<form method="post" action="[% webroot %][% path %]">
<input type=hidden value="[% page %]" name="page">
Modified: trunk/server/HTML/EN/settings/behavior.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/behavior.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/behavior.html (original)
+++ trunk/server/HTML/EN/settings/behavior.html Wed Nov 8 23:24:28 2006
@@ -2,9 +2,9 @@
[% pwd_list = BLOCK %]
- <a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+ <a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
- / <a href="/[% path %]">[% page | string %]</a>
+ / <a href="[% webroot %][% path %]">[% page | string %]</a>
[% END %]
@@ -22,7 +22,7 @@
[% END %]
</div>
-<form method="post" action="/[% path %]">
+<form method="post" action="[% webroot %][% path %]">
<input type=hidden value="[% page %]" name="page">
Modified: trunk/server/HTML/EN/settings/debugging.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/debugging.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/debugging.html (original)
+++ trunk/server/HTML/EN/settings/debugging.html Wed Nov 8 23:24:28 2006
@@ -2,15 +2,9 @@
[% pwd_list = BLOCK %]
- [% IF playerid %]
+ <a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
- [% "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>
+ / <a href="[% webroot %][% path %]">[% page | string %]</a>
[% END %]
@@ -22,7 +16,7 @@
[% pagetitle = page | string; pageicon = 'settings'; noSpacer = 1; PROCESS pageheader.html %]
-<form method="post" action="/[% path %]">
+<form method="post" action="[% webroot %][% path %]">
<input type=hidden value="[% page %]" name="page">
Modified: trunk/server/HTML/EN/settings/filetypes.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/filetypes.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/filetypes.html (original)
+++ trunk/server/HTML/EN/settings/filetypes.html Wed Nov 8 23:24:28 2006
@@ -2,9 +2,9 @@
[% pwd_list = BLOCK %]
- <a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+ <a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
- / <a href="/[% path %]">[% page | string %]</a>
+ / <a href="[% webroot %][% path %]">[% page | string %]</a>
[% END %]
@@ -22,7 +22,7 @@
[% END %]
</div>
-<form method="post" action="/[% path %]">
+<form method="post" action="[% webroot %][% path %]">
<input type=hidden value="[% page %]" name="page">
Modified: trunk/server/HTML/EN/settings/formatting.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/formatting.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/formatting.html (original)
+++ trunk/server/HTML/EN/settings/formatting.html Wed Nov 8 23:24:28 2006
@@ -2,9 +2,9 @@
[% pwd_list = BLOCK %]
- <a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+ <a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
- / <a href="/[% path %]">[% page | string %]</a>
+ / <a href="[% webroot %][% path %]">[% page | string %]</a>
[% END %]
@@ -22,7 +22,7 @@
[% END %]
</div>
-<form method="post" action="/[% path %]">
+<form method="post" action="[% webroot %][% path %]">
<input type=hidden value="[% page %]" name="page">
Modified: trunk/server/HTML/EN/settings/interface.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/interface.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/interface.html (original)
+++ trunk/server/HTML/EN/settings/interface.html Wed Nov 8 23:24:28 2006
@@ -2,9 +2,9 @@
[% pwd_list = BLOCK %]
- <a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+ <a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
- / <a href="/[% path %]">[% page | string %]</a>
+ / <a href="[% webroot %][% path %]">[% page | string %]</a>
[% END %]
@@ -22,7 +22,7 @@
[% END %]
</div>
-<form method="post" action="/[% path %]">
+<form method="post" action="[% webroot %][% path %]">
<input type=hidden value="[% page %]" name="page">
@@ -33,8 +33,10 @@
<select class="stdedit" name="skin" id="skin">
- [% FOREACH option = skinoptions.keys %]
- <option [% IF skin == option %]selected [% END %]value="[% option %]">[% skinoptions.$option %]</option>
+ [% FOREACH option = skinoptions.keys %]
+
+ <option [% IF skin == option %]selected [% END %]value="[% option %]">[% skinoptions.$option %]</option>
+
[%- END -%]
</select>
Modified: trunk/server/HTML/EN/settings/networking.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/networking.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/networking.html (original)
+++ trunk/server/HTML/EN/settings/networking.html Wed Nov 8 23:24:28 2006
@@ -2,9 +2,9 @@
[% pwd_list = BLOCK %]
- <a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+ <a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
- / <a href="/[% path %]">[% page | string %]</a>
+ / <a href="[% webroot %][% path %]">[% page | string %]</a>
[% END %]
@@ -22,7 +22,7 @@
[% END %]
</div>
-<form method="post" action="/[% path %]">
+<form method="post" action="[% webroot %][% path %]">
<input type=hidden value="[% page %]" name="page">
Modified: trunk/server/HTML/EN/settings/performance.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/performance.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/performance.html (original)
+++ trunk/server/HTML/EN/settings/performance.html Wed Nov 8 23:24:28 2006
@@ -2,9 +2,9 @@
[% pwd_list = BLOCK %]
- <a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+ <a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
- / <a href="/[% path %]">[% page | string %]</a>
+ / <a href="[% webroot %][% path %]">[% page | string %]</a>
[% END %]
@@ -22,7 +22,7 @@
[% END %]
</div>
-<form method="post" action="/[% path %]">
+<form method="post" action="[% webroot %][% path %]">
<input type=hidden value="[% page %]" name="page">
Modified: trunk/server/HTML/EN/settings/security.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/security.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/security.html (original)
+++ trunk/server/HTML/EN/settings/security.html Wed Nov 8 23:24:28 2006
@@ -2,9 +2,9 @@
[% pwd_list = BLOCK %]
- <a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+ <a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
- / <a href="/[% path %]">[% page | string %]</a>
+ / <a href="[% webroot %][% path %]">[% page | string %]</a>
[% END %]
@@ -22,7 +22,7 @@
[% END %]
</div>
-<form method="post" action="/[% path %]">
+<form method="post" action="[% webroot %][% path %]">
<input type=hidden value="[% page %]" name="page">
Modified: trunk/server/HTML/EN/setup.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/setup.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/EN/setup.html (original)
+++ trunk/server/HTML/EN/setup.html Wed Nov 8 23:24:28 2006
@@ -8,7 +8,7 @@
[% ELSE %]
- <a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+ <a href="[% webroot %]settings/basic.html">[% "SERVER_SETTINGS" | string %]</a>
[%END %] / <a href="setup.html?page=[% page %]">[% page | string %]</a>
Modified: trunk/server/HTML/Fishbone/html/scripts.js
URL: http://svn.slimdevices.com/trunk/server/HTML/Fishbone/html/scripts.js?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/Fishbone/html/scripts.js (original)
+++ trunk/server/HTML/Fishbone/html/scripts.js Wed Nov 8 23:24:28 2006
@@ -32,7 +32,8 @@
var newpage = '';
var rExp= new RegExp("&page=(.*?)$");
- if (parent.browser.location.href.indexOf('setup') == -1) {
+ if (parent.browser.location.href.indexOf('setup') == -1 &&
+ parent.browser.location.href.indexOf('settings') == -1) {
newHref(parent.browser.document,newPlayer);
newHref(parent.header.document,newPlayer);
newValue(parent.browser.document,unescape(player));
Modified: trunk/server/HTML/Fishbone/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Fishbone/pageheader.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/Fishbone/pageheader.html (original)
+++ trunk/server/HTML/Fishbone/pageheader.html Wed Nov 8 23:24:28 2006
@@ -119,7 +119,7 @@
<a id="homelink" onload="style.fontWeight='bold';" href="" target="browser" onclick="selectLink(this,'[% page %]');" onMouseOver="homelink();setLink(this);" onMouseOut="document.getElementById('homelink').innerHTML = '[% "HOME" | string %]';">[% "HOME" | string %]</a>
/
[% IF not nosetup && not noserver %]
- <a href="[% webroot %]setup.html?page=BASIC_SERVER_SETTINGS&player=[% playerURI %][% IF nofolder %]&nofolder=1[% END %]" target="browser" onclick="selectLink(this,1)">[% "SERVER_SETTINGS" | string %]</a>
+ <a href="[% webroot %]settings/basic.html?player=[% playerURI %][% IF nofolder %]&nofolder=1[% END %]" target="browser" onclick="selectLink(this,1)">[% "SERVER_SETTINGS" | string %]</a>
/
[% END %]
<a href="[% webroot %]home.html?page=help&player=[% playerURI %][% IF nofolder %]&nofolder=1[% END %]" target="browser" onclick="selectLink(this,1)">[% "HELP" | string %]</a></nobr>
Modified: trunk/server/HTML/Handheld/cmdwrappers_Handheld
URL: http://svn.slimdevices.com/trunk/server/HTML/Handheld/cmdwrappers_Handheld?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/Handheld/cmdwrappers_Handheld (original)
+++ trunk/server/HTML/Handheld/cmdwrappers_Handheld Wed Nov 8 23:24:28 2006
@@ -2,6 +2,7 @@
[% controlGraphics = 1 %]
[% maxInputSize = 20 %]
+[% useTabList = 1 %]
[% statusroot = 'status.html' %]
[%-
Modified: trunk/server/HTML/Handheld/pagefooter.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Handheld/pagefooter.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/Handheld/pagefooter.html (original)
+++ trunk/server/HTML/Handheld/pagefooter.html Wed Nov 8 23:24:28 2006
@@ -11,7 +11,7 @@
[% UNLESS nosetup %]
[% "SETTINGS" | string %]
[% UNLESS noserver %]
- <a href="[% webroot %]setup.html?player=[% playerURI %]&page=BASIC_SERVER_SETTINGS">[% "SERVER" | string %]</a> /
+ <a href="[% webroot %]settings/basic.html">[% "SERVER" | string %]</a> /
[% END %]
<a href="[% webroot %]setup.html?player=[% playerURI %]&playerid=[% playerURI %]&page=BASIC_PLAYER_SETTINGS">[% "PLAYER" | string %]</a> --
[% END %]<a href="[% webroot %]hitlist.html?player=[% playerURI %]">[% "STATISTICS" | string %]</a> --
Modified: trunk/server/HTML/Moser/cmdwrappers
URL: http://svn.slimdevices.com/trunk/server/HTML/Moser/cmdwrappers?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/Moser/cmdwrappers (original)
+++ trunk/server/HTML/Moser/cmdwrappers Wed Nov 8 23:24:28 2006
@@ -1,5 +1,6 @@
[%- FILTER null %]
[% statusroot = 'status.html' %]
+[% useTabList = 1 %]
[% BLOCK cmdlink -%]
<li><a [% content %] [% UNLESS noTarget %]target="status"[% END %] title="[% cmdtitle | string%]">[% cmdshown %]</a></li>
Modified: trunk/server/HTML/Moser/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Moser/home.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/Moser/home.html (original)
+++ trunk/server/HTML/Moser/home.html Wed Nov 8 23:24:28 2006
@@ -32,7 +32,7 @@
[%- UNLESS nosetup %]
<h4>[% "SETTINGS" | string %]</h4>
<ul>
- <li><a href="setup.html?page=BASIC_SERVER_SETTINGS&player=[% playerURI %]">[% "SERVER_SETTINGS" | string %]</a></li>
+ <li><a href="settings/basic.html?player=[% playerURI %]">[% "SERVER_SETTINGS" | string %]</a></li>
[%- FOREACH client = players %]
<li><a href="setup.html?page=BASIC_PLAYER_SETTINGS&player=[% playerURI %]&playerid=[% client.id | uri %]">
[%- "PLAYER_SETTINGS" | string %][% IF client.name %] [% "FOR" | string %] [% client.name %][% END %]</a></li>
Modified: trunk/server/HTML/Moser/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Moser/pageheader.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/Moser/pageheader.html (original)
+++ trunk/server/HTML/Moser/pageheader.html Wed Nov 8 23:24:28 2006
@@ -8,5 +8,6 @@
[% IF pagetitle %]<h3>[% pagetitle %]</h3>[% END %]
[%- SET pwd_list = pageHeaderMenu IF pageHeaderMenu and not pwd_list %]
[%- PROCESS crumblist IF pwd_list %]
+ [% pageHeaderInfo %]
[% PROCESS countblock IF song_count %]
[% PROCESS scanwarning IF warn %]
Modified: trunk/server/HTML/NBMU/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/NBMU/home.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/NBMU/home.html (original)
+++ trunk/server/HTML/NBMU/home.html Wed Nov 8 23:24:28 2006
@@ -62,7 +62,7 @@
<p>[% IF not nosetup %] </p>
<h4><font color="#999999">[% "SETTINGS" | string %]</font></h4>
<ul>
- <li> <a href="setup.html?page=BASIC_SERVER_SETTINGS&player=[% playerURI %]">[% "SERVER_SETTINGS" | string %]</a>
+ <li> <a href="settings/basic.html?player=[% playerURI %]">[% "SERVER_SETTINGS" | string %]</a>
[% player_list %] </li>
[% IF additionalLinks.settings %]
[% FOREACH key = additionalLinks.settings.keys %]
Modified: trunk/server/HTML/Nokia770/cmdwrappers
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/cmdwrappers?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/cmdwrappers (original)
+++ trunk/server/HTML/Nokia770/cmdwrappers Wed Nov 8 23:24:28 2006
@@ -2,6 +2,7 @@
[% statusroot = 'status.html' %]
[% noHomeLink = 1 %]
[% controlGraphics = 1 %]
+[% useTabList = 1 %]
[% BLOCK cmdlink %]
<td class="[% isCurrent ? "listing2" : "listing" %]" align="center">
Modified: trunk/server/HTML/Nokia770/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/home.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/home.html (original)
+++ trunk/server/HTML/Nokia770/home.html Wed Nov 8 23:24:28 2006
@@ -133,7 +133,7 @@
<div>[% "SETTINGS" | string | upper %]</div>
<ul>
[%- IF not noserver %]
- <li><a href="setup.html?page=BASIC_SERVER_SETTINGS&player=[% playerURI %]">[% "SERVER_SETTINGS" | string %]</a></li>
+ <li><a href="settings/basic.html">[% "SERVER_SETTINGS" | string %]</a></li>
[%- END %]
[%- USE Clients; players = Clients.get("name"); FOREACH client = players; %]
@@ -187,7 +187,7 @@
<tr>
<td align="right">
<a href="[% webroot %]html/about.html" class = 'statusbartext'>[% "ABOUT_SHORT" | string %]</a> |
- <a href="[% webroot %]setup.html?player=[% playerURI %]&page=BASIC_SERVER_SETTINGS" class = "statusbartext">[% "SERVER_SETTINGS" | string %]</a> |
+ <a href="[% webroot %]settings/basic.html" class = "statusbartext">[% "SERVER_SETTINGS" | string %]</a> |
<a class = 'statusbartext' href="[% webroot %]setup.html?page=BASIC_PLAYER_SETTINGS&player=[% playerURI %]&playerid=[% playerURI %]">[% "PLAYER_SETTINGS" | string %]</a>
</td>
<td width="4"></td>
Modified: trunk/server/HTML/Nokia770/pagefooter.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/pagefooter.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/pagefooter.html (original)
+++ trunk/server/HTML/Nokia770/pagefooter.html Wed Nov 8 23:24:28 2006
@@ -11,7 +11,7 @@
</td>
<td align="right">
<a href="[% webroot %]html/about.html" class = 'statusbartext'>[% "ABOUT_SHORT" | string %]</a> |
- <a href="[% webroot %]setup.html?player=[% playerURI %]&page=BASIC_SERVER_SETTINGS" class = "statusbartext">[% "SERVER_SETTINGS" | string %]</a> |
+ <a href="[% webroot %]settings/basic.html" class = "statusbartext">[% "SERVER_SETTINGS" | string %]</a> |
<a class = 'statusbartext' href="[% webroot %]setup.html?page=BASIC_PLAYER_SETTINGS&player=[% playerURI %]&playerid=[% playerURI %]">[% "PLAYER_SETTINGS" | string %]</a>
[% IF isplayer %]
|
Modified: trunk/server/HTML/Nokia770/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/pageheader.html?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/pageheader.html (original)
+++ trunk/server/HTML/Nokia770/pageheader.html Wed Nov 8 23:24:28 2006
@@ -66,3 +66,4 @@
</div>
<!-- /Element pageheader.html -->
[% PROCESS menu.html thispage = thispage %]
+[% pageHeaderInfo %]
Modified: trunk/server/HTML/Nokia770/slimserver.css
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/slimserver.css?rev=10635&r1=10634&r2=10635&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/slimserver.css (original)
+++ trunk/server/HTML/Nokia770/slimserver.css Wed Nov 8 23:24:28 2006
@@ -457,3 +457,29 @@
background: #666666;
color: white;
}
+
+div.settingSection .groupHead, .settingSection .prefHead {
+ /* home menu list header */
+ background-color: #c5c5c5;
+ height: 13px;
+ padding: 4px 3px 4px;
+ font-size: 16px;
+ font-weight: bold;
+}
+
+div.prefHead {
+ height: 13px;
+ padding: 8px 6px 2px 0px;
+ margin-top: 6px;
+ margin-bottom: 6px;
+}
+
+div.groupHead {
+ margin-top: 6px;
+ margin-bottom: 6px;
+}
+
+div.prefDesc,.groupDesc,.groupHead {
+ padding-bottom: 10px;
+}
+
More information about the checkins
mailing list