[Slim-Checkins] r11146 - in /trunk/server/HTML: EN/ajaxHome.txt EN/html/home.js Fishbone/pageheader.html

Sat Jan 6 16:33:47 PST 2007

Author: kdf
Date: Sat Jan  6 16:33:47 2007
New Revision: 11146

URL: http://svn.slimdevices.com?rev=11146&view=rev
Log:
Bug: n/a
Description: 
 	- add a couple more elements to the ajax home updates, merge into an interated loop.
	- add interface for fishbone skin for progress


Modified:
    trunk/server/HTML/EN/ajaxHome.txt
    trunk/server/HTML/EN/html/home.js
    trunk/server/HTML/Fishbone/pageheader.html

Modified: trunk/server/HTML/EN/ajaxHome.txt
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/ajaxHome.txt?rev=11146&r1=11145&r2=11146&view=diff
==============================================================================

--- trunk/server/HTML/EN/ajaxHome.txt (original)
+++ trunk/server/HTML/EN/ajaxHome.txt Sat Jan  6 16:33:47 2007
@@ -6,6 +6,8 @@
 
 # grab the object
 progressbar|[% progress.bar %]
+progressdone|[% progress.obj.done %]
+progresstotal|[% progress.obj.total %]
 
 warn|[% warn %]
 

Modified: trunk/server/HTML/EN/html/home.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/home.js?rev=11146&r1=11145&r2=11146&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/home.js (original)
+++ trunk/server/HTML/EN/html/home.js Sat Jan  6 16:33:47 2007
@@ -7,19 +7,16 @@
 	if (parsedData['warn']) {
 	
 		//showElements(['scanWarning']);
-	
-		if (parsedData['progressname']) {
-			showElements(['progressName']);
-			refreshElement('progressName', parsedData['progressname']);
-		} else {
-			hideElements(['progressName']);
-		}
+		var elements = ['progressName', 'progressBar', 'progressDone', 'progressTotal'];
+		var data = ['progressname', 'progressbar', 'progressdone', 'progresstotal']
 		
-		if (parsedData['progressbar']) {
-			showElements(['progressBar']);
-			refreshElement('progressBar', parsedData['progressbar']);
-		} else {
-			hideElements(['progressBar']);
+		for (var i=0; i < elements.length; i++) {
+			if (parsedData[data[i]]) {
+				if ($(elements[i])) showElements([elements[i]],'inline');
+				refreshElement(elements[i], parsedData[data[i]]);
+			} else {
+				if ($(elements[i])) hideElements([elements[i]]);
+			}
 		}
 		
 		setTimeout( "ajaxHomeRefresh()", 5 * 1000);

Modified: trunk/server/HTML/Fishbone/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Fishbone/pageheader.html?rev=11146&r1=11145&r2=11146&view=diff
==============================================================================
--- trunk/server/HTML/Fishbone/pageheader.html (original)
+++ trunk/server/HTML/Fishbone/pageheader.html Sat Jan  6 16:33:47 2007
@@ -1,3 +1,8 @@
+[%- IF home && ajaxRequest -%]
+	<pre>
+	[% PROCESS ajaxHome.txt %]
+	</pre>
+[%- ELSE -%]
 [% IF NOT optionOnly %]
 [%- FILTER null %]
 [% BLOCK addBrowseLinks %]
@@ -25,6 +30,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+	[% IF home %]
+		<script type="text/javascript" src="[% webroot %]html/prototype.js" ></script>
+		<script TYPE="text/javascript" language="JavaScript">[% PROCESS html/global.js %]</script>
+		<script TYPE="text/javascript" language="JavaScript">[% PROCESS html/home.js %]</script>
+	[% END %]
 	[% PROCESS customheader.html %]
 	[% IF home %]<script type="text/javascript">
 	<!--Hide
@@ -107,13 +117,17 @@
 </style>
 <![endif]-->
 </head>
-<body bgcolor="#FFFFFF" topmargin="0" leftmargin="0" rightmargin="0" [% bodyscript %]>
+<body bgcolor="#FFFFFF" topmargin="0" leftmargin="0" rightmargin="0" [% bodyscript %][% IF home %]onload="doLoad(1);"[% END %]>
 [% END %]
 
 [% IF home %][% IF NOT optionOnly %]
 <div id="masthead">
 	<div id="SDlogo">
+		[% IF progress.name %]
+			Server scanning... <a href="[% webroot %]progress.html?type=importer" target="browser"><span id="progressName">[% progress.name _ "_PROGRESS" | string %]</span>(<span id="progressDone">[% progress.obj.done %]</span> [% "OF" | string %] <span id="progressTotal">[% progress.obj.total %]</span>)</a></span>
+		[% ELSE %]
 			<a href="http://www.slimdevices.com/" target="slimdevices"><img src="[% webroot %]html/images/slimdevices_logo.gif" alt="Slim Devices"></a>
+		[% END %]
 	</div>
 	<div id="serverlinks">
 		<a id="homelink" style="font-weight:bold;" href="javascript:selectLink(this,'BROWSE_NEW_MUSIC');" target="browser" onclick="selectLink(this,'[% page %]');" onMouseOver="homelink();setLink(this);" onMouseOut="document.getElementById('homelink').innerHTML = '[% "HOME" | string %]';">[% "HOME" | string %]</a>
@@ -172,4 +186,5 @@
 <span class="pageHeaderInfo">[% pageHeaderInfo %]</span>
 
 [% UNLESS noHR %]<hr class="headerhr">[% END %]
+[% END %]
 [% END %]

