[Slim-Checkins] r11383 - in /branches/6.5/server/HTML/Fishbone: cmdwrappers_Fishbone html/ajax.js html/black.html html/scripts.js index.html pageheader.html status_header.html
kdf at svn.slimdevices.com
kdf at svn.slimdevices.com
Sat Feb 10 10:59:16 PST 2007
Author: kdf
Date: Sat Feb 10 10:59:15 2007
New Revision: 11383
URL: http://svn.slimdevices.com?rev=11383&view=rev
Log:
Bug: 4753
Description: merge -r 11381:11382 from trunk, along with fixing some non-standards warnings
Added:
branches/6.5/server/HTML/Fishbone/html/black.html
- copied unchanged from r11382, trunk/server/HTML/Fishbone/html/black.html
Modified:
branches/6.5/server/HTML/Fishbone/cmdwrappers_Fishbone
branches/6.5/server/HTML/Fishbone/html/ajax.js
branches/6.5/server/HTML/Fishbone/html/scripts.js
branches/6.5/server/HTML/Fishbone/index.html
branches/6.5/server/HTML/Fishbone/pageheader.html
branches/6.5/server/HTML/Fishbone/status_header.html
Modified: branches/6.5/server/HTML/Fishbone/cmdwrappers_Fishbone
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/cmdwrappers_Fishbone?rev=11383&r1=11382&r2=11383&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/cmdwrappers_Fishbone (original)
+++ branches/6.5/server/HTML/Fishbone/cmdwrappers_Fishbone Sat Feb 10 10:59:15 2007
@@ -51,7 +51,7 @@
[%- WRAPPER removelink -%][%- PROCESS cmdHRef cmdType = 'delete' -%][%- END -%]
<span class="mixers">[%- FOREACH mixer = item.mixerlinks.values.sort %]
[%- PROCESS $mixer -%]
- [%- END -%]
+ [%- END -%]</span>
[%- END %]
[% BLOCK browsecontrols -%]
Modified: branches/6.5/server/HTML/Fishbone/html/ajax.js
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/html/ajax.js?rev=11383&r1=11382&r2=11383&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/html/ajax.js (original)
+++ branches/6.5/server/HTML/Fishbone/html/ajax.js Sat Feb 10 10:59:15 2007
@@ -461,6 +461,9 @@
//parent.header.document.getElementById('browseForm').innerHTML = " Error:\n"+ req.status + "\n" +req.statusText;
}
}
+
+ var page = parent.header.document.getElementById('homepage').innerHTML;
+ selectLink("",page);
}
function getOptionData(params, action) {
Modified: branches/6.5/server/HTML/Fishbone/html/scripts.js
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/html/scripts.js?rev=11383&r1=11382&r2=11383&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/html/scripts.js (original)
+++ branches/6.5/server/HTML/Fishbone/html/scripts.js Sat Feb 10 10:59:15 2007
@@ -19,18 +19,14 @@
function changePlayer(player_List) {
player = player_List.options[player_List.selectedIndex].value;
- setCookie('SlimServer-player', '=' + player);
+
player = escape(player);
var newPlayer = "=" + player;
- newHref(parent.frames[2].document,newPlayer);
refreshPlaylist(player);
var args = 'player='+player+'&ajaxRequest=1&s='+Math.random();
getStatusData(args, refreshNewPlayer);
-
- var newpage = '';
- var rExp= new RegExp("&page=(.*?)$");
if (parent.browser.location.href.indexOf('setup') == -1) {
newHref(parent.browser.document,newPlayer);
@@ -42,15 +38,12 @@
parent.browser.location=browseURL.replace(playerExp, newPlayer);
}
- var myString = getHomeCookie('SlimServer-Browserpage');
- if (rExp.exec(myString)) newpage = "&page=" + rExp.exec(myString)[1];
-
- headerURL = new String(parent.header.location.href);
- newloc = headerURL.replace(playerExp, newPlayer);
-
if (document.all) { //certain versions of IE will just have to reload the header
- parent.header.location = newloc.replace(/&page=(.*?)$/,newpage);
- }
+ parent.header.location = "home.html?player=" + player;
+ }
+
+ var page = parent.header.document.getElementById('homepage').innerHTML;
+ selectLink("",page);
}
// change browse/plugin/radio hrefs to proper player
@@ -176,23 +169,6 @@
timerID = setTimeout("ProgressUpdate( "+mp+")", interval);
}
-function getArgs() {
- var args = new Object();
- var query = location.search.substring(1);
- var pairs = query.split("&");
-
- for(var i = 0; i < pairs.length; i++) {
- var pos = pairs[i].indexOf('=');
-
- if (pos == -1) continue;
- var argname = pairs[i].substring(0,pos);
- var value = pairs[i].substring(pos+1);
- args[argname] = unescape(value);
- }
-
- return args;
-}
-
function getCookie(cookie)
{
var search = cookie + "=";
@@ -217,17 +193,12 @@
plyr = getCookie(Player);
if (!plyr) return "";
- if (plyr.indexOf("=") == -1) plyr = "=" + plyr;
+ if (plyr.indexOf("=") == -1) plyr = plyr;
return plyr;
}
-function goHome(plyr)
-{
- var loc = getHomeCookie('SlimServer-Browserpage')+'&player='+plyr;
- parent.browser.location = loc;
-}
-
+// grab homepage cookie
function getHomeCookie(Name)
{
var url = getCookie(Name);
@@ -240,6 +211,7 @@
return url;
}
+// parse the page name token (handles old style full href cookie)
function getPage() {
var url = getHomeCookie('SlimServer-Browserpage');
@@ -260,33 +232,34 @@
end = url.length;
page = unescape(url.substring(offset, end));
- if (!page) return "BROWSE_BY_ALBUM";
+ if (!page) return url;
return page;
}
}
- return "BROWSE_BY_ALBUM";
+ return url;
}
}
var selectedLink;
function selectLink(lnk,reset) {
- if (selectedLink) selectedLink.style.fontWeight='normal';
+ parent.header.document.getElementById('homelink').style.fontWeight = 'normal';
+ if (selectedLink) selectedLink.style.fontWeight = 'normal';
if (lnk) {
lnk.style.fontWeight='bold';
selectedLink=lnk;
}
if (reset == 1) {
- document.forms[0].browse.options[0].selected = "true";
+ parent.header.document.forms[0].browse.options[0].selected = "true";
} else {
- if (reset && homestring) {reset = page;}
-
- for (var i=0;i < document.forms[0].browse.options.length; i++){
-
- if (document.forms[0].browse.options[i].value == reset) {
- document.forms[0].browse.options[i].selected = "true";
+ if (reset) {
+ for (var i=0;i < parent.header.document.forms[0].browse.options.length; i++){
+
+ if (parent.header.document.forms[0].browse.options[i].value == reset) {
+ parent.header.document.forms[0].browse.options[i].selected = "true";
+ }
}
}
}
Modified: branches/6.5/server/HTML/Fishbone/index.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/index.html?rev=11383&r1=11382&r2=11383&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/index.html (original)
+++ branches/6.5/server/HTML/Fishbone/index.html Sat Feb 10 10:59:15 2007
@@ -3,32 +3,20 @@
<html>
<head>
[% PROCESS customheader.html %]
- <script language="JavaScript" TYPE="text/javascript">
- //<!--Hide
- var args = getArgs();
- if (args.player) {
- var cPlayer = "=" + args.player;
- }
- else {
- var cPlayer = getPlayer('SlimServer-player');
- if (cPlayer == "") cPlayer = "=[% playerURI %]";
- }
-
- document.write('<frameset cols="50%,*" framespacing="2" border="2">' );
- document.write('<frameset name="home" ID="home" border="0" frameborder="no" framespacing="0" rows="55,*">');
- document.write('<frame name="header" ID="header" scrolling="no" src="home.html?player'+cPlayer+'&page='+ getPage() +'">');
- document.write('<frame name="browser" ID="browser" src="' + getHomeCookie('SlimServer-Browserpage') +'&player'+cPlayer + '">');
- document.write('<\/frameset>');
-
- document.write('<frameset name="player_frame" ID="player_frame" border="0" frameborder="no" framespacing="0" rows="260,*">');
- document.write('<frame ID="status" name="status" scrolling="no" src="status_header.html?player'+cPlayer+'">');
- document.write('<frame ID="playlist" name="playlist" src="playlist.html?player'+cPlayer+'">');
- document.write('<\/frameset>');
- document.write('<\/frameset>');
- document.close();
- //-->
- </script>
</head>
- <body>
+
+ <frameset cols="50%,*" framespacing="2" border="2">
+ <frameset name="home" ID="home" border="0" frameborder="no" framespacing="0" rows="55,*">
+ <frame name="header" ID="header" scrolling="no" src="home.html?player=[% playerURI %]">
+ <frame name="browser" ID="browser" src="html/black.html">
+ </frameset>
+ <frameset name="player_frame" ID="player_frame" border="0" frameborder="no" framespacing="0" rows="260,*">
+ <frame ID="status" name="status" scrolling="no" src="status_header.html?player=[% playerURI %]">
+ <frame ID="playlist" name="playlist" src="playlist.html?player=[% playerURI %]">
+ </frameset>
+ </frameset>
+ <noframes>
+ <body bgcolor="#000000">
</body>
+ </noframes>
</html>
Modified: branches/6.5/server/HTML/Fishbone/pageheader.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/pageheader.html?rev=11383&r1=11382&r2=11383&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/pageheader.html (original)
+++ branches/6.5/server/HTML/Fishbone/pageheader.html Sat Feb 10 10:59:15 2007
@@ -1,85 +1,100 @@
[% IF NOT optionOnly %]
[%- FILTER null %]
-[% BLOCK addBrowseLinks %]
- [% IF links %]
- [% FOREACH link = links %]
- <OPTION [% IF page == link.key %]selected[% END %] value="[% link.key %]" label="[% link.key | string %]">[% link.key | string %]</OPTION>
- [% END %]
- [% END %]
-[% END %]
+[%- BLOCK addBrowseLinks -%]
+ [%- IF links -%]
+ [%- FOREACH link = links -%]
+ <OPTION value="[% link.key %]" label="[% link.key | string %]">[% link.key | string %]</OPTION>
+ [%- END -%]
+ [%- END -%]
+[%- END -%]
-[% BLOCK addCaseLinks %]
- [% IF links %]
- [% FOREACH link = links %]
+[% BLOCK addCaseLinks -%]
+ [%- IF links -%]
+ [%- FOREACH link = links -%]
[% IF link.key == "SQUEEZENETWORK_SWITCH" %][% cookie = 0 %][% END %]
case "[% link.key %]":
url = "[% link.value %]"
- [% IF cookie %]page = "[% link.key %]"[% END %]
- suffix = "page=" + page
[% IF cookie %]homestring = "[% link.key | string %]"
cookie = [% cookie %][% END %]
break
- [% END %]
- [% END %]
-[% END %]
+ [%- END -%]
+ [%- END -%]
+[%- END %]
[% END -%]
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
[% PROCESS customheader.html %]
- [% IF home %]<script language="JavaScript">
- <!--Hide
- var homestring;
- var page;
- function doSearch(value)
- {
- selectLink();
- parent.browser.location='search.html?manualSearch=1&query=' + value + '&player' + getPlayer('SlimServer-player');
- }
-
- function chooseBrowser(value,option)
- {
- selectLink()
- var url;
- var cookie = 0;
- switch(option)
+ [% IF home %]<script type="text/javascript">
+ <!--Hide
+ var homestring;
+ var page;
+ function doSearch(value)
{
+ selectLink();
+ parent.browser.location='search.html?manualSearch=1&query=' + value + '&player' + getPlayer('SlimServer-player');
+ }
+
+ function goHome()
+ {
+ var homepage = getPage();
+ chooseBrowser(null,homepage);
+ }
+
+ function chooseBrowser(value,option)
+ {
+ var url;
+ var cookie = 0;
+ switch(option)
+ {
[% PROCESS addCaseLinks links=additionalLinks.browse cookie=1 %]
[% PROCESS addCaseLinks links=additionalLinks.radio cookie=1 %]
[% PROCESS addCaseLinks links=additionalLinks.search cookie=0 %]
[% PROCESS addCaseLinks links=additionalLinks.plugins cookie=1 %]
[% PROCESS addCaseLinks links=additionalLinks.settings cookie=0 %]
- case "RADIO_TUNEIN":
- url = "tunein.html"
- page = "RADIO_TUNEIN"
- suffix = "?page=" + page
- break
- case "STATISTICS":
- url= "hitlist.html"
- page="STATISTICS"
- suffix = ""
+ case "RADIO_TUNEIN":
+ url = "tunein.html"
+ //page = "RADIO_TUNEIN"
+ break
+ case "STATISTICS":
+ url = "hitlist.html"
+ //page = "STATISTICS"
+ }
+
+ if (option) {
+ if (cookie) {
+ setCookie("SlimServer-Browserpage",option);
+ //parent.header.location = "home.html?player' + getPlayer('SlimServer-player');
+ }
+
+ parent.browser.location = url + '?player' + getPlayer('SlimServer-player');
+ }
+
+ if (value != null) {
+ selectLink();
+ } else {
+ selectLink("",option);
+ }
+ document.getElementById('homepage').innerHTML = option;
+ }
+
+ function homelink() {
+ if (homestring) {
+ document.getElementById('homelink').innerHTML = homestring;
+ }
+ }
+
+ function loadBrowser(force) {
+ if (force || parent.browser.location.href.match('black.html')) {
+ page = getPage();
+ chooseBrowser(null,page);
+ }
}
- if (option) {
- if (cookie) {
- setCookie("SlimServer-Browserpage",url + suffix);
- //parent.header.location = "home.html?page=" + page + '&player' + getPlayer('SlimServer-player');
- }
- if (suffix != "") {suffix = suffix + "&"} else {suffix = "?"}
- parent.browser.location = url + suffix + 'player' + getPlayer('SlimServer-player');
- }
- }
-
- [% IF home %]function homelink() {
- if (homestring) {
- document.getElementById('homelink').innerHTML = homestring;
- } [% IF page %]else {
- document.getElementById('homelink').innerHTML = '[% page | string %]';
- }[% END %]
- }[% END %]
-
- -->
- </script>[% END %]
+ -->
+ </script>
+ [% bodyscript = 'onload="loadBrowser();"' %]
+ [% END %]
[% headScripts %]
[% IF artwork && levelName == 'album' %]
@@ -114,21 +129,22 @@
[% IF home %][% IF NOT optionOnly %]
<div id="masthead">
<div id="SDlogo">
+ <span id="homepage" style="display:none"></span>
<a href="http://www.slimdevices.com/" target="slimdevices"><img src="[% webroot %]html/images/slimdevices_logo.gif" alt="Slim Devices"></a>
</div>
<div id="serverlinks">
- <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>
+ <a id="homelink" onload="style.fontWeight='bold';" href="javascript:void();" 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 %]setup.html?page=BASIC_SERVER_SETTINGS&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>
+ <a href="[% webroot %]home.html?page=help&player=[% playerURI %][% IF nofolder %]&nofolder=1[% END %]" target="browser" onclick="selectLink(this,1)">[% "HELP" | string %]</a></nobr>
</div>
</div>
<div id="menuHeader">[% END %]
- <FORM id="browseForm" name="browser" action="javascript: return false;" target="header">
+ <FORM id="browseForm" name="browseForm" action="javascript:void();">
<SELECT NAME="browse" class="stdedit" style="width:17em;" onchange="chooseBrowser(selectedIndex,options[selectedIndex].value)">
<OPTION value="" label="">---[% "BROWSE_MUSIC" | string %]---</OPTION>
[% PROCESS addBrowseLinks links=additionalLinks.browse %]
@@ -136,12 +152,12 @@
[% PROCESS addBrowseLinks links=additionalLinks.search %]
<OPTION value="" label="">---[% "RADIO" | string %]---</OPTION>
[% PROCESS addBrowseLinks links=additionalLinks.radio %]
- <OPTION [% IF page == "RADIO_TUNEIN" %]selected[% END %] value="RADIO_TUNEIN" label='[% "RADIO_TUNEIN" | string %]'>[% "RADIO_TUNEIN" | string %]</OPTION>
+ <OPTION value="RADIO_TUNEIN" label='[% "RADIO_TUNEIN" | string %]'>[% "RADIO_TUNEIN" | string %]</OPTION>
[% IF additionalLinks.plugins %]
<OPTION value="" label="">---[% "PLUGINS" | string %]---</OPTION>
[% PROCESS addBrowseLinks links=additionalLinks.plugins %]
[% END %]
- <OPTION [% IF page == "STATISTICS" %]selected[% END %] value="[% "STATISTICS" %]" label="[% "STATISTICS" | string %]">[% "STATISTICS" | string %]</OPTION>
+ <OPTION label="[% "STATISTICS" | string %]">[% "STATISTICS" | string %]</OPTION>
[% IF additionalLinks.settings %]
<OPTION value="" label="">---[% "SETTINGS" | string %]---</OPTION>
[% PROCESS addBrowseLinks links=additionalLinks.settings %]
@@ -150,7 +166,7 @@
<input type=hidden value="[% page %]" name="page">
</FORM>
[% IF NOT optionOnly %]
- <FORM id="HeaderSearchForm" name=searcher action="javascript: return false;" onSubmit="doSearch(query.value);">
+ <FORM id="HeaderSearchForm" name=searcher action="javascript:void();" onSubmit="doSearch(query.value);">
[% "SEARCH" | string %]
<input type=text class="stdedit" name="query" [% IF search %]value="[% query %]"[% END %] size="15">
<input type=hidden value="[% player %]" name="player">
Modified: branches/6.5/server/HTML/Fishbone/status_header.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/status_header.html?rev=11383&r1=11382&r2=11383&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/status_header.html (original)
+++ branches/6.5/server/HTML/Fishbone/status_header.html Sat Feb 10 10:59:15 2007
@@ -100,7 +100,7 @@
[%- IF NOT undock -%]
<div id="menuHeader">
- <form id="playerForm" action="javascript:return false">
+ <form id="playerForm" action="javascript:void()">
[% IF player_chooser_list -%]
<select name="player" onchange="changePlayer(this);" class="stdedit">[% player_chooser_list %]</select>
[%- ELSE -%]
@@ -125,7 +125,7 @@
<span id='coverhref'><a id="coverarthref" [% albumHRef %] target="browser">[% IF coverThumb -%]
[%- PROCESS statusImg width="100" -%]
[%- ELSE -%]
- <img src="[% webroot %]html/images/cover.png" id="coverartpath" width = '100' height="100">
+ <img src="[% webroot %]html/images/cover.png" id="coverartpath" width = '100' height="100" alt="" title="">
[%- END %]</a></span>
</div>
<div id="notplaying" [% IF currentsong %]style="display:none;"[% END %]>
More information about the checkins
mailing list