From a8e01a37ed44e94e0f9fa52ac917d76023888935 Mon Sep 17 00:00:00 2001
From: Vincent Riquer <vincent+gitorious@riquer.fr>
Date: Fri, 30 Jan 2015 16:08:33 +0100
Subject: [PATCH] better graph period chooser

---
 index    | 35 +++++++++++++++++++++--------------
 settings |  6 ++++--
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/index b/index
index 50a24ad..eefc4cb 100755
--- a/index
+++ b/index
@@ -367,18 +367,27 @@ then
 			<table style="width:$(( graph_width + 97 ))px">
 				<tr>
 					<td>
-						<a href="?hist&amp;start=$(( start - 604800 ))&amp;end=$end">&lt;&lt;</a>
-						<a href="?hist&amp;start=$(( start - 86400 ))&amp;end=$end">&lt;</a>
-						<a href="?hist&amp;start=$default_start&amp;end=$end">R</a>
-						<a href="?hist&amp;start=$(( start + 86400 ))&amp;end=$end">&gt;</a>
-						<a href="?hist&amp;start=$(( start + 604800 ))&amp;end=$end">&gt;&gt;</a>
+						<a href="?hist&amp;start=$(rrdtool first ingress.rrd)&amp;end=$end">First</a>
+						<a href="?hist&amp;start=$(( start - 365 * 86400 ))&amp;end=$end">-Y</a>
+						<a href="?hist&amp;start=$(( start - 30 * 86400 ))&amp;end=$end">-M</a>
+						<a href="?hist&amp;start=$(( start - 604800 ))&amp;end=$end">-W</a>
+						<a href="?hist&amp;start=$(( start - 86400 ))&amp;end=$end">-D</a>
+						<a href="?hist&amp;start=$now&amp;end=$end">Now</a>
+						<a href="?hist&amp;start=$(( start + 86400 ))&amp;end=$end">+D</a>
+						<a href="?hist&amp;start=$(( start + 604800 ))&amp;end=$end">+W</a>
+						<a href="?hist&amp;start=$(( start + 30 * 86400 ))&amp;end=$end">+M</a>
+						<a href="?hist&amp;start=$(( start + 365 * 86400 ))&amp;end=$end">+Y</a>
 					</td>
 					<td align="right">
-						<a href="?hist&amp;start=$start&amp;end=$(( end - 604800 ))">&lt;&lt;</a>
-						<a href="?hist&amp;start=$start&amp;end=$(( end - 86400 ))">&lt;</a>
-						<a href="?hist&amp;start=$start&amp;end=$default_end">R</a>
-						<a href="?hist&amp;start=$start&amp;end=$(( end + 86400 ))">&gt;</a>
-						<a href="?hist&amp;start=$start&amp;end=$(( end + 604800 ))">&gt;&gt;</a>
+						<a href="?hist&amp;start=$start&amp;end=$(( end - 365 * 86400 ))">-Y</a>
+						<a href="?hist&amp;start=$start&amp;end=$(( end - 30 * 86400 ))">-M</a>
+						<a href="?hist&amp;start=$start&amp;end=$(( end - 604800 ))">-W</a>
+						<a href="?hist&amp;start=$start&amp;end=$(( end - 86400 ))">-D</a>
+						<a href="?hist&amp;start=$start&amp;end=$now">Now</a>
+						<a href="?hist&amp;start=$start&amp;end=$(( end + 86400 ))">+D</a>
+						<a href="?hist&amp;start=$start&amp;end=$(( end + 604800 ))">+W</a>
+						<a href="?hist&amp;start=$start&amp;end=$(( end + 30 * 86400 ))">+M</a>
+						<a href="?hist&amp;start=$start&amp;end=$(( end + 365 * 86400 ))">+Y</a>
 					</td>
 				</tr>
 			</table>
@@ -606,10 +615,8 @@ else
 		next=('COMMENT:\n')
 	fi
 
-	(( start > -1209600 )) && datastart=-1209600
-	(( end < 157680001 )) && dataend="+157680001"
-	(( start > 0 )) && start="+$start"
-	(( end > 0 )) && end="+$end"
+	(( start - now > -1209600 )) && datastart=-1209600
+	(( end - now < 157680001 )) && dataend="+157680001"
 	(( datastart > 0 )) && datastart="+$datastart"
 
 	rrdtool graph - 												\
diff --git a/settings b/settings
index 3e74447..c7975a6 100644
--- a/settings
+++ b/settings
@@ -29,9 +29,11 @@ L14color=8B1479
 L15color=6B127D
 L16color=591494
 
-default_start=-604800
-default_end=1209600
 default_prevperiod=1m
+now=$(date +%s)
+
+(( default_start = now - 604800 ))
+(( default_end = now + 1209600 ))
 
 start=$default_start
 end=$default_end