[Slim-Checkins] r9411 - in /branches/6.5/server/HTML: Nokia770/artwork.js Nokia770/browse.js Nokia770/browsedb.html Nokia770/slimserver.css Nokia770/status.js Touch/slimserver.css

[bklaas at svn.slimdevices.com]

Author: bklaas
Date: Mon Sep  4 13:48:49 2006
New Revision: 9411

URL: http://svn.slimdevices.com?rev=9411&view=rev
Log:
adding gallery select feature, rearrange icons on home page

Modified:
    branches/6.5/server/HTML/Nokia770/artwork.js
    branches/6.5/server/HTML/Nokia770/browse.js
    branches/6.5/server/HTML/Nokia770/browsedb.html
    branches/6.5/server/HTML/Nokia770/slimserver.css
    branches/6.5/server/HTML/Nokia770/status.js
    branches/6.5/server/HTML/Touch/slimserver.css

Modified: branches/6.5/server/HTML/Nokia770/artwork.js
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Nokia770/artwork.js?rev=9411&r1=9410&r2=9411&view=diff
==============================================================================
--- branches/6.5/server/HTML/Nokia770/artwork.js (original)
+++ branches/6.5/server/HTML/Nokia770/artwork.js Mon Sep  4 13:48:49 2006
@@ -1,11 +1,11 @@
 var url = '[% webroot %]browsedb.html';
 var parsedData;
-var artistHrefTemplate = '[% webroot %]browsedb.html?hierarchy=contributor,album,track&contributor.id=ARTIST&level=1&player=[% playerURI %]';
+var artistHrefTemplate = '[% webroot %]browsedb.html?hierarchy=album,track&contributor.id=ARTIST&level=1&player=[% playerURI %]';
 var albumHrefTemplate = '[% webroot %]browsedb.html?hierarchy=album,track&level=1&album.id=ALBUM&player=[% playerURI %]';
 var thumbHrefTemplate = '/music/COVER/cover.jpg';
 var playAlbumTemplate = '[% webroot %]status.html?command=playlist&subcommand=loadtracks&album.id=ALBUM&player=[% playerURI %]';
 var addAlbumTemplate = '[% webroot %]playlist.html?command=playlist&subcommand=addtracks&album.id=ALBUM&player=[% playerURI %]';
-var blankRequest = 'hierarchy=album,track&level=0&artwork=1&orderBy=contributor,year,album&player=00%3A04%3A20%3A05%3A1b%3A82&artwork=1&start=[% start %]&ajaxRequest=1';
+var blankRequest = 'hierarchy=album,track&level=0&artwork=2&player=00%3A04%3A20%3A05%3A1b%3A82&artwork=1&start=[% start %]&ajaxRequest=1';
 
 var thisAlbum, thatAlbum;
 

Modified: branches/6.5/server/HTML/Nokia770/browse.js
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Nokia770/browse.js?rev=9411&r1=9410&r2=9411&view=diff
==============================================================================
--- branches/6.5/server/HTML/Nokia770/browse.js (original)
+++ branches/6.5/server/HTML/Nokia770/browse.js Mon Sep  4 13:48:49 2006
@@ -19,6 +19,37 @@
 	}
 }
 
+function toggleGalleryView(artwork) {
+	//var thisdoc = parent.browser;
+	var thisdoc = document;
+	if (thisdoc.location.pathname != '') {
+		myString = new String(thisdoc.location.href);
+		if (artwork) {
+			setCookie( 'SlimServer-albumView', "1" );
+			if (thisdoc.location.href.indexOf('start') == -1) {
+				thisdoc.location=thisdoc.location.href+"&artwork=1";
+			} else {
+				myString = new String(thisdoc.location.href);
+				var rExp = /\&start=/gi;
+				thisdoc.location=myString.replace(rExp, "&artwork=1&start=");
+			}
+		} else {
+			setCookie( 'SlimServer-albumView', "" );
+			var rExp = /\&artwork=1/gi;
+			thisdoc.location=myString.replace(rExp, "");
+		}
+	}
+}
+
+function setCookie(name, value) {
+        var expires = new Date();
+        expires.setTime(expires.getTime() + 1000*60*60*24*365);
+        document.cookie =
+                name + "=" + escape(value) +
+                ((expires == null) ? "" : ("; expires=" + expires.toGMTString()));
+}
+
 window.onload= function() {
 	refreshLibraryInfo();
 }
+

