[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14455 - gauger
From: |
gnunet |
Subject: |
[GNUnet-SVN] r14455 - gauger |
Date: |
Fri, 18 Feb 2011 03:53:43 +0100 |
Author: bartpolot
Date: 2011-02-18 03:53:43 +0100 (Fri, 18 Feb 2011)
New Revision: 14455
Modified:
gauger/params.php
gauger/template.php
gauger/template_welcome.php
Log:
Fixed errors in session handling, interface updating
Modified: gauger/params.php
===================================================================
--- gauger/params.php 2011-02-17 23:20:35 UTC (rev 14454)
+++ gauger/params.php 2011-02-18 02:53:43 UTC (rev 14455)
@@ -19,7 +19,7 @@
}
function get_session($name, $default = '') {
- if (array_key_exists($name, $_SESSION) && $_SESSION[$name]) {
+ if (array_key_exists($name, $_SESSION) && $_SESSION[$name] !== '') {
return $_SESSION[$name];
} else {
return $default;
@@ -29,21 +29,20 @@
function process_range() {
global $range_parameters;
foreach ($range_parameters as $param_name) {
- if (array_key_exists($param_name, $_SESSION)) {
- $bck = $_SESSION[$param_name];
- }
+ $prev = array_key_exists($param_name, $_SESSION);
+ if ($prev) $bck = $_SESSION[$param_name];
$$param_name = get_param($param_name, '',
get_param('persist')=='true');
- if(!is_numeric($$param_name)) {
- if(get_param('persist') == 'true' &&
- array_key_exists($param_name, $_SESSION)) {
+ if(!is_numeric($$param_name) && get_param('persist') == 'true') {
+ if($prev) {
$_SESSION[$param_name] = $bck;
+ } else {
+ $_SESSION[$param_name] = '';
}
$_SESSION[$param_name."_a"] = 1;
$$param_name = '*';
} else if(get_param('persist') == 'true') {
$_SESSION[$param_name."_a"] = 0;
}
-
}
}
@@ -66,7 +65,7 @@
$mode_graph = TRUE;
}
-if (!get_session('xrange_min')) {
+if (get_session('xrange_min') === '') {
$r = get_range('','');
$_SESSION['xrange_min'] = $r[0];
$_SESSION['xrange_max'] = $r[1];
Modified: gauger/template.php
===================================================================
--- gauger/template.php 2011-02-17 23:20:35 UTC (rev 14454)
+++ gauger/template.php 2011-02-18 02:53:43 UTC (rev 14455)
@@ -23,8 +23,8 @@
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") {
- $(".left-range").html(ui.values[0]);
- $(".right-range").html(ui.values[1]);
+
$(this).parents(".slider_control").find(".left-range").html(ui.values[0]);
+
$(this).parents(".slider_control").find(".right-range").html(ui.values[1]);
if($(this).slider('values', 0) !=
ui.values[0]) {
$( ".auto_min" ).attr('checked',
false);
}
@@ -74,7 +74,7 @@
max: <?php echo get_session('yrange_max', '100') ?>,
value: <?php echo get_session('y_min', '0') ?>,
slide: function( event, ui ) {
- $(this).parent().find(".right").html(ui.value);
+
$(this).parents(".slider_control").find(".right").html(ui.value);
},
stop: function( event, ui ) {
$.get("ajax.php", {
@@ -208,7 +208,9 @@
<h2>Metrics</h2>
<ul>
<?php foreach ($metrics as $link => $name): ?>
- <li><a href="?graph=<?php echo $link ?>"><?php echo $name
?></a></li>
+ <li><a href="?graph=<?php echo $link ?>">
+ <?php echo $name . (get_counter_unit($link) ? ' (' .
get_counter_unit($link) . ')' : '') ?>
+ </a></li>
<?php endforeach; ?>
</ul>
</div>
Modified: gauger/template_welcome.php
===================================================================
--- gauger/template_welcome.php 2011-02-17 23:20:35 UTC (rev 14454)
+++ gauger/template_welcome.php 2011-02-18 02:53:43 UTC (rev 14455)
@@ -1,6 +1,6 @@
<h1>Welcome to Gauger</h1>
-<p>We have data from <b>r<?php echo get_session('xrange_min') ?></b> to
<b><?php echo get_session('xrange_max') ?></b>.
+<p>We have data from <b>r<?php echo get_session('xrange_min') ?></b> to
<b>r<?php echo get_session('xrange_max') ?></b>.
<p>If you click on a host from the <b>Hosts</b> menu on the left, you will see
all the metrics for that particular host.</p>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14455 - gauger,
gnunet <=