[Slim-Checkins] r11125 - in /trunk/server/HTML/EN: home.html progress.html

Fri Jan 5 22:32:54 PST 2007

Author: kdf
Date: Fri Jan  5 22:32:54 2007
New Revision: 11125

URL: http://svn.slimdevices.com?rev=11125&view=rev
Log:
Bug: n/a
Description: 
	- css-ify progress html page
	- move progress on home page out of header to help avoid div collisions/overlaps
	- fix duplicate body tag in progress page


Modified:
    trunk/server/HTML/EN/home.html
    trunk/server/HTML/EN/progress.html

Modified: trunk/server/HTML/EN/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/home.html?rev=11125&r1=11124&r2=11125&view=diff
==============================================================================

--- trunk/server/HTML/EN/home.html (original)
+++ trunk/server/HTML/EN/home.html Fri Jan  5 22:32:54 2007
@@ -10,10 +10,6 @@
 	<div class="statusarea">
 		[% IF warn %]
 			<b>[% "NOTE" | string %]</b> [% "HOME_SCAN_WARNING" | string %]
-			[% IF progress.name %]
-				<p>[% progress.name _ "_PROGRESS" | string %] 
-				<a href="[% webroot %]progress.html?type=importer">[% progress.bar %]</a>
-			[% END %]
 		[% END %]
 
 		[% IF song_count %]
@@ -29,6 +25,11 @@
 [% END %]	
 [% END -%]
 [% PROCESS pageheader.html %]
+
+			[% IF progress.name %]
+				<div>[% progress.name _ "_PROGRESS" | string %] <br>
+				<a href="[% webroot %]progress.html?type=importer">[% progress.bar %]</a></div>
+			[% END %]
 
 <div class="homeMenuSection">
 	<div>[% "BROWSE_MUSIC" | string | upper %]</div>

Modified: trunk/server/HTML/EN/progress.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/progress.html?rev=11125&r1=11124&r2=11125&view=diff
==============================================================================
--- trunk/server/HTML/EN/progress.html (original)
+++ trunk/server/HTML/EN/progress.html Fri Jan  5 22:32:54 2007
@@ -1,13 +1,33 @@
-[% pagetitle = "SCANNER_PROGRESS" | string %]
+[% pagetitle = type _ "_PROGRESS" | string %]
 [% pageHeaderMenu = pagetitle %]
 
 [% PROCESS pageheader.html %]
 
+	<div>[% type _ "_PROGRESS_DESC" | string %]</div>
+
+	[% odd = 1 %]
+	[% FOREACH item = progress_items %]
+
+		[%- WRAPPER contentitem  %]
+			[% item.obj.name _ "_PROGRESS" | string %] ( [% item.obj.done %] [% "OF" | string %] [% item.obj.total %] ) 
+			[% IF item.obj.active %] [% "RUNNING" | string %][% ELSE %] [% "COMPLETE" | string %][% END %]
+			[% item.time %] [% "SECONDS" | string %]
+		[% END -%]
+		[% odd = (not odd) %]
+		[%- WRAPPER contentitem  %]
+			[% item.bar %]
+			<br>
+			[% IF item.obj.info %]<p>[% item.obj.info %]</p>[% END %]
+		[% END -%]
+		[% odd = (not odd) %]
+	[% END %]
+
+	<div>[% IF message %][% message %][% END %]</div>
+
+
 [% IF refresh %]<script language="JavaScript">
 
-function doLoad() {
-	setTimeout( "refresh()", [% refresh %] * 1000);
-}
+setTimeout( "refresh()", [% refresh %] * 1000);
 
 function refresh() {
 	window.location.replace("[% webroot	%]progress.html?type=[% type %]&player=[% player | uri %]");
@@ -15,21 +35,4 @@
 
 </script>[% END %]
 
-<body [% IF refresh %]onload="doLoad()"[% END %]>
-
-    <h4>[% type _ "_PROGRESS" | string %]</h4>
-
-	<p>[% type _ "_PROGRESS_DESC" | string %]</p>
-
-	[% FOREACH item = progress_items %]
-		<p>
-		[% item.obj.name _ "_PROGRESS" | string %] ( [% item.obj.done %] [% "OF" | string %] [% item.obj.total %] ) 
-		[% IF item.obj.active %] [% "RUNNING" | string %][% ELSE %] [% "COMPLETE" | string %][% END %]
-		[% item.time %] [% "SECONDS" | string %] [% item.bar %]
-		[% IF item.obj.info %]<p>[% item.obj.info %]</p>[% END %]
-		</p>	
-	[% END %]
-
-	<p>[% IF message %][% message %][% END %]</p>
-
 [% PROCESS pagefooter.html %]