Modified: branches/6.5/server/HTML/Nokia770/browsedb.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Nokia770/browsedb.html?rev=9411&r1=9410&r2=9411&view=diff
==============================================================================
--- branches/6.5/server/HTML/Nokia770/browsedb.html (original)
+++ branches/6.5/server/HTML/Nokia770/browsedb.html Mon Sep  4 13:48:49 2006
@@ -27,9 +27,10 @@
 		<a href="browsetree.html?player=[% playerURI %]"><font class="pagebartext">[% "HERE" | string %]</a>.</font>
 	[% END %]
 [% END %]
+[% PROCESS galleryselect.html %]
 <table border="0" cellspacing="0" cellpadding="0" width="100%" bgcolor="#EEEEEE">
-	<tr>
-		<td>&nbsp;&nbsp;[% PROCESS crumblist noHomeLink = 1%]</td>
+		<td valign = 'top'>&nbsp;&nbsp;[% PROCESS crumblist noHomeLink = 1%]
+		</td>
 	</tr>
 	<tr>
 		<td class="pagebartext">

Modified: branches/6.5/server/HTML/Nokia770/slimserver.css
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Nokia770/slimserver.css?rev=9411&r1=9410&r2=9411&view=diff
==============================================================================
--- branches/6.5/server/HTML/Nokia770/slimserver.css (original)
+++ branches/6.5/server/HTML/Nokia770/slimserver.css Mon Sep  4 13:48:49 2006
@@ -375,6 +375,12 @@
 	top: 25;
 	z-index: 12;
 }
+div#gallerySelect {
+	position: fixed;
+	left: 20;
+	top: 30;
+	z-index: 12;
+}
 div#addedToPlaylist{
 	position: fixed;
 	z-index: 100;

Modified: branches/6.5/server/HTML/Nokia770/status.js
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Nokia770/status.js?rev=9411&r1=9410&r2=9411&view=diff
==============================================================================
--- branches/6.5/server/HTML/Nokia770/status.js (original)
+++ branches/6.5/server/HTML/Nokia770/status.js Mon Sep  4 13:48:49 2006
@@ -270,7 +270,7 @@
 	var parsedData = fillDataHash(theData);
 	// refresh cover art
 	if ($('albumhref')) {
-		$('albumhref').href = 'browsedb.html?hierarchy=contributor,album,track&level=2&album.id='+parsedData['albumid']+'&amp;player='+player;
+		$('albumhref').href = 'browsedb.html?hierarchy=album,track&level=2&album.id='+parsedData['albumid']+'&amp;player='+player;
 	}
 	if ($('coverartpath')) {
 		var coverPath = null;
@@ -285,9 +285,9 @@
 	// refresh song info
 	var songinfoArray = new Array();
 	songinfoArray[songinfoArray.length] = {name: 'songtitle', stub:'songinfo.html?item='};
-	songinfoArray[songinfoArray.length] = {name: 'artist', stub:'browsedb.html?hierarchy=contributor,album,track&level=1&contributor.id='};
-	songinfoArray[songinfoArray.length] = {name: 'album', stub:'browsedb.html?hierarchy=contributor,album,track&level=2&album.id='};
-	songinfoArray[songinfoArray.length] = {name: 'genre', stub:'browsedb.html?hierarchy=genre,contributor,album,track&level=1&genre.id='};
+	songinfoArray[songinfoArray.length] = {name: 'artist', stub:'browsedb.html?hierarchy=album,track&level=1&contributor.id='};
+	songinfoArray[songinfoArray.length] = {name: 'album', stub:'browsedb.html?hierarchy=album,track&level=2&album.id='};
+	songinfoArray[songinfoArray.length] = {name: 'genre', stub:'browsedb.html?hierarchy=genre,album,track&level=1&genre.id='};
 
 	songinfoArray.each(function(key) {
 		var thisName = key.name;

Modified: branches/6.5/server/HTML/Touch/slimserver.css
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Touch/slimserver.css?rev=9411&r1=9410&r2=9411&view=diff
==============================================================================
--- branches/6.5/server/HTML/Touch/slimserver.css (original)
+++ branches/6.5/server/HTML/Touch/slimserver.css Mon Sep  4 13:48:49 2006
@@ -372,6 +372,13 @@
 	left: 0;
 	top: 25;
 	z-index: 12;
+}
+
+div#gallerySelect {
+        position: fixed;
+        left: 30;
+        top: 45;
+        z-index: 12;
 }
 
 div#addedToPlaylist{