From 838118a38881cc17e59445c1ab8773328d982dc5 Mon Sep 17 00:00:00 2001 From: Vincent Riquer Date: Mon, 23 Jun 2014 15:16:55 +0200 Subject: [PATCH 1/2] hist: fix anchor placement --- index | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/index b/index index 94e1281..2f64662 100755 --- a/index +++ b/index @@ -107,7 +107,7 @@ then -
+
EOHTML readarray -t lastupdatelines < <( rrdtool lastupdate $rrdfile @@ -448,7 +448,7 @@ then
-
+
EOHTML if (( show_all )) @@ -495,14 +495,12 @@ then height=155 fi cat <<-EOHTML -
- Ingress $stat evolution -
+
+ Ingress $stat evolution EOHTML done fi From 0b70bede3f386025b7e3592be02cdaebd909a706 Mon Sep 17 00:00:00 2001 From: Vincent Riquer Date: Tue, 24 Jun 2014 00:43:29 +0200 Subject: [PATCH 2/2] separate code from style --- add.html | 27 ++++++---- index | 156 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 95 insertions(+), 88 deletions(-) diff --git a/add.html b/add.html index 369bed9..3dd96f5 100755 --- a/add.html +++ b/add.html @@ -56,29 +56,31 @@ Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z') "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - IngRRD - Add data + IngRRD - $webuser - Add data + -
- +
+
+
- -
Overview - + + - +
Overview + - - -
+ - History + History & Trend
+ Medals + All @@ -86,9 +88,10 @@ Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z')
Add dataAdd data
+ EOHTML if ! [ -w "$rrdfile" ] then @@ -136,6 +139,7 @@ then } fi cat <<-EOHTML +
    EOHTML @@ -175,6 +179,7 @@ cat <<-EOHTML
+
EOHTML diff --git a/index b/index index 2f64662..6495b66 100755 --- a/index +++ b/index @@ -60,6 +60,15 @@ fi if [ -z "$graph" ] then + if (( show_all )) + then + title="IngRRD - $webuser - History & Trend: All stats" + elif (( show_graphs )) + then + title="IngRRD - $webuser - History & Trend: Badges" + else + title="IngRRD - $webuser - Overview" + fi cat <<-EOHTML content-type: application/xhtml+xml Last-Modified: $( @@ -75,39 +84,40 @@ then "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - IngRRD - Graph + $title + -
+
EOHTML if (( ! show_graphs )) then cat <<-EOHTML -
- +
+
- -
Overview - + + - +
Overview + - + - -
HistoryHistory & Trend
+ Medals + All
Add dataAdd data
-
+
EOHTML readarray -t lastupdatelines < <( rrdtool lastupdate $rrdfile @@ -161,30 +171,28 @@ then done cat <<-EOHTML
- +
- + - - - - + + + + - - - + - - - " + echo "" if (( last["AP"] >= lvl[level] )) then - echo '' else readable=$(printf "%'li" ${lvl[level]}) - echo '" + echo "
(${readable// / })" fi if (( silvercount >= lvlsilver[level] )) then - echo '' + echo '' else - echo "' + echo '' else - echo "' + echo '' else - echo "' + echo '' else - echo "
LevelLevel APSilverGoldPlatinumBlackSilverGoldPlatinumBlack
 $(printf "%'li" ${last["AP"]}) + + $(printf "%'li" ${last["AP"]}) EOHTML for stat in ${silvers[@]} do img=${stat,,} cat <<-EOHTML - $stat silver @@ -193,18 +201,16 @@ then done cat <<-EOHTML + EOHTML for stat in ${golds[@]} do img=${stat,,} cat <<-EOHTML - $stat gold @@ -213,18 +219,16 @@ then done cat <<-EOHTML + EOHTML for stat in ${platinums[@]} do img=${stat,,} cat <<-EOHTML - $stat platinum @@ -233,18 +237,16 @@ then done cat <<-EOHTML + EOHTML for stat in ${blacks[@]} do img=${stat,,} cat <<-EOHTML - $stat black @@ -257,23 +259,23 @@ then EOHTML for level in {1..16} do - echo "
$level
$level' + echo '' printf "%'li" ${lvl[level]} echo ''"${readable// / }" + echo ''"${readable// / }" readable=$(printf "%'li" $(( last["AP"] - lvl[level] ))) - echo "
(${readable// / })		'${lvlsilver[level]}''${lvlsilver[level]}'${lvlsilver[level]} ($(( silvercount - lvlsilver[level] )))
" + echo "		${lvlsilver[level]} ($(( silvercount - lvlsilver[level] )))
" for id in {100..0} do [ -z "${upsilver[id]}" ] && continue @@ -284,11 +286,11 @@ then img=${stat,,} cat <<-EOHTML $stat silver @@ -300,9 +302,9 @@ then fi if (( goldcount >= lvlgold[level] )) then - echo '		'${lvlgold[level]}''${lvlgold[level]}'${lvlgold[level]} ($(( goldcount - lvlgold[level] )))
" + echo "		${lvlgold[level]} ($(( goldcount - lvlgold[level] )))
" for id in {100..0} do [ -z "${upgold[id]}" ] && continue @@ -313,11 +315,11 @@ then img=${stat,,} cat <<-EOHTML $stat gold @@ -329,9 +331,9 @@ then fi if (( platinumcount >= lvlplatinum[level] )) then - echo '		'${lvlplatinum[level]}''${lvlplatinum[level]}'${lvlplatinum[level]} ($(( platinumcount - lvlplatinum[level] )))
" + echo "		${lvlplatinum[level]} ($(( platinumcount - lvlplatinum[level] )))
" for id in {100..0} do [ -z "${upplatinum[id]}" ] && continue @@ -342,11 +344,11 @@ then img=${stat,,} cat <<-EOHTML $stat platinum @@ -358,9 +360,9 @@ then fi if (( blackcount >= lvlblack[level] )) then - echo '		'${lvlblack[level]}''${lvlblack[level]}'${lvlblack[level]} ($(( blackcount - lvlblack[level] )))
" + echo "		${lvlblack[level]} ($(( blackcount - lvlblack[level] )))
" for id in {100..0} do [ -z "${upblack[id]}" ] && continue @@ -371,11 +373,11 @@ then img=${stat,,} cat <<-EOHTML $stat black @@ -393,31 +395,31 @@ then EOHTML else cat <<-EOHTML -
- +
+
- -
Overview - + + - +
Overview + - + EOHTML if (( show_all )) then cat <<-EOHTML - - + EOHTML else cat <<-EOHTML - - + @@ -426,7 +428,7 @@ then cat <<-EOHTML
HistoryHistory
+ Medals AllAll
Medals + Medals All
Add dataAdd data
@@ -448,7 +450,7 @@ then
-
+
EOHTML if (( show_all )) @@ -495,7 +497,7 @@ then height=155 fi cat <<-EOHTML -
+