Changeset e8d21bac58db151b8258b9fa9fe1db9a8d3fd25c

Show
Ignore:
Timestamp:
06/29/09 15:18:13 (5 years ago)
Author:
Umar Farooq <umar@omniti.com>
git-committer:
Umar Farooq <umar@omniti.com> 1246288693 +0000
git-parent:

[64bf0a4b3e3066eae6c0fd9dd3a87b9d8933fffb]

git-author:
Umar Farooq <umar@omniti.com> 1246288693 +0000
Message:

adding polltime slider to graph editor, and fixing modal slider, refs #146

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • ui/web/htdocs/css/style.css

    r21720f4 re8d21ba  
    933933padding: 10px; 
    934934} 
     935.stream_controls #osliderg{ 
     936position: relative; 
     937left:120px; 
     938top:-14px; 
     939width: 177px; 
     940} 
     941.stream_controls div#osliderg div#polltimeg{ 
     942position: relative; 
     943left:120px; 
     944top:-14px; 
     945width: 60px; 
     946} 
     947.stream_controls div.ui-slider-horizontal{ 
     948width: 100px; 
     949} 
    935950.stream_controls #oslider{ 
    936951position: relative; 
    937952left:120px; 
    938953top:-14px; 
     954width: 177px; 
    939955} 
    940956.stream_controls div#oslider div#polltime{ 
     
    942958left:120px; 
    943959top:-14px; 
     960width: 60px; 
    944961} 
    945962.stream_controls div.ui-slider-horizontal{ 
  • ui/web/htdocs/graph_panel.inc

    r21720f4 re8d21ba  
    391391<span id="play_pause_graph">PLAY</span> 
    392392<span id="stopstream_graph">STOP</span> 
     393<div id="osliderg"> 
     394<div id="pollsliderg"></div> 
     395<div id="polltimeg"></div> 
     396</div> 
    393397</span> 
    394398<span class="editGraph">Edit Graph</span> 
     
    461465        update_current_graph(true); 
    462466       }); 
     467 
     468       $("#polltimeg").html(polltime+" ms"); 
     469 
     470       $("#pollsliderg").slider({orientation: 'horizontal', value: polltime, max: 10000, min: 1000, step: 1000, 
     471            change: function (event, ui) {   
     472                       polltime = $(this).slider('option', 'value');  
     473                $("#polltimeg").html(polltime+" ms"); 
     474                if(streaming) { 
     475                    streaming = false; 
     476                    $('#streambox').html(''); 
     477                    $("#play_pause_graph").html('PAUSE'); 
     478                    stream_data(graphinfo.id, maingraph, $('#streambox')); 
     479                } 
     480              }                  
     481        }); 
    463482 
    464483        $("#graph_datetool .btn-slide").click(function(){ 
  • ui/web/htdocs/js/recon.js

    r21720f4 re8d21ba  
    10381038    var mheader = $("<div id='stream-modal-header'>").append(dtool); 
    10391039 
     1040    mheader.append("<span class='zoomClose'>x</span>") 
    10401041    mheader.append(get_stream_controls()); 
    1041     mheader.append("<span class='zoomClose'>x</span>") 
     1042 
    10421043 
    10431044    stream_graph.prepend(mheader);