[Slim-Checkins] r10691 - in /branches/6.5/server/HTML: EN/html/global.js Nokia770/pageheader.html Nokia770/slimserver.css

Wed Nov 15 07:55:40 PST 2006

Author: bklaas
Date: Wed Nov 15 07:55:40 2006
New Revision: 10691

URL: http://svn.slimdevices.com?rev=10691&view=rev
Log:
bug#4478: play/add buttons and OSD

Modified:
    branches/6.5/server/HTML/EN/html/global.js
    branches/6.5/server/HTML/Nokia770/pageheader.html
    branches/6.5/server/HTML/Nokia770/slimserver.css

Modified: branches/6.5/server/HTML/EN/html/global.js
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/EN/html/global.js?rev=10691&r1=10690&r2=10691&view=diff
==============================================================================

--- branches/6.5/server/HTML/EN/html/global.js (original)
+++ branches/6.5/server/HTML/EN/html/global.js Wed Nov 15 07:55:40 2006
@@ -143,6 +143,13 @@
 	if ($(element)) {
 		document.getElementById(element).href = value;
 	}
+}
+
+// enters message sent to OSD div (typically still needs to be made visible with a different function)
+function changeOSD(message) {
+        if ($('OSD')) {
+                $('OSD').innerHTML = message;
+        }
 }
 
 // changes some part of a query in an href of id 'item', finding based on 'rpl', and replacing with 'data'
@@ -207,7 +214,7 @@
 		if (homeParsedData['song_count'] != '0') {
 			$('libraryInfo').innerHTML = libraryString;
 		}
-        }
+	}
 }
 
 // METHOD:  truncateAt: truncate specified tableId at specified length
@@ -239,9 +246,40 @@
 	url = old_url;
 }
 
+// send a message and number of milliseconds duration to the OSD div
+function showVolumeOSD(message, duration) {
+	var msDuration = parseInt(duration, 10);
+        if ($('volumeOSD')) {
+		$('volumeOSD').innerHTML = '';
+                $('volumeOSD').style.display = 'block';
+		$('volumeOSD').innerHTML = message;
+        }
+        var intervalID = setTimeout(hideVolumeOSD, msDuration);
+}
+
+function hideVolumeOSD() {
+        if ($('volumeOSD')) {
+                $('volumeOSD').style.display = 'none';
+        }
+
+}
+
+function showAdded() {
+	if ($('OSD')) {
+		$('OSD').style.display = 'block';
+	}
+	var intervalID = setTimeout("hideAdded()", 2000);
+}
+
+function hideAdded() {
+	if ($('OSD')) {
+		$('OSD').style.display = 'none';
+	}
+}
 // put global.js functions here that you want to be run after the page loads
 // requires a window.onLoad function in the js script that calls global.js
 // see Nokia770/browse.js for example
 function globalOnload() {
 	refreshLibraryInfo();
 }
+

Modified: branches/6.5/server/HTML/Nokia770/pageheader.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Nokia770/pageheader.html?rev=10691&r1=10690&r2=10691&view=diff
==============================================================================
--- branches/6.5/server/HTML/Nokia770/pageheader.html (original)
+++ branches/6.5/server/HTML/Nokia770/pageheader.html Wed Nov 15 07:55:40 2006
@@ -11,6 +11,7 @@
 <body [% IF class %]class = '[% class %]'[% END %] marginwidth=0 marginheight=0>
 
 <div id = 'addedToPlaylist' style='display:none'>Added to playlist</div>
+<div id = 'OSD' style='display:none'>Added to playlist</div>
 <div id = 'page[% UNLESS thispage == 'artwork' || thispage == 'home' || thispage == 'status' || thispage == 'search' %]_with_bar[% END %]'>
 
 [%# IF thispage == 'status' || thispage == 'playlist' || thispage == 'artwork' || thispage == 'browse' %]

Modified: branches/6.5/server/HTML/Nokia770/slimserver.css
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Nokia770/slimserver.css?rev=10691&r1=10690&r2=10691&view=diff
==============================================================================
--- branches/6.5/server/HTML/Nokia770/slimserver.css (original)
+++ branches/6.5/server/HTML/Nokia770/slimserver.css Wed Nov 15 07:55:40 2006
@@ -402,7 +402,20 @@
 	top: 80;
 	z-index: 11;
 }
-div#addedToPlaylist{
+
+div#OSD{
+	position: fixed;
+	z-index: 100;
+	top: 280;
+	right: 20;
+	background-color: white;
+	color: black;
+	font-weight: bold;
+	padding: 5px;
+	border: 1px solid black;
+}
+
+div#volumeOSD{
 	position: fixed;
 	z-index: 100;
 	top: 240;
@@ -414,6 +427,24 @@
 	border: 1px solid black;
 }
 
+div#albumInfo {
+        position: fixed;
+        z-index: 99;
+        top: 140;
+        left: 300;
+	width: 300;
+	bottom: 40;
+        background-color: white;
+        color: black;
+        padding: 5px;
+        border: 1px solid black;
+	overflow: scroll;
+}
+
+div#closeAlbumInfo {
+	position: relative;
+	float: right;
+}
 .homeMenuSection {
 	float: left;
 }

