[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14775 - in gauger: . css
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r14775 - in gauger: . css |
|
Date: |
Wed, 30 Mar 2011 00:12:13 +0200 |
Author: bartpolot
Date: 2011-03-30 00:12:13 +0200 (Wed, 30 Mar 2011)
New Revision: 14775
Modified:
gauger/css/style.css
gauger/template.php
gauger/template_graph.php
gauger/template_host.php
gauger/template_menu.php
Log:
Changed range display into inputs to allow precise range settings
Modified: gauger/css/style.css
===================================================================
--- gauger/css/style.css 2011-03-29 20:52:06 UTC (rev 14774)
+++ gauger/css/style.css 2011-03-29 22:12:13 UTC (rev 14775)
@@ -292,10 +292,23 @@
float: left;
}
+.input_min {
+ width: 40px;
+ border: none;
+ font-size: 90%;
+}
+
.auto_max {
float: right;
}
+.input_max {
+ width: 40px;
+ border: none;
+ font-size: 90%;
+ text-align: right;
+}
+
#norm {
position: relative;
top: 2px;
Modified: gauger/template.php
===================================================================
--- gauger/template.php 2011-03-29 20:52:06 UTC (rev 14774)
+++ gauger/template.php 2011-03-29 22:12:13 UTC (rev 14775)
@@ -47,31 +47,29 @@
max: <?php echo get_session('xrange_max', '100') ?>,
values: [ <?php echo get_session('x_min',
get_session('xrange_min', '0')) ?> , <?php echo get_session('x_max',
get_session('xrange_max', '100')) ?> ],
slide: function( event, ui ) {
- if(this.id == "default_range_slider") {
-
$(this).parents(".slider_control").find(".left-range").html(ui.values[0]);
-
$(".side_slider_control").find(".left-range").html(ui.values[0]);
-
$(this).parents(".slider_control").find(".right-range").html(ui.values[1]);
-
$(".side_slider_control").find(".right-range").html(ui.values[1]);
- if($(this).slider('values', 0) !=
ui.values[0]) {
- $( ".auto_min" ).attr('checked',
false);
- }
- if($(this).slider('values', 1) !=
ui.values[1]) {
- $( ".auto_max" ).attr('checked',
false);
- }
- $( ".slider-range" ).each(function(){
- $(this).slider('values', 0,
ui.values[0]);
- $(this).slider('values', 1,
ui.values[1]);
- });
- } else {
-
$(this).parents("tr").find(".left-range").html(ui.values[0]);
-
$(this).parents("tr").find(".right-range").html(ui.values[1]);
- if($(this).slider('values', 0) !=
ui.values[0]) {
- $(this).parents("tr").find(
".auto_min" ).attr('checked', false);
- }
- if($(this).slider('values', 1) !=
ui.values[1]) {
- $(this).parents("tr").find(
".auto_max" ).attr('checked', false);
- }
+ if(this.id == "default_range_slider") {
+ $(".input_min").val(ui.values[0]);
+ $(".input_max").val(ui.values[1]);
+ if($(this).slider('values', 0) !=
ui.values[0]) {
+ $( ".auto_min" ).attr('checked', false);
}
+ if($(this).slider('values', 1) !=
ui.values[1]) {
+ $( ".auto_max" ).attr('checked', false);
+ }
+ $( ".slider-range" ).each(function(){
+ $(this).slider('values', 0, ui.values[0]);
+ $(this).slider('values', 1, ui.values[1]);
+ });
+ } else {
+
$(this).parents("tr").find(".input_min").val(ui.values[0]);
+
$(this).parents("tr").find(".input_max").val(ui.values[1]);
+ if($(this).slider('values', 0) !=
ui.values[0]) {
+ $(this).parents("tr").find( ".auto_min"
).attr('checked', false);
+ }
+ if($(this).slider('values', 1) !=
ui.values[1]) {
+ $(this).parents("tr").find( ".auto_max"
).attr('checked', false);
+ }
+ }
},
stop: function( event, ui ) {
if(this.id == "default_range_slider") {
@@ -96,6 +94,98 @@
}
}
});
+ $( ".input_min" ).change(function( event ) {
+ var newmin = this.value;
+ if(this.id == "default_input_min") {
+ $( ".auto_min" ).attr('checked', false);
+ $( ".slider-range" ).each(function(){
+ $(this).slider('values', 0, newmin);
+ });
+ $( ".input_min" ).val(newmin);
+ max =
$(this).parents(".slider_control").find(".auto_max").attr('checked') ?
+ "auto" :
+
$(this).parents(".slider_control").find(".slider-range").slider('values', 1);
+ $.get("ajax.php", {
+ x_min: newmin,
+ x_max: max,
+ persist: "true"
+ }, function(data) {
+ $( ".plot" ).each(function() {
+ this.src =
this.src.replace(/&x_m(ax|in)=[^&]+/g, '')+"&reload=1";
+ });
+ }
+ );
+ } else {
+ $(this).parents("tr").find( ".auto_min"
).attr('checked', false);
+ $(this).parents("tr").find( ".slider-range"
).slider('values', 0, newmin);
+ max =
$(this).parents(".tr").find(".auto_max").attr('checked') ?
+ "auto" :
+
$(this).parents(".tr").find(".slider-range").slider('values', 1);
+ $(this).parents("tr").find(".plot").each(function(){
+ this.src = this.src.replace(/&x_m(ax|in)=[^&]+/g,
'')+"&x_min="+newmin+"&x_max="+max;
+ });
+ }
+ });
+ $( ".input_max" ).change(function( event ) {
+ var newmax = this.value;
+ if(this.id == "default_input_max") {
+ $( ".auto_max" ).attr('checked', false);
+ $( ".slider-range" ).each(function(){
+ $(this).slider('values', 1, newmax);
+ });
+ $( ".input_max" ).val(newmax);
+ min =
$(this).parents(".slider_control").find(".auto_min").attr('checked') ?
+ "auto" :
+
$(this).parents(".slider_control").find(".slider-range").slider('values', 0);
+ $.get("ajax.php", {
+ x_min: min,
+ x_max: newmax,
+ persist: "true"
+ }, function(data) {
+ $( ".plot" ).each(function() {
+ this.src =
this.src.replace(/&x_m(ax|in)=[^&]+/g, '')+"&reload=1";
+ });
+ }
+ );
+ } else {
+ $(this).parents("tr").find( ".auto_max"
).attr('checked', false);
+ $(this).parents("tr").find( ".slider-range"
).slider('values', 1, newmax);
+ min =
$(this).parents(".tr").find(".auto_min").attr('checked') ?
+ "auto" :
+
$(this).parents(".tr").find(".slider-range").slider('values', 0);
+ $(this).parents("tr").find(".plot").each(function(){
+ this.src = this.src.replace(/&x_m(ax|in)=[^&]+/g,
'')+"&x_min="+min+"&x_max="+newmax;
+ });
+ }
+ });
+ $( ".auto_min" ).click(function(){
+ if($(this).parents("#default_range_control").length > 0) {
+ $( ".auto_min" ).attr('checked', this.checked);
+ min = this.checked ? "auto" :
$(this).parents(".slider_control").find(".slider-range").slider('values', 0);
+ $( ".plot" ).each(function() {
+ this.src = this.src.replace(/&x_min=[^&]+/g,
'')+"&x_min="+min;
+ });
+ } else {
+ min = this.checked ? "auto" :
$(this).parents("tr").find(".slider-range").slider('values', 0);
+ $(this).parents("tr").find(".plot").each(function(){
+ this.src = this.src.replace(/&x_min=[^&]+/g,
'')+"&x_min="+min;
+ });
+ }
+ });
+ $( ".auto_max" ).click(function(){
+ if($(this).parents("#default_range_control").length > 0) {
+ $( ".auto_max" ).attr('checked', this.checked);
+ max = this.checked ? "auto" :
$(this).parents(".slider_control").find(".slider-range").slider('values', 1);
+ $( ".plot" ).each(function() {
+ this.src = this.src.replace(/&x_max=[^&]+/g,
'')+"&x_max="+max;
+ });
+ } else {
+ max = this.checked ? "auto" :
$(this).parents("tr").find(".slider-range").slider('values', 1);
+ $(this).parents("tr").find(".plot").each(function(){
+ this.src = this.src.replace(/&x_max=[^&]+/g,
'')+"&x_max="+max;
+ });
+ }
+ });
$( "#change_origin_slider" ).slider({
min: <?php echo get_session('yrange_min', '0') ?>,
max: <?php echo get_session('yrange_max', '100') ?>,
@@ -173,34 +263,6 @@
if(was == "none")
$( "#change_size_control" ).show();
});
- $( ".auto_min" ).click(function(){
- if($(this).parents("#default_range_control").length > 0) {
- $( ".auto_min" ).attr('checked', this.checked);
- min = this.checked ? "auto" :
$(this).parents(".slider_control").find(".slider-range").slider('values', 0);
- $( ".plot" ).each(function() {
- this.src = this.src.replace(/&x_min=[^&]+/g,
'')+"&x_min="+min;
- });
- } else {
- min = this.checked ? "auto" :
$(this).parents("tr").find(".slider-range").slider('values', 0);
- $(this).parents("tr").find(".plot").each(function(){
- this.src = this.src.replace(/&x_min=[^&]+/g,
'')+"&x_min="+min;
- });
- }
- });
- $( ".auto_max" ).click(function(){
- if($(this).parents("#default_range_control").length > 0) {
- $( ".auto_max" ).attr('checked', this.checked);
- max = this.checked ? "auto" :
$(this).parents(".slider_control").find(".slider-range").slider('values', 1);
- $( ".plot" ).each(function() {
- this.src = this.src.replace(/&x_max=[^&]+/g,
'')+"&x_max="+max;
- });
- } else {
- max = this.checked ? "auto" :
$(this).parents("tr").find(".slider-range").slider('values', 1);
- $(this).parents("tr").find(".plot").each(function(){
- this.src = this.src.replace(/&x_max=[^&]+/g,
'')+"&x_max="+max;
- });
- }
- });
$( "#norm" ).click(function () {
c = this;
$(this).parents("tr").find(".plot").each(function(){
Modified: gauger/template_graph.php
===================================================================
--- gauger/template_graph.php 2011-03-29 20:52:06 UTC (rev 14774)
+++ gauger/template_graph.php 2011-03-29 22:12:13 UTC (rev 14775)
@@ -31,8 +31,12 @@
<br/>
<div class="side_slider_control">
<div class="slider-range" id="other_slider" ></div>
- <div class="left-range"><?php echo get_session('x_min',
get_session('xrange_min', '0')) ?></div>
- <div class="right-range"><?php echo get_session('x_max',
get_session('xrange_max', '100')) ?></div>
+ <div class="left-range">
+ <input class="input_min" value="<?php echo
get_session('x_min', get_session('xrange_min', '0')) ?>"></input>
+ </div>
+ <div class="right-range">
+ <input class="input_max" value="<?php echo
get_session('x_max', get_session('xrange_max', '0')) ?>"></input>
+ </div>
<div class="auto_range">
<input class="auto_min" type="checkbox" <?php
if(get_session('x_min_a')) echo 'checked="checked"'?>/>
Auto
Modified: gauger/template_host.php
===================================================================
--- gauger/template_host.php 2011-03-29 20:52:06 UTC (rev 14774)
+++ gauger/template_host.php 2011-03-29 22:12:13 UTC (rev 14775)
@@ -57,8 +57,12 @@
<br/>
<div class="side_slider_control">
<div class="slider-range" id="other_slider" ></div>
- <div class="left-range"><?php echo get_session('x_min',
get_session('xrange_min', '0')) ?></div>
- <div class="right-range"><?php echo get_session('x_max',
get_session('xrange_max', '100')) ?></div>
+ <div class="left-range">
+ <input class="input_min" value="<?php echo
get_session('x_min', get_session('xrange_min', '0')) ?>"></input>
+ </div>
+ <div class="right-range">
+ <input class="input_max" value="<?php echo
get_session('x_max', get_session('xrange_max', '0')) ?>"></input>
+ </div>
<div class="auto_range">
<input class="auto_min" type="checkbox" <?php
if(get_session('x_min_a')) echo 'checked="checked"'?>/>
Auto
Modified: gauger/template_menu.php
===================================================================
--- gauger/template_menu.php 2011-03-29 20:52:06 UTC (rev 14774)
+++ gauger/template_menu.php 2011-03-29 22:12:13 UTC (rev 14775)
@@ -22,8 +22,12 @@
<a href="#" id="default_range" >Default Range</a>
<div class="slider_control" id="default_range_control">
<div class="slider-range" id="default_range_slider"></div>
- <div class="left-range"><?php echo get_session('x_min',
get_session('xrange_min', '0')) ?></div>
- <div class="right-range"><?php echo get_session('x_max',
get_session('xrange_max', '0')) ?></div>
+ <div class="left-range">
+ <input id="default_input_min" class="input_min"
value="<?php echo get_session('x_min', get_session('xrange_min', '0'))
?>"></input>
+ </div>
+ <div class="right-range">
+ <input id="default_input_max" class="input_max"
value="<?php echo get_session('x_max', get_session('xrange_max', '0'))
?>"></input>
+ </div>
<div class="auto_range">
<input class="auto_min" type="checkbox" <?php
if(get_session('x_min_a')) echo 'checked="checked"'?>/>
Auto
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14775 - in gauger: . css,
gnunet <=