Interface tweaks:

Display 150 revs in the dashboard thumbnails, but full history
in the click-through graphs.  Rewrite the top-of-page title and
have it display which stat is being displayed.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4580 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/timings/graph.html b/timings/graph.html
index 82258f314415c23e5720bc53aa46ac0ba87ea598..c314dc3390b2b7c594a640f8ddb3c3134afd3356 100644 (file)
--- a/timings/graph.html
+++ b/timings/graph.html
@@ -106,11 +106,6 @@ var graph_list = [];
 var first_trace = '';
 
 var params = ParseParams();
-if (!('history' in params)) {
-  params.history = 150;
-  // make this option somewhat user discoverable :-/
-  window.location.href = MakeURL(params);
-}
 
 function jsonToJs(data) {
   return eval('(' + data + ')')
@@ -156,8 +151,8 @@ function go_to(graph) {
 
 function get_url() {
   new_url = window.location.href;
-  new_url = new_url.replace(/50/, "150");
-  new_url = new_url.replace(/\&lookout/, "");
+  new_url = new_url.replace(/\?lookout/, "?");
+  new_url = new_url.replace(/\&thumbnail/, "");
   return new_url;
 }
 
@@ -195,8 +190,11 @@ function received_summary(data, error) {
   // Parse the summary data file.
   var rows = data.split('\n');
   var max_rows = rows.length;
-  if (max_rows > params.history)
-    max_rows = params.history;
+  if ('history' in params && max_rows > params.history) {
+      max_rows = params.history;
+  } else if ('lookout' in params && max_rows > 150) {
+    max_rows = 150;
+  }
 
   var allTraces = {};
 
@@ -350,9 +348,10 @@ window.addEventListener("load", init, false);
 
 <div id="header_text">
 <script>
-document.write('Timings for the <b>' + Config.title + '</b> configuration ' +
-               'generated by the ' +
-               '<a href="' + Config.buildbotLink + '">SCons buildbot</a>.');
+document.write('<a href="' + Config.buildbotLink + '">SCons buildbot</a>' +
+               ' timings for the <b>' + Config.title + '</b> configuration.')
+if ('graph' in params)
+  document.write('  Displaying values for <b>' + params.graph + '</b>.');
 </script>
 </div>
 

diff --git a/timings/index.html b/timings/index.html
index de102ead770eca71e5184e5db076ec57b72fa9cd..407383210d45d1cef7c38ba19dc82e7564d8fb6b 100644 (file)
--- a/timings/index.html
+++ b/timings/index.html
@@ -6,11 +6,12 @@
       var perf_url = DirName(window.location.href);
       function DisplayGraph(name, heighth, width, thumbnail, graph) {
         var params = ParseParams();
-        var url = perf_url + '/' + name + '/graph.html' +
-                  '?history=50' +
-                  '&lookout';
+        var url = perf_url + '/' + name + '/graph.html' + '?lookout';
         //var debug = url;
         var debug = '';
+        if ('history' in params) {
+          url += '&history=' + params.history
+        }
         if (typeof graph == 'undefined') {
           if ('graph' in params) {
             graph = params.graph;