Changeset fcb3fa507d5b857295aaf9bbbc9a4b079e494224

Timestamp:

03/20/09 02:13:11 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1237515191 +0000

git-parent:

[597eebf2073ce9855ef97c5d1254358b695a6160]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1237515191 +0000

Message:

first step of javascript consolidation

Files:

• ui/web/htdocs/graph_panel.inc (modified) (1 diff)
• ui/web/htdocs/hugeness.php (deleted)
• ui/web/htdocs/index.php (modified) (3 diffs)
• ui/web/htdocs/js/recon.js (modified) (6 diffs)
• ui/web/htdocs/js/reconui.js (added)
• ui/web/htdocs/search_saved_graphs.inc (modified) (1 diff)
• ui/web/htdocs/search_simple.inc (modified) (1 diff)
• ui/web/htdocs/thumb.inc (deleted)
• ui/web/htdocs/worksheet_panel.inc (modified) (2 diffs)
• ui/web/htdocs/ws_search_graphs.inc (modified) (1 diff)
• ui/web/htdocs/ws_search_simple.inc (modified) (1 diff)

ui/web/htdocs/graph_panel.inc

@@ -1 @@
-<script type="text/javascript" src="js/eye/datepicker.js"></script>
-<script type="text/javascript" src="js/eye/colorpicker.js"></script>
-<script type="text/javascript" src="js/eye/eye.js"></script>
-<script type="text/javascript" src="js/eye/utils.js"></script>
-<script type="text/javascript" src="js/jquery.timers.js"></script>
-<script type="text/javascript" src="js/jquery.ajaxq-0.0.1.js" ></script>
-<script type="text/javascript">
-<!--

ui/web/htdocs/index.php

@@ -19 +19 @@
-<script src="js/jquery.treeview.js" type="text/javascript"></script>
-<script src="js/jquery.treeview.async.js" type="text/javascript"></script>
+<script src="js/eye/datepicker.js" type="text/javascript"></script>
+<script src="js/eye/eye.js" type="text/javascript"></script>
+<script src="js/eye/utils.js" type="text/javascript"></script>
+<script src="js/jquery.timers.js" type="text/javascript"></script>
+<script src="js/jquery.ajaxq-0.0.1.js" type="text/javascript"></script>
+<script src="js/eye/datepicker.js" type="text/javascript"></script>
+<script src="js/eye/colorpicker.js" type="text/javascript"></script>
+<script src="js/eye/eye.js" type="text/javascript"></script>
+<script src="js/eye/utils.js" type="text/javascript"></script>
+<script src="js/jquery.timers.js" type="text/javascript"></script>
+<script src="js/jquery.ajaxq-0.0.1.js" type="text/javascript"></script>
-<script src="js/recon.js" type="text/javascript"></script>
-
@@ -38 +49 @@
-<![endif]-->
-
-<!--accordion-->
-<script type="text/javascript">
-$(document).ready(function(){
-   $(".accordion h3:first").addClass("active");
-   $(".accordion span").slideUp();
-   $(".accordion span:first").slideDown();
-
-   $("div#content > div:first").siblings().slideUp();
-
-   $(".accordion h3").click(function(){
-       $(this).next("span").slideToggle("normal")
-       .siblings("span:visible").slideUp("normal");
-       $(this).toggleClass("active");
-       $(this).siblings("h3").removeClass("active");
-       $(this).siblings("h3").each(function(e) {
-         $("#" + $(this).attr("id") + "_panel").slideUp("fast");
-       });
-       if($(this).hasClass("active"))
-         $("#" + $(this).attr("id") + "_panel").slideDown("fast");
-       else
-         $("#" + $(this).attr("id") + "_panel").slideUp("fast");
-   });
-
-}); 
-</script>
-
-   <script type="text/javascript">
-        jQuery(document).ready(function(){
-            $("#targets").treeview({
-              url: "json/ds/remote_address/target/name/metric_name",
-              params: {} // will become hash, indexed by id, of url params
-              })
-        });
-    </script>
-
-   <script type="text/javascript">
-        jQuery(document).ready(function(){
-            $("#templates").treeview({
-              url: "json/templates/templateid/targetname/sid",
-              params: {}
-              })
-        });
-    </script>
-
-<!-- search tabs -->
-<script type="text/javascript">
-        $(function () {
-                var tabContainers = $('div.tabs > div');
-                tabContainers.hide().filter(':first').show();
-                
-                $('div.tabs ul.tabNavigation a').click(function () {
-                        tabContainers.hide();
-                        tabContainers.filter(this.hash).show();
-                        $('div.tabs ul.tabNavigation a').removeClass('selected');
-                        $(this).addClass('selected');
-                        return false;
-                }).filter(':first').click();
-
-                var wstabContainers = $('div.ws-tabs > div');
-                wstabContainers.hide().filter(':first').show();
-                
-                $('div.ws-tabs ul.tabNavigation a').click(function () {
-                        wstabContainers.hide();
-                        wstabContainers.filter(this.hash).show();
-                        $('div.ws-tabs ul.tabNavigation a').removeClass('selected');
-                        $(this).addClass('selected');
-                        return false;
-                }).filter(':first').click();
-        });
-</script>
-
-<!-- math box -->
-</head>
-
@@ -138 +77 @@
-        </div><!-- end content -->
-</div><!-- end container -->
+<script src="js/reconui.js" type="text/javascript"></script>
-</body>
-</html>

