[Reconnoiter-devel] [reconnoiter commit] r773 - in trunk/ui/web/htdocs: . css js

svn-commit at lists.omniti.com svn-commit at lists.omniti.com
Mon Jun 29 12:21:02 EDT 2009


Author: umar
Date: 2009-06-29 12:21:02 -0400 (Mon, 29 Jun 2009)
New Revision: 773

Modified:
   trunk/ui/web/htdocs/css/style.css
   trunk/ui/web/htdocs/graph_panel.inc
   trunk/ui/web/htdocs/js/recon.js
Log:
hide pause/polltime controls until we hit play, cleanup other control toggling, needs design work on graph title and icons for play/pause controls.
refs #146

Modified: trunk/ui/web/htdocs/css/style.css
===================================================================
--- trunk/ui/web/htdocs/css/style.css	2009-06-29 15:18:13 UTC (rev 772)
+++ trunk/ui/web/htdocs/css/style.css	2009-06-29 16:21:02 UTC (rev 773)
@@ -917,7 +917,6 @@
 padding:0 4px;
 font-weight: bold;
 color:#660000;
-width: 290px;
 height: 20px;
 }
 .stream_controls #play_pause{

Modified: trunk/ui/web/htdocs/graph_panel.inc
===================================================================
--- trunk/ui/web/htdocs/graph_panel.inc	2009-06-29 15:18:13 UTC (rev 772)
+++ trunk/ui/web/htdocs/graph_panel.inc	2009-06-29 16:21:02 UTC (rev 773)
@@ -59,9 +59,12 @@
 function stop_streaming_graph (){
 	 streaming = false;
 	 $('#streambox').html('');
-	 $(".stream-log").attr("style", "display:none;");
-         $("#graph_datetool").css("display", "");
+	 $(".stream-log").hide();
+         $("#graph_datetool").show();
 	 $("#play_pause_graph").html('PLAY');
+	 $("#stopstream_graph").hide();
+	 $("#osliderg").hide();	 
+	 $(".stream_controls").width("");
 }
 //overlay mode: stackadd=false: we just add new stacks for any the incoming graph has
 //stack mode: stackadd=trule, push new stacks onto matching stack indexes, else append
@@ -390,7 +393,7 @@
 <span class="stream_controls">
 <span id="play_pause_graph">PLAY</span>
 <span id="stopstream_graph">STOP</span>
-<div id="osliderg">
+<div id="osliderg" style="display:none">
 <div id="pollsliderg"></div>
 <div id="polltimeg"></div>
 </div>
@@ -446,8 +449,12 @@
             $(this).html('PAUSE');
 	    //if we are playing for the frist time
 	    if(!streaming) {
-	      $('#graph_datetool').css("display", "none");
-	      $(".stream-log").removeAttr("style").html("stream log_");
+	      $('#graph_datetool').hide();
+	      $(".stream-log").show().html("stream log_");
+	      $("#stopstream_graph").show();
+	      $("#osliderg").show();
+	      //theres probably a better way to make sure stuff fits in the stream_controls div
+	      $(".stream_controls").width("290px");
 	    }
 	    //setup/restart the plotting
 	    stream_data(graphinfo.id, maingraph, $('#streambox'));

Modified: trunk/ui/web/htdocs/js/recon.js
===================================================================
--- trunk/ui/web/htdocs/js/recon.js	2009-06-29 15:18:13 UTC (rev 772)
+++ trunk/ui/web/htdocs/js/recon.js	2009-06-29 16:21:02 UTC (rev 773)
@@ -753,8 +753,8 @@
 
 function get_stream_controls() {
     play_pause = $("<span id='play_pause'>PLAY</span>");
-    stop = $("<span id='stopstream'>STOP</span>");
-    oslider = $("<div id='oslider'><div id='pollslider'></div><div id='polltime'>"+polltime+" ms</div></div>");
+    stop = $("<span id='stopstream' style='display:none' >STOP</span>");
+    oslider = $("<div id='oslider' style='display:none'><div id='pollslider'></div><div id='polltime'>"+polltime+" ms</div></div>");
     stream_controls = $("<div class='stream_controls'></div>").append(play_pause).append(stop).append(oslider);
     return stream_controls;
 }
@@ -776,7 +776,7 @@
     stream_graph.everyTime(2000, function() {
       if(!streaming) {
        streambox.html('');
-       $(".stream-log").attr("style", "display:none;");
+       $(".stream-log").hide();
        stream_graph.stopTime();
       }
       else {
@@ -949,10 +949,13 @@
 
     $("#stopstream").click(function() {
         streaming = false;
-	$('#mini_ws_datetool').css("display", "");
+	$("#mini_ws_datetool").show();
         $("#play_pause").html('PLAY');
         $('#streambox').html('');
-        $(".stream-log").attr("style", "display:none;");
+        $(".stream-log").hide();
+	$("#oslider").hide();
+	$(".stream_controls").width("");
+	$(this).hide();
         stream_graph.ReconGraphRefresh({graphid: ginfo.id, stacks: ginfo.stacks});
      });
 
@@ -961,8 +964,12 @@
         $(this).html('PAUSE');
 	//if we are playing for the frist time
 	if(!streaming) {
-	    $('#mini_ws_datetool').css("display", "none");
-	    $(".stream-log").removeAttr("style").html("stream log_");
+	    $('#mini_ws_datetool').hide();
+	    $(".stream-log").show().html("stream log_");
+	    //theres probably a better way to make sure stuff fits in the stream_controls div
+	    $(".stream_controls").width("290px");
+	    $("#stopstream").show();
+	    $("#oslider").show();	    
 	}
 	//setup/restart the plotting
         stream_data(ginfo.id, stream_graph, $('#streambox'));
@@ -1057,8 +1064,12 @@
         $(this).html('PAUSE');
 	//if we are playing for the frist time
 	if(!streaming) {
-	    $('#mini_ws_datetool').css("display", "none");
-	    $(".stream-log").removeAttr("style").html("stream log_");
+	    $("#mini_ws_datetool").hide();
+	    $(".stream-log").show().html("stream log_");
+	    $("#stopstream").show();
+	    $("#oslider").show();
+	    //theres probably a better way to make sure stuff fits in the stream_controls div
+    	    $(".stream_controls").width("290px");
 	}
 	//setup/restart the plotting
         stream_data(ginfo.id, stream_graph, $('#streambox'));
@@ -1072,10 +1083,13 @@
 
     $("#stopstream").click(function() {
         streaming = false;
-	$('#mini_ws_datetool').css("display", "");
+	$('#mini_ws_datetool').show();
         $("#play_pause").html('PLAY');
         $('#streambox').html('');
-        $(".stream-log").attr("style", "display:none;");
+        $(".stream-log").hide();
+	$(this).hide();
+	$("#oslider").hide();
+	$(".stream_controls").width("");
         stream_graph.ReconGraphRefresh({graphid: ginfo.id, stacks: ginfo.stacks});
      });
 



More information about the Reconnoiter-devel mailing list