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

[kdf at svn.slimdevices.com]

Author: kdf
Date: Sun Sep  3 11:19:39 2006
New Revision: 9377

URL: http://svn.slimdevices.com?rev=9377&view=rev
Log:
merge -r9375:9376 from trunk

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

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=9377&r1=9376&r2=9377&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/html/scripts.js (original)
+++ branches/6.5/server/HTML/Fishbone/html/scripts.js Sun Sep  3 11:19:39 2006
@@ -254,6 +254,6 @@
 }
 
 function setLink(lnk) {
-	lnk.href=getHomeCookie('SlimServer-Browserpage') + "&player=" + getPlayer('SlimServer-player');
-}
-
+	lnk.href=getHomeCookie('SlimServer-Browserpage') + "&player" + getPlayer('SlimServer-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=9377&r1=9376&r2=9377&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:19:39 2006
@@ -162,14 +162,14 @@
 						</tr>
 					</table></td>
 			</tr></table></div>
-			[% IF not fixedVolume %]
+
 			<div id="volumeControl"><div class="volwidth">
 				[% PROCESS volumecontrol %]
 				<div id="volumeBarText">
 					<div class="attributeBold">[% "VOLUME" | string | upper%][% "COLON" | string %]</div>
 				</div>
 			</div></div>
-			[% END %]
+
 		</div>
 		
 		<div id="TopMenu3">