[Slim-Checkins] r9380 - in /branches/6.5/server/HTML/Fishbone: html/ajax.js status_header.html

Sun Sep 3 11:33:05 PDT 2006

Author: kdf
Date: Sun Sep  3 11:33:03 2006
New Revision: 9380

URL: http://svn.slimdevices.com?rev=9380&view=rev
Log:
merge -r9377:9379 from trunk

Modified:
    branches/6.5/server/HTML/Fishbone/html/ajax.js
    branches/6.5/server/HTML/Fishbone/status_header.html

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=9380&r1=9379&r2=9380&view=diff
==============================================================================

--- branches/6.5/server/HTML/Fishbone/html/ajax.js (original)
+++ branches/6.5/server/HTML/Fishbone/html/ajax.js Sun Sep  3 11:33:03 2006
@@ -180,7 +180,8 @@
 	if (newsong) {
 		elems.push('songtitle');
 		refreshElement('songtitle', parsedData['songtitle']);
-		playlistChecker();
+		refreshPlaylist();
+		//playlistChecker();
 	}
 	
 	if (parsedData['streamtitle']) {
@@ -385,7 +386,8 @@
 function playlistChecker(start) {
 	var prev_url = url;
 	url = 'playlist.html';
-	var args = 'player='+player+'&ajaxRequest=1'; 
+	var args = 'player='+player+'&ajaxRequest=1';
+	
 	if(start != null && start != '') {
 		//alert([start != '', start == null]);
 		refreshPlaylist();

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=9380&r1=9379&r2=9380&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/status_header.html (original)
+++ branches/6.5/server/HTML/Fishbone/status_header.html Sun Sep  3 11:33:03 2006
@@ -68,6 +68,7 @@
 		-->
 	</script>[% END %]
 </head>
+
 <body bgcolor="#FFFFFF" style="margin: 0" topmargin="0" leftmargin="0" rightmargin="0" [% IF NOT undock %]onload="refreshPlaylist('[% playerURI %]');doRefresh();"[% END %]>
 	<div ID="header">
 		<div id="mastHead">
@@ -77,10 +78,9 @@
 			</div>
 			<div id="playerlinks">
 			[% IF undock %]<span id="inc"></span>  [% END %]
-				[% IF sync %]
-					<span id="unsync"><a href="[% statusroot %]?p0=sync&p1=-&player=[% playerURI %]">[% "UNSYNC" | string %]</a>
-					 / </span>
-				[% END %]
+				
+				<span id="unsync">[% IF sync %]<a href="[% statusroot %]?p0=sync&p1=-&player=[% playerURI %]">[% "UNSYNC" | string %]</a>
+				 / [% END %]</span>
 				
 				<span id="sleeplink"><A href="javascript:processSleepLink('p0=button&amp;p1=sleep');"><span id='sleeptime'>[% IF sleeptime %][% sleep %][% ELSE %][% "SLEEP" | string %][% END %]</span></a>
 				 / </span>