ui/web/htdocs/js/recon.js

@@ -62 +62 @@
-        s.unshift(Math.log(s.shift())); break;
-      case 'round':
-s.shift(
+Math.pow(10,s.shift()
-        l = s.shift();
-l, r)
+r * l)/r
-        break;
-      case 'floor':
@@ -116 +116 @@
-          case 1000000000: meta.suffix = 'G'; break;
-          case 1000000000000: meta.suffix = 'T'; break;
-c
+x
-        }
-        s.unshift( s.shift() / units );
@@ -374 +374 @@
-            if(items && items.length) {
-              // Emulate opacity on white
-
+ {
-                $('<div class="tooltip"></div>').appendTo($('body'));
+                $("div.tooltip")
+                  .hover(function() {},
+                         function() { $("div.tooltip").remove(); });
+              }
-              $("div.tooltip")
-                .css( { top: items[0].pageY - 15,
@@ -392 +396 @@
-                                        .join(',') +
-                  ')';
+                var val = items[i].datapoint[1];
+                if(items[i].series.dataManip) {
+                  var meta = { _max: val };
+                  val = items[i].series.dataManip(val, meta);
+                  if(meta.suffix) val = val + meta.suffix;
+                }
-                var tt = $('<div><div/>')
-items[i].datapoint[1]
+val
-                  .css( { backgroundColor: soft });
-                tt.appendTo($("div.tooltip"));
@@ -467 +477 @@
-}
-function ws_search_summary(r) {
+  if(r.count > 0 && r.query == '') return '';
-  return r.count + ' worksheet' + (r.count == 1 ? '' : 's' ) + ' found for \'' + htmlentities(r.query) + '\'';
-}
-function graph_search_summary(r) {
+  if(r.count > 0 && r.query == '') return '';
-  return r.count + ' graph' + (r.count == 1 ? '' : 's' ) + ' found for \'' + htmlentities(r.query) + '\'';
-}
-function datapoint_search_summary(r) {
+  if(r.count > 0 && r.query == '') return '';
-  return 'Found ' + r.count + ' data point' + (r.count == 1 ? '' : 's' ) + ' found for \'' + htmlentities(r.query) + '\'';
-}
@@ -639 +652 @@
-  li.append(a);
-}
+
+///////////////////////////
+// Worksheet manipulation
+//////////////////////////
+
+var ws_displayinfo = { start : 14*86400, cnt: '100', end: '' };
+var wsinfo = {};
+var locked = true;
+var streaming = false;
+var stream_graph;
+var time_windows = { '6h' : 3600*6,
+                                '12h' : 3600*12,
+                             '1d' : 86400*1,
+                             '2d' : 86400*2,
+                             '1w' : 86400*7,
+                             '2w' : 86400*14,
+                             '4w' : 86400*28,
+                             '1y' : 86400*365,
+                           };
+
+function ws_locked(warning) {
+  if(locked) {
+    modal_warning("Worksheet Locked!", warning);
+    return locked;
+  }
+  else if($(".rememberWorksheet:visible").length != 0) {
+    modal_warning("Worksheet not saved!", "You must hit 'Remember' to continue editing.");
+    return true;
+  }
+  return locked;
+}
+
+function stream_data(graph_id) {
+
+  polltime = 1000;
+  timewindow = 300000;
+  stream_object = stream_graph;
+  stream_dirty = false;
+  stream_graph.ReconGraphPrepareStream(timewindow, polltime);
+
+
+//setup functionality so that every second check if we are streaming and dirty, plot if true
+  stream_graph.everyTime(1000, function() {
+    if(!streaming) {
+     $('#streambox').html('');
+     $(".stream-log").attr("style", "display:none;");
+     stream_graph.stopTime();
+    }
+    else {
+      if(stream_dirty){
+        stream_graph.ReconGraphPlotPoints();
+        stream_dirty=false;
+      }
+    }
+  });
+
+  $.getJSON("json/graph/info/" + graph_id,
+    function(g) {
+
+      sids = "";
+      var sidneed = new Object();
+
+      for(var i=0; i<g.datapoints.length; i++) {
+        if(g.datapoints[i].sid) {
+          sidneed[g.datapoints[i].sid] = polltime;
+        }
+      }
+      for(var sid in sidneed) {
+        sids+= "/"+sid+"@"+sidneed[sid];
+      }
+
+       //console.log("sids requestd from noit server = ", sids);
+       $('#streambox').html('<iframe src="http://bob.office.omniti.com/data'+sids+'"></iframe>');
+   });
+}
+
+function make_ws_graph(g) {
+    var o = $('<div></div>').ReconGraph(g);
+
+    zb = $("<li class='zoomGraph' id='Zoom-"+g.graphid+"'><img src='images/zoom_icon.png'></li>");
+    zb.attr("graphid", g.graphid);
+    zb.attr("graphtype", g.type);
+    zb.click(function() { zoom_modal($(this).attr("graphid"), $(this).attr("graphtype")); });
+    mb = $("<li class='moveGraph' id='Move-"+g.graphid+"'><img src='images/drag_icon.png'></li>");
+    rb = $("<li class='deleteWorksheetGraph' id='Remove-"+g.graphid+"'><img src='images/remove_icon.png'></li>");
+    rb.attr("graphid", g.graphid);
+    rb.click( function() {
+                  $.getJSON('json/worksheet/deletegraph/' + wsinfo.id + '/' + $(this).attr("graphid"),
+                     function(r) { if(r.error) { $("#ws-tool-error").html(r.error).fadeIn('fast');  } });
+                  $("#"+$(this).attr("graphid")).remove();
+               });
+
+    var ws_tbar = $('<div class="ws-toolbar"></div>').append("<ul/>").append(zb).append(mb).append(rb);
+
+    ws_tbar.attr("style", "display:none;");
+
+    o.prepend(ws_tbar);
+    o.mouseover(
+              function() {
+                 o.attr("style", "outline: 1px solid #DDDDDD;");
+                 ws_tbar.removeAttr("style");
+              });
+    o.mouseout(
+              function() {
+                o.removeAttr("style");
+                ws_tbar.attr("style", "display:none;");
+              });
+
+    return o;
+}
+
+function zoom_modal (id, gtype) {
+  stream_graph = $('<div></div>').ReconGraph({graphid: id, type: gtype});
+  var smod = stream_graph.modal({
+      containerId: 'StreamingModalContainer',
+      close: 'true',
+      overlayCss: {
+        backgroundColor: '#000000',
+        cursor: 'wait'
+        },
+      containerCss: {
+        backgroundColor: '#FFFFFF',
+        left: '30%',
+        top: '10%',
+        border: '2px solid #000000',
+        padding: '5px'
+      },
+  });
+  stream_graph.ReconGraphRefresh({graphid: id});
+
+
+ var dtool =  $("<div id='mini_ws_datetool'>");
+dtool.append('<div class="zoom"> \
+                <dl> \
+                        <dt>Zoom:</dt> \
+                        <dd><a href="#" class="first datechoice">1d</a></dd> \
+                        <dd><a href="#" class="datechoice">2d</a></dd> \
+                        <dd><a href="#" class="datechoice">1w</a></dd> \
+                        <dd><a href="#" class="selected datechoice">2w</a></dd> \
+                        <dd><a href="#" class="datechoice">4w</a></dd> \
+                        <dd><a href="#" class="datechoice">1y</a></dd> \
+                </dl>\
+        </div>\
+</div>');
+
+  var mheader = $("<div id='stream-modal-header'>").append(dtool);
+  mheader.append("<span class='zoomClose'>x</span>");
+  mheader.append("<span class='zoomStream'>Stream Data</span><br>");
+
+  stream_graph.prepend(mheader);
+
+  stream_graph.append("<div class='stream-log' style='display:none'></div>");
+  $(".zoomClose").click(function() {
+     streaming = false;
+     $('#streambox').html('');
+     smod.close();
+  });
+
+  $(".zoomStream").click(function() {
+     if(!streaming) {
+         streaming = true;
+         $(".zoomStream").html('Streaming!').fadeIn('slow');
+         $(".stream-log").removeAttr("style").html("stream log_");
+         stream_data(id);
+     }
+     else if(streaming) {
+         streaming = false;
+         $('#streambox').html('');
+         $(".zoomStream").html('Stream Data').fadeIn('slow');
+         $(".stream-log").attr("style", "display:none;");
+         stream_graph.ReconGraphRefresh({graphid: id});
+    }
+ }); //end stream click function
+
+$("#mini_ws_datetool .datechoice").click(function(){
+        $(".datechoice").removeClass("selected");
+        $(this).addClass("selected");
+        stream_graph.ReconGraphRefresh({graphid: id, start: time_windows[$(this).html()], end: ''});
+        return false;
+});
+
+}//end zoom_modal
+
+function lock_wforms() {
+  $("h2#worksheetTitle").unbind();
+  $("ul#worksheet-graphs").unbind();
+  $(".ws-toolbar-edit").attr("class","ws-toolbar");
+}
+
+function unlock_wforms() {
+  $("h2#worksheetTitle").editable(function(value, settings) {
+         wsinfo.title = value;
+         update_current_worksheet();
+         return(value);
+       }, { });
+
+  var ul = $("ul#worksheet-graphs");
+  ul.sortable({ handle: '.moveGraph',
+                scroll: true,
+                stop:
+                  function (e,ui) {
+                    wsinfo.graphs = new Array();
+                    ui.item.parent().find("> li > div").each(
+                      function(i) {
+                        wsinfo.graphs.push($(this).attr("id"));
+                      }
+                    );
+                    update_current_worksheet();
+                  }
+              });
+
+  $(".ws-toolbar").attr("class","ws-toolbar-edit");
+}//end unlock_wforms
+
+function update_current_worksheet(f) {
+  var str = JSON.stringify(wsinfo);
+  $.post("json/worksheet/store",
+         {'json':str},
+         function(d) {
+           wsinfo.id = d.id;
+           if(d.error) $("#ws-tool-error").html(d.error).fadeIn('fast');
+           else $("#ws-tool-error").fadeOut('fast');
+           if(wsinfo.id && wsinfo.title && wsinfo.saved != true &&
+              $(".rememberWorksheet:visible").length == 0) {
+             wsinfo.saved = false;
+             $(".rememberWorksheet").html('"Remember" this worksheet.').fadeIn('slow');
+             lock_wforms();
+             modal_warning("Worksheet not saved!", "You must hit 'Remember' to continue editing.");
+             $(".rememberWorksheet").click(function() {
+               wsinfo.saved = true;
+               update_current_worksheet(function(r) {
+                 if(r.error) wsinfo.saved = false;
+                 else {
+                    $(".rememberWorksheet").html('Remebered').fadeOut('slow');
+                    unlock_wforms();
+                 }
+               });
+             });
+           }
+           if(f) f(d);
+         }, 'json');
+}
+
+function process_worksheet_json(r) {
+  wsinfo.id = r.sheetid;
+  wsinfo.title = r.title;
+  wsinfo.graphs = new Array();
+
+  var ul = $("ul#worksheet-graphs");
+  $("h2#worksheetTitle").html(r.title);
+  ul.empty();
+  for(var i = 0; i < r.graphs.length; i++) {
+    var g = {};
+    g.graphid = r.graphs[i];
+    g.start = ws_displayinfo.start;
+    g.end = ws_displayinfo.end;
+    g.cnt = ws_displayinfo.cnt;
+
+    $.getJSON("json/graph/info/" + g.graphid,
+        function (j) {
+            g.type = j.type;
+            g.graphid = j.id;
+            var o = make_ws_graph(g);
+            ul.append($('<li/>').append(o));
+            o.ReconGraphRefresh();
+            wsinfo.graphs.push(g.graphid);
+         });
+
+  }
+  ul.sortable("refresh");
+}
+
+function add_graph_to_worksheet(graphid) {
+  if(!ws_locked("Click 'Edit Worksheet' to unlock.")){
+    for(var i = 0; wsinfo.graphs && (i < wsinfo.graphs.length); i++) {
+      if(wsinfo.graphs[i]==graphid) {
+         modal_warning("", "Worksheets cannot have duplicate graphs!");
+         return;
+      }
+    }
+    var g = { start: ws_displayinfo.start,
+              end: ws_displayinfo.end,
+              cnt: ws_displayinfo.cnt,
+              graphid: graphid };
+
+     $.getJSON("json/graph/info/" + g.graphid,
+        function (j) {
+            g.type = j.type;
+            g.graphid = j.id;
+            var o = make_ws_graph(g);
+            var ul = $("ul#worksheet-graphs");
+            ul.append($('<li/>').append(o));
+            o.ReconGraphRefresh();
+            ul.sortable("refresh");
+            if(!wsinfo.graphs) {wsinfo.graphs = new Array();}
+            wsinfo.graphs.push(graphid);
+            update_current_worksheet();
+            unlock_wforms();
+        });
+  }
+
+}
+function refresh_worksheet() {
+  var g = { start: ws_displayinfo.start,
+            end: ws_displayinfo.end,
+            cnt: ws_displayinfo.cnt };
+  $("ul#worksheet-graphs > li > div").ReconGraphRefresh(g);
+}
+function load_worksheet(id) {
+  if(id==null) {
+    wsinfo.saved = false;
+    locked = false;
+    unlock_wforms();
+    $(".editWorksheet").html('Editing!').fadeIn('slow');
+    process_worksheet_json({graphs: [], title:'Worksheet Title (click to edit)', sheetid: ''});
+  }
+  else {
+    wsinfo.saved = true;
+    locked = true;
+    lock_wforms();
+    $(".editWorksheet").html('Edit Worksheet').fadeIn('slow');
+    $.getJSON("json/worksheet/info/" + id, process_worksheet_json);
+  }
+}

ui/web/htdocs/search_saved_graphs.inc

@@ -1 @@
-<script type="text/javascript">
-<!--
-$(document).ready(function(){
-        $("#graph-searchform").submit(function() {
-                perform_graph_search_edit({ 'domid': '#graphlist',
-                                            'search': $("#graph-searchinput").val(),
-                                            'offset': 0,
-                                            'limit': 25 });
-                return false;
-        });
-});
--->
-</script>
-<h4 id="graph-searchterms"></h4>
-<div id="graph-searchform-container" style="margin:.5em 0 2em 0;padding-bottom:1em;border-bottom: solid 1px #e6e4e5;">

ui/web/htdocs/search_simple.inc

@@ -1 @@
-<script type="text/javascript">
-<!--
-$(document).ready(function(){
-        $("#datapoint-searchform").submit(function() {
-                perform_datapoint_search_add({ domid: '#searchlist',
-                                               search: $("#searchinput").val(),
-                                               offset: 0,
-                                               limit: 25 });
-                return false;
-        });
-});
--->
-</script>
-<h4 id="searchterms"></h4>
-<div id="datapoint-searchform-container" style="margin:.5em 0 2em 0;padding-bottom:1em;border-bottom: solid 1px #e6e4e5;">

ui/web/htdocs/worksheet_panel.inc

@@ -1 @@
-<script type="text/javascript" src="js/eye/datepicker.js"></script>
-<script type="text/javascript" src="js/eye/eye.js"></script>
-<script type="text/javascript" src="js/eye/utils.js"></script>
-<script type="text/javascript" src="js/jquery.timers.js"></script>
-<script type="text/javascript" src="js/jquery.ajaxq-0.0.1.js" ></script>
-<script type="text/javascript">
-<!--
-
-var ws_displayinfo = { start : 14*86400, cnt: '100', end: '' };
-var wsinfo = {};
-var locked = true;
-var streaming = false;
-var stream_graph;
-var time_windows = { '6h' : 3600*6,
-                                '12h' : 3600*12,
-                             '1d' : 86400*1,
-                             '2d' : 86400*2,
-                             '1w' : 86400*7,
-                             '2w' : 86400*14,
-                             '4w' : 86400*28,
-                             '1y' : 86400*365,
-                           };
-
-function ws_locked(warning) {           
-  if(locked) {
-    modal_warning("Worksheet Locked!", warning);
-    return locked;
-  }
-  else if($(".rememberWorksheet:visible").length != 0) {
-    modal_warning("Worksheet not saved!", "You must hit 'Remember' to continue editing.");
-    return true;
-  }
-  return locked;
-}
-
-function stream_data(graph_id) {
-
-  polltime = 1000;
-  timewindow = 300000;
-  stream_object = stream_graph;
-  stream_dirty = false;
-  stream_graph.ReconGraphPrepareStream(timewindow, polltime);
-
-
-//setup functionality so that every second check if we are streaming and dirty, plot if true
-  stream_graph.everyTime(1000, function() {
-    if(!streaming) {   
-     $('#streambox').html('');
-     $(".stream-log").attr("style", "display:none;");
-     stream_graph.stopTime();
-    }
-    else {
-      if(stream_dirty){
-        stream_graph.ReconGraphPlotPoints();     
-        stream_dirty=false;
-      }
-    }
-  });
-
-  $.getJSON("json/graph/info/" + graph_id, 
-    function(g) {
-
-      sids = ""; 
-      var sidneed = new Object();
-
-      for(var i=0; i<g.datapoints.length; i++) {
-        if(g.datapoints[i].sid) {
-          sidneed[g.datapoints[i].sid] = polltime;
-        }
-      }
-      for(var sid in sidneed) {
-        sids+= "/"+sid+"@"+sidneed[sid];
-      }
-
-       //console.log("sids requestd from noit server = ", sids);
-       $('#streambox').html('<iframe src="http://bob.office.omniti.com/data'+sids+'"></iframe>');
-   });
-
-}
-
-function make_ws_graph(g) {
-    var o = $('<div></div>').ReconGraph(g);
-
-    zb = $("<li class='zoomGraph' id='Zoom-"+g.graphid+"'><img src='images/zoom_icon.png'></li>");
-    zb.attr("graphid", g.graphid);
-    zb.attr("graphtype", g.type);
-    zb.click(function() { zoom_modal($(this).attr("graphid"), $(this).attr("graphtype")); });
-    mb = $("<li class='moveGraph' id='Move-"+g.graphid+"'><img src='images/drag_icon.png'></li>");    
-    rb = $("<li class='deleteWorksheetGraph' id='Remove-"+g.graphid+"'><img src='images/remove_icon.png'></li>");
-    rb.attr("graphid", g.graphid);
-    rb.click( function() {
-                  $.getJSON('json/worksheet/deletegraph/' + wsinfo.id + '/' + $(this).attr("graphid"),
-                     function(r) { if(r.error) { $("#ws-tool-error").html(r.error).fadeIn('fast');  } });
-                  $("#"+$(this).attr("graphid")).remove();
-               });
-
-    var ws_tbar = $('<div class="ws-toolbar"></div>').append("<ul/>").append(zb).append(mb).append(rb);
-
-    ws_tbar.attr("style", "display:none;");
-
-    o.prepend(ws_tbar);
-    o.mouseover(                  
-              function() { 
-                 o.attr("style", "outline: 1px solid #DDDDDD;"); 
-                 ws_tbar.removeAttr("style");
-              }); 
-    o.mouseout( 
-              function() { 
-                o.removeAttr("style");
-                ws_tbar.attr("style", "display:none;");
-              });
-
-    return o;
-}
-
-function zoom_modal (id, gtype) {
-  stream_graph = $('<div></div>').ReconGraph({graphid: id, type: gtype});
-  var smod = stream_graph.modal({
-      containerId: 'StreamingModalContainer',
-      close: 'true',
-      overlayCss: {
-        backgroundColor: '#000000',
-        cursor: 'wait'
-        },
-      containerCss: {
-        backgroundColor: '#FFFFFF',
-        left: '30%',
-        top: '10%',
-        border: '2px solid #000000',
-        padding: '5px'
-      },
-  });
-  stream_graph.ReconGraphRefresh({graphid: id});
-
-
- var dtool =  $("<div id='mini_ws_datetool'>");
-dtool.append('<div class="zoom"> \
-                <dl> \
-                        <dt>Zoom:</dt> \
-                        <dd><a href="#" class="first datechoice">1d</a></dd> \
-                        <dd><a href="#" class="datechoice">2d</a></dd> \
-                        <dd><a href="#" class="datechoice">1w</a></dd> \
-                        <dd><a href="#" class="selected datechoice">2w</a></dd> \
-                        <dd><a href="#" class="datechoice">4w</a></dd> \
-                        <dd><a href="#" class="datechoice">1y</a></dd> \
-                </dl>\
-        </div>\
-</div>');
-
-  var mheader = $("<div id='stream-modal-header'>").append(dtool);
-  mheader.append("<span class='zoomClose'>x</span>");
-  mheader.append("<span class='zoomStream'>Stream Data</span><br>");
-
-  stream_graph.prepend(mheader);
-
-  stream_graph.append("<div class='stream-log' style='display:none'></div>");
-  $(".zoomClose").click(function() {
-     streaming = false;                        
-     $('#streambox').html('');
-     smod.close();
-  });
-
-  $(".zoomStream").click(function() {
-     if(!streaming) {
-         streaming = true;
-         $(".zoomStream").html('Streaming!').fadeIn('slow');
-         $(".stream-log").removeAttr("style").html("stream log_");
-         stream_data(id);
-     }
-     else if(streaming) {
-         streaming = false;
-         $('#streambox').html('');
-         $(".zoomStream").html('Stream Data').fadeIn('slow');
-         $(".stream-log").attr("style", "display:none;");
-         stream_graph.ReconGraphRefresh({graphid: id});
-    }
- }); //end stream click function                      
-
-$("#mini_ws_datetool .datechoice").click(function(){
-        $(".datechoice").removeClass("selected");
-        $(this).addClass("selected");
-        stream_graph.ReconGraphRefresh({graphid: id, start: time_windows[$(this).html()], end: ''});
-        return false;
-});
-
-}//end zoom_modal
-
-function lock_wforms() {
-  $("h2#worksheetTitle").unbind();
-  $("ul#worksheet-graphs").unbind();
-  $(".ws-toolbar-edit").attr("class","ws-toolbar");
-}
-         
-function unlock_wforms() {
-  $("h2#worksheetTitle").editable(function(value, settings) {
-         wsinfo.title = value;
-         update_current_worksheet();
-         return(value);
-       }, { });
-
-  var ul = $("ul#worksheet-graphs");
-  ul.sortable({ handle: '.moveGraph',
-                scroll: true,
-                stop:
-                  function (e,ui) {
-                    wsinfo.graphs = new Array();
-                    ui.item.parent().find("> li > div").each(
-                      function(i) { 
-                        wsinfo.graphs.push($(this).attr("id")); 
-                      }
-                    );
-                    update_current_worksheet();
-                  }
-              });
-
-  $(".ws-toolbar").attr("class","ws-toolbar-edit"); 
-}//end unlock_wforms
-
-function update_current_worksheet(f) {
-  var str = JSON.stringify(wsinfo);
-  $.post("json/worksheet/store",
-         {'json':str},
-         function(d) {
-           wsinfo.id = d.id;
-           if(d.error) $("#ws-tool-error").html(d.error).fadeIn('fast');
-           else $("#ws-tool-error").fadeOut('fast');
-           if(wsinfo.id && wsinfo.title && wsinfo.saved != true &&
-              $(".rememberWorksheet:visible").length == 0) {
-             wsinfo.saved = false;
-             $(".rememberWorksheet").html('"Remember" this worksheet.').fadeIn('slow');
-             lock_wforms();
-             modal_warning("Worksheet not saved!", "You must hit 'Remember' to continue editing.");
-             $(".rememberWorksheet").click(function() {
-               wsinfo.saved = true;
-               update_current_worksheet(function(r) {
-                 if(r.error) wsinfo.saved = false;
-                 else {
-                    $(".rememberWorksheet").html('Remebered').fadeOut('slow');
-                    unlock_wforms();
-                 }
-               });
-             });
-           }
-           if(f) f(d);
-         }, 'json');
-}
-  
-function process_worksheet_json(r) {
-  wsinfo.id = r.sheetid;
-  wsinfo.title = r.title;
-  wsinfo.graphs = new Array();
-
-  var ul = $("ul#worksheet-graphs");
-  $("h2#worksheetTitle").html(r.title);
-  ul.empty();
-  for(var i = 0; i < r.graphs.length; i++) {
-    var g = {};
-    g.graphid = r.graphs[i];
-    g.start = ws_displayinfo.start;
-    g.end = ws_displayinfo.end;
-    g.cnt = ws_displayinfo.cnt;
-
-    $.getJSON("json/graph/info/" + g.graphid, 
-        function (j) {
-            g.type = j.type;
-            g.graphid = j.id;
-            var o = make_ws_graph(g);
-            ul.append($('<li/>').append(o));
-            o.ReconGraphRefresh();
-            wsinfo.graphs.push(g.graphid);
-         });
-
-  }
-  ul.sortable("refresh");
-}
-
-function add_graph_to_worksheet(graphid) {
-  if(!ws_locked("Click 'Edit Worksheet' to unlock.")){
-    for(var i = 0; wsinfo.graphs && (i < wsinfo.graphs.length); i++) {
-      if(wsinfo.graphs[i]==graphid) {
-         modal_warning("", "Worksheets cannot have duplicate graphs!");
-         return;
-      }
-    }  
-    var g = { start: ws_displayinfo.start,
-              end: ws_displayinfo.end,
-              cnt: ws_displayinfo.cnt,
-              graphid: graphid };
-
-     $.getJSON("json/graph/info/" + g.graphid, 
-        function (j) {
-            g.type = j.type;
-            g.graphid = j.id;
-            var o = make_ws_graph(g);
-            var ul = $("ul#worksheet-graphs");
-            ul.append($('<li/>').append(o));
-            o.ReconGraphRefresh();
-            ul.sortable("refresh");
-            if(!wsinfo.graphs) {wsinfo.graphs = new Array();}
-            wsinfo.graphs.push(graphid);
-            update_current_worksheet();
-            unlock_wforms();
-        });
-  }
-
-}
-function refresh_worksheet() {
-  var g = { start: ws_displayinfo.start,
-            end: ws_displayinfo.end,
-            cnt: ws_displayinfo.cnt };
-  $("ul#worksheet-graphs > li > div").ReconGraphRefresh(g);
-}
-function load_worksheet(id) {
-  if(id==null) {
-    wsinfo.saved = false;
-    locked = false;
-    unlock_wforms();
-    $(".editWorksheet").html('Editing!').fadeIn('slow');
-    process_worksheet_json({graphs: [], title:'Worksheet Title (click to edit)', sheetid: ''});
-  }
-  else {
-    wsinfo.saved = true;
-    locked = true;
-    lock_wforms();
-    $(".editWorksheet").html('Edit Worksheet').fadeIn('slow');
-    $.getJSON("json/worksheet/info/" + id, process_worksheet_json);
-  }
-}
--->
-</script>
-<span class="rememberWorksheet"></span>
-<span class="blankWorksheet">New Blank</span>
@@ -334 +4 @@
-<h2 id="worksheetTitle">Worksheet Title</h2>
-<p/>
-<!-- date range box -->
-<script type="text/javascript">
-$(document).ready(function(){
-        var state = false;
-
-        $("h2#worksheetTitle").editable(function(value, settings) {
-         wsinfo.title = value;
-         update_current_worksheet();
-         return(value);
-       }, { });
-
-        $(".editWorksheet").click(function() {          
-                if(locked){
-                    locked = false;                 
-                    unlock_wforms();
-                    $(".editWorksheet").html('Editing!').fadeIn('slow');
-                }
-                else if(!locked){
-                    locked = true;      
-                    lock_wforms();
-                    $(".editWorksheet").html('Edit Worksheet').fadeIn('slow');
-                }
-        });
-
-
-        $(".blankWorksheet").click(function() {
-                load_worksheet();               
-        });
-
-        $("#ws_datetool .btn-slide").click(function(){
-                $("#ws_widgetCalendar").stop().animate({
-                     height: state ? 0 :
-                       $('#ws_widgetCalendar div.datepicker').get(0).offsetHeight
-                  }, 500);
-                state = !state;
-                $(this).toggleClass("active");
-                return false;
-        });
-        $("#ws_datetool .datechoice").click(function(){
-                $("#ws_datetool .range a.btn-slide").html("YYYY/MM/DD - YYYY/MM/DD");
-                $("#ws_widgetCalendar").slideUp("slow");
-                $(".datechoice").removeClass("selected");
-                ws_displayinfo.start = time_windows[$(this).html()];
-                ws_displayinfo.end = '';
-                $(this).addClass("selected");
-                refresh_worksheet();
-                return false;
-        });
-        $('#ws_widgetCalendar').DatePicker({
-                flat: true,
-                format: 'Y/m/d',
-                date: [new Date(), new Date()],
-                calendars: 3,
-                mode: 'range',
-                starts: 1,
-                onChange: function(formated) {
-                        var dates;
-                        dates = formated[0].split('/');
-                        var start = new Date(dates[0], dates[1]-1, dates[2], 0, 0, 0);
-                        dates = formated[1].split('/');
-                        var end = new Date((new Date(dates[0], dates[1]-1, dates[2], 0, 0, 0)).getTime() + 86400000);
-                        ws_displayinfo.start = start.toUTCString();
-                        ws_displayinfo.end = end.toUTCString();
-                        refresh_worksheet();
-                        $(".datechoice").removeClass("selected");
-                        $('#ws_datetool .range a.btn-slide').get(0).innerHTML = formated.join(' - ');
-                }
-        });
-        $("#ws-tool-error").click(function(){
-          $("#ws-tool-error").fadeOut("slow");
-        });
-
-});
-</script>
-
-<div id="ws_datetool">

ui/web/htdocs/ws_search_graphs.inc

@@ -1 @@
-<script type="text/javascript">
-<!--
-$(document).ready(function(){
-        $("#ws-graph-searchform").submit(function() {
-                perform_graph_search_add({ 'domid': '#ws-graphlist',
-                                           'search': $("#ws-graph-searchinput").val(),
-                                           'offset': 0,
-                                           'limit': 25 });
-                return false;
-        });
-});
--->
-</script>
-<h4 id="ws-graph-searchterms"></h4>
-<div id="ws-graph-searchform-container" style="margin:.5em 0 2em 0;padding-bottom:1em;border-bottom: solid 1px #e6e4e5;">
-<form id="ws-graph-searchform">
-  <fieldset>
+  <p class="explain">Enter a term to search for graphs.</p>
-  <legend style="display:none;">Search</legend>
-  <label for="keyword" style="display:none;">Keyword</label> <input type="text" id="ws-graph-searchinput" style="width:220px;" /> <input type="submit" value="Search" />

ui/web/htdocs/ws_search_simple.inc

@@ -1 @@
-<script type="text/javascript">
-<!--
-$(document).ready(function(){
-        $("#ws-searchform").submit(function() {
-                perform_ws_search_edit({ domid: '#worksheetlist',
-                                         search: $("#ws-searchinput").val(),
-                                         offset: 0,
-                                         limit: 25 });
-                return false;
-        });
-});
--->
-</script>
-<h4 id="ws-searchterms"></h4>
-<div id="ws-searchform-container" style="margin:.5em 0 2em 0;padding-bottom:1em;border-bottom: solid 1px #e6e4e5;">
-<form id="ws-searchform">
-  <fieldset>
+  <p class="explain">Enter a term to search for worksheets.</p>
-  <legend style="display:none;">Search</legend>
-  <label for="keyword" style="display:none;">Keyword</label> <input type="text" id="ws-searchinput" style="width:220px;" /> <input type="submit" value="Search" />