[Slim-Checkins] r11150 - in /trunk/server/HTML/EN: ajaxHome.txt
home.html html/home.js progress.html
kdf at svn.slimdevices.com
kdf at svn.slimdevices.com
Sun Jan 7 01:27:54 PST 2007
Author: kdf
Date: Sun Jan 7 01:27:54 2007
New Revision: 11150
URL: http://svn.slimdevices.com?rev=11150&view=rev
Log:
Bug: n/a
Desctipion:
- show/hide any span of class=progress within the scanWarning, so that other elements of the progress ui can be turned on and off via ajax
- wrap more elements in div/span to allow for ajaxupdates
- block the progress.html refresh on finish so that you can navigate away from the page
TODO: update library info so that a refresh is no longer needed on the home page
Modified:
trunk/server/HTML/EN/ajaxHome.txt
trunk/server/HTML/EN/home.html
trunk/server/HTML/EN/html/home.js
trunk/server/HTML/EN/progress.html
Modified: trunk/server/HTML/EN/ajaxHome.txt
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/ajaxHome.txt?rev=11150&r1=11149&r2=11150&view=diff
==============================================================================
--- trunk/server/HTML/EN/ajaxHome.txt (original)
+++ trunk/server/HTML/EN/ajaxHome.txt Sun Jan 7 01:27:54 2007
@@ -11,3 +11,6 @@
warn|[% warn %]
+songcount|[% song_count %]
+artistcount|[% artist_count %]
+albumcount|[% album_count %]
Modified: trunk/server/HTML/EN/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/home.html?rev=11150&r1=11149&r2=11150&view=diff
==============================================================================
--- trunk/server/HTML/EN/home.html (original)
+++ trunk/server/HTML/EN/home.html Sun Jan 7 01:27:54 2007
@@ -15,14 +15,14 @@
<div class="statusarea">
<div id="scanWarning" [% IF NOT warn %]style="display:none"[% END %]><b>[% "NOTE" | string %]</b> [% "HOME_SCAN_WARNING" | string %]</div>
- [% IF song_count %]
- [% "LIBRARY_CONTAINS" | string %] [% album_count %] [% "WITH" | string %]
- [% song_count %] [% "BY" | string %] [% artist_count %].
- [% END %]
+ <div id="libraryInfo" [% IF warn %]style="display:none"[% END %]>
+ [%- "LIBRARY_CONTAINS" | string %] <span id="albumcount">[% album_count %]</span> [% "WITH" | string -%]
+ <span id="songcount">[%- song_count %]</span> [% "BY" | string %] <span id="artistcount">[% artist_count %]</span>.
+ </div>
- [% IF newVersion %]
- <br><br>[% newVersion %]
- [% END %]
+ <div id="newVersion">
+ [% IF newVersion %]<br><br>[% newVersion %][% END %]
+ </div>
</div>
[% END %]
@@ -36,7 +36,7 @@
[% END -%]
[% PROCESS pageheader.html %]
- <div id="progressName">[% IF progress.name %][% progress.name _ "_PROGRESS" | string %][% END %]</div>
+ <div id="progressName" style="display:inline">[% IF progress.name %][% progress.name _ "_PROGRESS" | string %][% END %]</div><br>
<a href="[% webroot %]progress.html?type=importer"><span id="progressBar" >[% progress.bar %]</span></a>
<div class="homeMenuSection">
Modified: trunk/server/HTML/EN/html/home.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/home.js?rev=11150&r1=11149&r2=11150&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/home.js (original)
+++ trunk/server/HTML/EN/html/home.js Sun Jan 7 01:27:54 2007
@@ -6,6 +6,7 @@
if (parsedData['warn']) {
+ if ($('libraryInfo')) hideElements(['libraryInfo']);
if ($('scanWarning')) showElements(['scanWarning'],'inline');
var elements = ['progressName', 'progressBar', 'progressDone', 'progressTotal'];
@@ -20,11 +21,33 @@
}
}
+ var elems = $('scanWarning').getElementsByTagName("span");
+
+ for (var i=0; i < elems.length; i++) {
+ if (elems[i].className == 'progress') {
+ if (parsedData['progressname']) {
+ elems[i].style.display = 'inline';
+ } else {
+ elems[i].style.display = 'none';
+ }
+ }
+ }
+
setTimeout( "ajaxHomeRefresh()", 5 * 1000);
} else {
+
+ refresh();
+
+ var elements = ['songcount', 'albumcount', 'artistcount'];
+
+ for (var i=0; i < elements.length; i++) {
+ if (parsedData[data[i]]) {
+ refreshElement(elements[i], parsedData[data[i]]);
+ }
+ }
if ($('scanWarning')) hideElements(['scanWarning']);
- refresh();
+ if ($('libraryInfo')) showElements(['libraryInfo'],'inline');
}
}
Modified: trunk/server/HTML/EN/progress.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/progress.html?rev=11150&r1=11149&r2=11150&view=diff
==============================================================================
--- trunk/server/HTML/EN/progress.html (original)
+++ trunk/server/HTML/EN/progress.html Sun Jan 7 01:27:54 2007
@@ -1,31 +1,52 @@
+[%- IF ajaxRequest -%]
+ <pre>
+ [% PROCESS ajaxProgress.txt %]
+ </pre>
+[%- ELSE -%]
+
[% pagetitle = type _ "_PROGRESS" | string %]
+
[% pageHeaderMenu = pagetitle %]
+
+[% pageHeaderScripts = BLOCK %]
+<!-- <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/progress.js %]</script>
+-->
+[% END %]
+
+[%# bodyscript = 'onload="doLoad();"' %]
[% PROCESS pageheader.html %]
<div>[% type _ "_PROGRESS_DESC" | string %]</div>
- [% odd = 1 %]
+ [% odd = 1 %][% num = 0 %]
[% 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 %]
+ [%- WRAPPER contentitem %]
+ <span id="Name">[% item.obj.name _ "_PROGRESS" | string %]</span>
+ (
+ <span id="Done">[% item.obj.done %]</span>
+ [% "OF" | string %]
+ <span id="Total">[% item.obj.total %]</span>
+ )
+ <span id="Active">[% "RUNNING" | string %]</span>
+ <span id="Time">[% item.time %]</span> [% "SECONDS" | string %]
[% END -%]
[% odd = (not odd) %]
- [%- WRAPPER contentitem %]
- [% item.bar %]
+ [%- WRAPPER contentitem lineclass='progressItem' %]
+ <span id="Bar">[% item.bar %]</span>
<br>
- [% IF item.obj.info %]<p>[% item.obj.info %]</p>[% END %]
+ <div id="Info">[% IF item.obj.info %][% item.obj.info %][% END %]</div>
[% END -%]
- [% odd = (not odd) %]
+ [% odd = (not odd) %][% num = num +1 %]
[% END %]
- <div>[% IF message %][% message %][% END %]</div>
+ <div id="message">[% IF message %][% message %][% END %]</div>
-[% IF refresh %]<script language="JavaScript">
+[% IF refresh && NOT message %]<script language="JavaScript">
setTimeout( "refresh()", [% refresh %] * 1000);
@@ -36,3 +57,4 @@
</script>[% END %]
[% PROCESS pagefooter.html %]
+[% END %]
More information about the checkins
mailing list