Merge branch 'stable-3.x'

[ypp-sc-tools.db-live.git] / yarrg / web / query_age

diff --git a/yarrg/web/query_age b/yarrg/web/query_age
index e0591e3a20f69573fd72195366c1d17834b9b591..a02187eae01d1b85988382f3e82bc538c6ba010f 100644 (file)
--- a/yarrg/web/query_age
+++ b/yarrg/web/query_age
@@ -85,29 +85,13 @@ $sth->execute();
 % }
 </table>
 
-<& tabsort, table => 'ts_table', rowclass => 'datarow', cols => [
-       {}, {},
-       { DoReverse => 1,
-         Numeric => 1,
-         SortKey => "da_ages[rowid]" }]
-  &>
-
-<p>
-Time since this page loaded:
-<span id="cid_loaded">(not known; times above not updating)</span>
-
-<form action="lookup" method="get">
-<input type=submit name=submit value="Reload">
-<& "lookup:formhidden", ours => sub { 0; } &>
-</form>
-
+<& SELF:dataages, id2age => \%da_ages, elemidprefix => "'c'+" &>
 <%method dataages>
 <%args>
   $id2age
   $elemidprefix => ''
 </%args>
 <&| script &>
-  da_ages= <% to_json_protecttags($id2age) %>;
   function da_Refresh() {
     var now= Date.now();
     debug('updating now='+now);
@@ -116,29 +100,32 @@ Time since this page loaded:
       var el= document.getElementById(<% $elemidprefix %>ageid);
       var age= oldage + (now - da_pageload) / 1000;
       var newhtml= <% meta_prettyprint_age('age','Math.floor','+') %>;
-% if ($ARGS{debug}) {
-      if (elemid == 'cid_loaded')
-       debug('element ageid='+ageid+' oldage='+oldage
-               +' age='+age+': '+newhtml);
-% }
       el.innerHTML= newhtml;
     }
   }
+  da_ages= <% to_json_protecttags($id2age) %>;
+  window.setInterval(da_Refresh, 10000);
+  register_onload(da_Refresh);
 </&>
 </%method>
 
-<& SELF:dataages, id2age => \%da_ages, elemidprefix => "'c'+" &>
-
-<&| script &>
+<&| tabsort, table => 'ts_table', rowclass => 'datarow', cols => [
+       {}, {},
+       { DoReverse => 1,
+         Numeric => 1,
+         SortKey => "da_ages[rowid]" }]
+  &>
   ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
+</&tabsort>
 
-  function all_onload() {
-    ts_onload__ts_table();
-    da_Refresh();
-  }
-  window.onload= all_onload;
-  window.setInterval(da_Refresh, 10000);
-</&script>
+<p>
+Time since this page loaded:
+<span id="cid_loaded">(not known; times above not updating)</span>
+
+<form action="lookup" method="get">
+<input type=submit name=submit value="Reload">
+<& "lookup:formhidden", ours => sub { 0; } &>
+</form>
 
 <%init>
 use POSIX;