[Slim-Checkins] r11140 - in /trunk/server/HTML:
Default/pageheader.html EN/ajaxHome.txt
EN/home.html EN/html/common.js EN/html/global.js EN/status_list.html
kdf at svn.slimdevices.com
kdf at svn.slimdevices.com
Sat Jan 6 14:34:51 PST 2007
Author: kdf
Date: Sat Jan 6 14:34:51 2007
New Revision: 11140
URL: http://svn.slimdevices.com?rev=11140&view=rev
Log:
Bug: n/a
Description:
- optimise EN playlist trackinfo render (as per recent fixes in Default)
- ajax updates for progress bar on home page (needs to be split from common.js at some point). background updates are done every 5 seconds.
Added:
trunk/server/HTML/EN/ajaxHome.txt
Modified:
trunk/server/HTML/Default/pageheader.html
trunk/server/HTML/EN/home.html
trunk/server/HTML/EN/html/common.js
trunk/server/HTML/EN/html/global.js
trunk/server/HTML/EN/status_list.html
Modified: trunk/server/HTML/Default/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Default/pageheader.html?rev=11140&r1=11139&r2=11140&view=diff
==============================================================================
--- trunk/server/HTML/Default/pageheader.html (original)
+++ trunk/server/HTML/Default/pageheader.html Sat Jan 6 14:34:51 2007
@@ -14,6 +14,8 @@
</style>
<![endif]-->
+ <script type="text/javascript" src="[% webroot %]html/prototype.js" ></script>
+ <script TYPE="text/javascript" language="JavaScript">[% PROCESS html/global.js %]</script>
[% PROCESS html/common.js %]
</head>
<body [% bodyscript %]>
@@ -42,4 +44,4 @@
<div id="pageHeaderInfo">
[% pageHeaderInfo %]
</div>
- [% END %]
+ [% END %]
Added: trunk/server/HTML/EN/ajaxHome.txt
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/ajaxHome.txt?rev=11140&view=auto
==============================================================================
--- trunk/server/HTML/EN/ajaxHome.txt (added)
+++ trunk/server/HTML/EN/ajaxHome.txt Sat Jan 6 14:34:51 2007
@@ -1,0 +1,9 @@
+
+# get the name of the current progress status
+[% IF progress.name %]
+progressname|[% progress.name _ "_PROGRESS" | string %]
+[% END %]
+
+# grab the object
+progressbar|[% progress.bar %]
+
Modified: trunk/server/HTML/EN/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/home.html?rev=11140&r1=11139&r2=11140&view=diff
==============================================================================
--- trunk/server/HTML/EN/home.html (original)
+++ trunk/server/HTML/EN/home.html Sat Jan 6 14:34:51 2007
@@ -1,8 +1,13 @@
+[%- IF ajaxRequest -%]
+ <pre>
+ [% PROCESS ajaxHome.txt %]
+ </pre>
+[%- ELSE -%]
[% FILTER null %]
[% pagetitle = "HOME" | string; noSpacer = 1; noHomeLink = 1 %]
[% IF warn %]
- [% bodyscript = 'onload="doLoad();"' %]
+ [% bodyscript = 'onload="doLoad(1);"' %]
[% END %]
[% pageHeaderMenu = BLOCK %]
@@ -26,10 +31,8 @@
[% 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 id="progressName"></div>
+ <a href="[% webroot %]progress.html?type=importer"><span id="progressBar" >[% progress.bar %]</span></a>
<div class="homeMenuSection">
<div>[% "BROWSE_MUSIC" | string | upper %]</div>
@@ -98,3 +101,4 @@
</ul>
</div>
[% PROCESS pagefooter.html %]
+[% END %]
Modified: trunk/server/HTML/EN/html/common.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/common.js?rev=11140&r1=11139&r2=11140&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/common.js (original)
+++ trunk/server/HTML/EN/html/common.js Sat Jan 6 14:34:51 2007
@@ -87,6 +87,24 @@
}
[% END %]
+function updateHome(theData) {
+ var parsedData = fillDataHash(theData);
+
+ if (parsedData['progressname']) {
+ showElements(['progressName']);
+ refreshElement('progressName', parsedData['progressname']);
+ } else {
+ hideElements(['progressName']);
+ }
+ //alert('update');
+ if (parsedData['progressbar']) {
+ showElements(['progressBar']);
+ refreshElement('progressBar', parsedData['progressbar']);
+ } else {
+ hideElements(['progressBar']);
+ }
+}
+
function ajaxRefresh() {
// add a random number to the params as IE loves to cache the heck out of
@@ -94,6 +112,19 @@
ajaxPing(args, ajaxCallback);
}
+function ajaxHomeCallback(theData) {
+
+ updateHome(theData);
+ setTimeout( "ajaxHomeRefresh()", 5 * 1000);
+}
+
+function ajaxHomeRefresh() {
+
+ // add a random number to the params as IE loves to cache the heck out of
+ var args = 'ajaxRequest=1&d=' + Math.random();
+ ajaxHomeUpdate(args, ajaxHomeCallback);
+}
+
function ajaxCallback(theData) {
// firefox needs to know we have a reponse first
@@ -106,9 +137,10 @@
} else {
// do another background ping every 60 seconds
- setTimeout( "ajaxRefresh()", 60*1000);
- }
-}
+ setTimeout( "ajaxRefresh()", 1000);
+ }
+}
+
[% BLOCK addSetupCaseLinks %]
[% IF setuplinks %]
@@ -221,7 +253,7 @@
function doLoad(useAjax) {
if (useAjax == 1) {
- setTimeout( "ajaxRefresh()", 300*1000);
+ setTimeout( "ajaxHomeRefresh()", 1000);
} else {
setTimeout( "refresh()", 300*1000);
}
Modified: trunk/server/HTML/EN/html/global.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/global.js?rev=11140&r1=11139&r2=11140&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/global.js (original)
+++ trunk/server/HTML/EN/html/global.js Sat Jan 6 14:34:51 2007
@@ -80,6 +80,23 @@
});
}
+function ajaxHomeUpdate(params, action) {
+ var requesttype = 'post';
+
+ if (window.XMLHttpRequest) {
+ requesttype = 'get';
+ }
+
+ var myAjax = new Ajax.Request(
+ 'home.html',
+ {
+ method: requesttype,
+ postBody: params,
+ parameters: params,
+ onComplete: action,
+ requestHeaders:['Referer', document.location.href]
+ });
+}
// Parse the raw data and return the requested hash.
// if data is already parsed, just return unprocessed.
Modified: trunk/server/HTML/EN/status_list.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/status_list.html?rev=11140&r1=11139&r2=11140&view=diff
==============================================================================
--- trunk/server/HTML/EN/status_list.html (original)
+++ trunk/server/HTML/EN/status_list.html Sat Jan 6 14:34:51 2007
@@ -1,7 +1,19 @@
[% IF item.currentsong %]<a name="currentsong"></a>[% END %]
<div [% IF item.odd %]class="odd"[% END %] [% IF not item.odd %]class="even"[% END %] [% IF item.currentsong %]id="currentListItem"[% END %]>
<div class="browsedbListItem">
- [% PROCESS trackinfo %]
+ [% IF item.currentsong %]
+ <a name="currentsong"></a>
+ <span class="exboldlisting">
+ [% ELSE %]
+ <span class="exlisting">
+ [% END %]
+ <a href="[% webroot %]songinfo.html?item=[% item.itemobj.id %]&player=[% playerURI %]" target="browser">[% item.title | html %]</a>
+ [% IF item.includeAlbum && item.itemobj.album && item.itemobj.album.title != item.noAlbum && item.itemobj.album.title != "" %]
+ [% "FROM" | string %]
+ <a href="[% webroot %]browsedb.html?hierarchy=album,track&level=1&album.id=[% item.itemobj.album.id %]&player=[% playerURI %]" target="browser">[% item.itemobj.album.title | html %]</a>
+ [% END %]
+ [% IF item.includeArtist && item.artist && item.artist != item.noArtist; PROCESS artistsAsHTML.html itemobj = item.itemobj; END %]
+ </span>
<div class="playlistControls">
[% PROCESS playlistcontrols
num = item.num
More information about the checkins
mailing list