ScriptFanix/IngRRD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into prod

Browse Source 
* origin/master:
  separate code from style
  hist: fix anchor placement
This commit is contained in:
Vincent Riquer 2014-06-24 00:44:20 +02:00
commit 0754138bc0
2 changed files with 100 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
add.html
View File

@ -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"> "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>IngRRD - Add data</title> <title>IngRRD - $webuser - Add data</title>
<link rel="stylesheet" type="text/css" href="/ingrrd.css" />
</head> </head>
<body> <body>
<div style="position:relative; clear:both; margin:auto; width:$(( graph_width + 97 ))px"> <div class="container" style="width:$(( graph_width + 97 ))px">
<table style="width:$(( graph_width + 97 ))px; text-align:center; border:1px solid black; border-collapse:collapse"> <div class="menu">
<table style="width:$(( graph_width + 97 ))px" class="menu">
<tr> <tr>
<td style="border:1px solid black"><a href="/cgi/$webuser/?start=$start&amp;end=$end">Overview</a></td> <td class="menu"><a href="/cgi/$webuser/?start=$start&amp;end=$end">Overview</a></td>
<td style="border:1px solid black"> <td class="menu">
<table style="width:100%; border-collapse:collapse"> <table class="menu-nobrd">
<tr> <tr>
<td colspan="2" style="text-align:center"> <td colspan="2" class="menu-nobrd">
<a href="/cgi/$webuser/?hist&amp;start=$start&amp;end=$end"> <a href="/cgi/$webuser/?hist&amp;start=$start&amp;end=$end">
History History &amp; Trend
</a> </a>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="border:1px solid black"> <td class="menu">
<a href="/cgi/$webuser/?hist&amp;start=$start&amp;end=$end"> <a href="/cgi/$webuser/?hist&amp;start=$start&amp;end=$end">
Medals Medals
</a> </a>
</td> </td>
<td style="border:1px solid black"> <td class="menu">
<a href="/cgi/$webuser/?hist&amp;show=all&amp;start=$start&amp;end=$end"> <a href="/cgi/$webuser/?hist&amp;show=all&amp;start=$start&amp;end=$end">
All All
</a> </a>
@ -86,9 +88,10 @@ Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z')
</tr> </tr>
</table> </table>
</td> </td>
<td style="background:black; color:white">Add data</td> <td class="menu-inv">Add data</td>
</tr> </tr>
</table> </table>
</div>
EOHTML EOHTML
if ! [ -w "$rrdfile" ] if ! [ -w "$rrdfile" ]
then then
@ -136,6 +139,7 @@ then
} }
fi fi
cat <<-EOHTML cat <<-EOHTML
<div class="main">
<form method="post" action="add"> <form method="post" action="add">
<ul> <ul>
EOHTML EOHTML
@ -175,6 +179,7 @@ cat <<-EOHTML
</tr> </tr>
</table> </table>
</div> </div>
</div>
</body> </body>
</html> </html>
EOHTML EOHTML

158
index
View File

@ -60,6 +60,15 @@ fi
if [ -z "$graph" ] if [ -z "$graph" ]
then then
if (( show_all ))
then
title="IngRRD - $webuser - History &amp; Trend: All stats"
elif (( show_graphs ))
then
title="IngRRD - $webuser - History &amp; Trend: Badges"
else
title="IngRRD - $webuser - Overview"
fi
cat <<-EOHTML cat <<-EOHTML
content-type: application/xhtml+xml content-type: application/xhtml+xml
Last-Modified: $( Last-Modified: $(
@ -75,39 +84,40 @@ then
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>IngRRD - Graph</title> <title>$title</title>
<link rel="stylesheet" type="text/css" href="/ingrrd.css" />
</head> </head>
<body> <body>
<div style="position:relative; clear:both; margin:auto; width:$(( graph_width + 97 ))px"> <div style="width:$(( graph_width + 97 ))px" class="container">
EOHTML EOHTML
if (( ! show_graphs )) if (( ! show_graphs ))
then then
cat <<-EOHTML cat <<-EOHTML
<div style="position:fixed; background:white"> <div class="menu">
<table style="width:$(( graph_width + 97 ))px; text-align:center; border:1px solid black; border-collapse:collapse"> <table style="width:$(( graph_width + 97 ))px" class="menu">
<tr> <tr>
<td style="background:black; color:white">Overview</td> <td class="menu-inv">Overview</td>
<td style="border:1px solid black"> <td class="menu">
<table style="width:100%; border-collapse:collapse"> <table class="menu-nobrd">
<tr> <tr>
<td colspan="2" style="text-align:center"><a href="?hist&amp;start=$start&amp;end=$end">History</a></td> <td colspan="2"><a href="?hist&amp;start=$start&amp;end=$end">History &amp; Trend</a></td>
</tr> </tr>
<tr> <tr>
<td style="border:1px solid black"> <td class="menu">
<a href="?hist&amp;start=$start&amp;end=$end">Medals</a> <a href="?hist&amp;start=$start&amp;end=$end">Medals</a>
</td> </td>
<td style="border:1px solid black"> <td class="menu">
<a href="?hist&amp;show=all&amp;start=$start&amp;end=$end">All</a> <a href="?hist&amp;show=all&amp;start=$start&amp;end=$end">All</a>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
<td style="border:1px solid black"><a href="add.html?start=$start&amp;end=$end"><b>Add data</b></a></td> <td class="menu"><a href="add.html?start=$start&amp;end=$end"><b>Add data</b></a></td>
</tr> </tr>
</table> </table>
</div> </div>
<div style="position:absolute; top:3em"> <div class="main">
EOHTML EOHTML
readarray -t lastupdatelines < <( readarray -t lastupdatelines < <(
rrdtool lastupdate $rrdfile rrdtool lastupdate $rrdfile
@ -161,30 +171,28 @@ then
done done
cat <<-EOHTML cat <<-EOHTML
<div> <div>
<table style="width:840px"> <table class="level">
<tr> <tr>
<th>Level</th> <th class="level">Level</th>
<th>AP</th> <th>AP</th>
<th style="width:170px">Silver</th> <th class="badge">Silver</th>
<th style="width:170px">Gold</th> <th class="badge">Gold</th>
<th style="width:170px">Platinum</th> <th class="badge">Platinum</th>
<th style="width:170px">Black</th> <th class="badge">Black</th>
</tr> </tr>
<tr> <tr>
<td>&nbsp;</td> <td />
<td style="text-align:right">$(printf "%'li" ${last["AP"]})</td> <td class="AP">$(printf "%'li" ${last["AP"]})</td>
<td style="text-align:center"> <td class="badge">
EOHTML EOHTML
for stat in ${silvers[@]} for stat in ${silvers[@]}
do do
img=${stat,,} img=${stat,,}
cat <<-EOHTML cat <<-EOHTML
<a <a class="badge"
style="color:black;text-decoration:none"
href="?hist&amp;start=$start&amp;end=$end#$stat"> href="?hist&amp;start=$start&amp;end=$end#$stat">
<img <img
width="30" class="badge"
height="30"
src="/${img//_/-}-silver.png" src="/${img//_/-}-silver.png"
title="$stat" title="$stat"
alt="$stat silver" /> alt="$stat silver" />
@ -193,18 +201,16 @@ then
done done
cat <<-EOHTML cat <<-EOHTML
</td> </td>
<td style="text-align:center"> <td class="badge">
EOHTML EOHTML
for stat in ${golds[@]} for stat in ${golds[@]}
do do
img=${stat,,} img=${stat,,}
cat <<-EOHTML cat <<-EOHTML
<a <a class="badge"
style="color:black;text-decoration:none"
href="?hist&amp;start=$start&amp;end=$end#$stat"> href="?hist&amp;start=$start&amp;end=$end#$stat">
<img <img
width="30" class="badge"
height="30"
src="/${img//_/-}-gold.png" src="/${img//_/-}-gold.png"
title="$stat" title="$stat"
alt="$stat gold" /> alt="$stat gold" />
@ -213,18 +219,16 @@ then
done done
cat <<-EOHTML cat <<-EOHTML
</td> </td>
<td style="text-align:center"> <td class="badge">
EOHTML EOHTML
for stat in ${platinums[@]} for stat in ${platinums[@]}
do do
img=${stat,,} img=${stat,,}
cat <<-EOHTML cat <<-EOHTML
<a <a class="badge"
style="color:black;text-decoration:none"
href="?hist&amp;start=$start&amp;end=$end#$stat"> href="?hist&amp;start=$start&amp;end=$end#$stat">
<img <img
width="30" class="badge"
height="30"
src="/${img//_/-}-platinum.png" src="/${img//_/-}-platinum.png"
title="$stat" title="$stat"
alt="$stat platinum" /> alt="$stat platinum" />
@ -233,18 +237,16 @@ then
done done
cat <<-EOHTML cat <<-EOHTML
</td> </td>
<td style="text-align:center"> <td class="badge">
EOHTML EOHTML
for stat in ${blacks[@]} for stat in ${blacks[@]}
do do
img=${stat,,} img=${stat,,}
cat <<-EOHTML cat <<-EOHTML
<a <a class="badge"
style="color:black;text-decoration:none"
href="?hist&amp;start=$start&amp;end=$end#$stat"> href="?hist&amp;start=$start&amp;end=$end#$stat">
<img <img
width="30" class="badge"
height="30"
src="/${img//_/-}-black.png" src="/${img//_/-}-black.png"
title="$stat" title="$stat"
alt="$stat black" /> alt="$stat black" />
@ -257,23 +259,23 @@ then
EOHTML EOHTML
for level in {1..16} for level in {1..16}
do do
echo "<tr><th style=\"text-align:right\">$level</th>" echo "<tr><th class=\"level\">$level</th>"
if (( last["AP"] >= lvl[level] )) if (( last["AP"] >= lvl[level] ))
then then
echo '<td style="text-align:right; background:lightgreen">' echo '<td class="AP" style="background:lightgreen">'
printf "%'li" ${lvl[level]} printf "%'li" ${lvl[level]}
echo '</td>' echo '</td>'
else else
readable=$(printf "%'li" ${lvl[level]}) readable=$(printf "%'li" ${lvl[level]})
echo '<td style="text-align:right; background:lightgrey">'"${readable// /&nbsp;}" echo '<td class="AP" style="background:lightgrey">'"${readable// /&nbsp;}"
readable=$(printf "%'li" $(( last["AP"] - lvl[level] ))) readable=$(printf "%'li" $(( last["AP"] - lvl[level] )))
echo "<br />(<span style=\"color:#FF2020;font-weight:bold\">${readable// /&nbsp;}</span>)</td>" echo "<br />(<span class=\"missing\">${readable// /&nbsp;}</span>)</td>"
fi fi
if (( silvercount >= lvlsilver[level] )) if (( silvercount >= lvlsilver[level] ))
then then
echo '<td style="text-align:center; background:lightgreen">'${lvlsilver[level]}'</td>' echo '<td class="badge" style="background:lightgreen">'${lvlsilver[level]}'</td>'
else else
echo "<td style=\"text-align:center; background:lightgrey\">${lvlsilver[level]} (<span style=\"color:#FF2020;font-weight:bold\">$(( silvercount - lvlsilver[level] ))</span>)<br />" echo "<td class=\"badge\" style=\"background:lightgrey\">${lvlsilver[level]} (<span class=\"missing\">$(( silvercount - lvlsilver[level] ))</span>)<br />"
for id in {100..0} for id in {100..0}
do do
[ -z "${upsilver[id]}" ] && continue [ -z "${upsilver[id]}" ] && continue
@ -284,11 +286,11 @@ then
img=${stat,,} img=${stat,,}
cat <<-EOHTML cat <<-EOHTML
<a <a
style="background:#$(printf %02x%02x $redlevel $greenlevel )00;color:black;text-decoration:none" class="badge"
style="background:#$(printf %02x%02x $redlevel $greenlevel )00"
href="?hist&amp;start=$start&amp;end=$end#$stat"> href="?hist&amp;start=$start&amp;end=$end#$stat">
<img <img
width="30" class="badge"
height="30"
src="/${img//_/-}-silver.png" src="/${img//_/-}-silver.png"
title="$stat $id%" title="$stat $id%"
alt="$stat silver" /> alt="$stat silver" />
@ -300,9 +302,9 @@ then
fi fi
if (( goldcount >= lvlgold[level] )) if (( goldcount >= lvlgold[level] ))
then then
echo '<td style="text-align:center; background:lightgreen">'${lvlgold[level]}'</td>' echo '<td class="badge" style="background:lightgreen">'${lvlgold[level]}'</td>'
else else
echo "<td style=\"text-align:center; background:lightgrey\">${lvlgold[level]} (<span style=\"color:#FF2020;font-weight:bold\">$(( goldcount - lvlgold[level] ))</span>)<br />" echo "<td class=\"badge\" style=\"background:lightgrey\">${lvlgold[level]} (<span class=\"missing\">$(( goldcount - lvlgold[level] ))</span>)<br />"
for id in {100..0} for id in {100..0}
do do
[ -z "${upgold[id]}" ] && continue [ -z "${upgold[id]}" ] && continue
@ -313,11 +315,11 @@ then
img=${stat,,} img=${stat,,}
cat <<-EOHTML cat <<-EOHTML
<a <a
style="background:#$(printf %02x%02x $redlevel $greenlevel )00;color:black;text-decoration:none" class="badge"
style="background:#$(printf %02x%02x $redlevel $greenlevel )00"
href="?hist&amp;start=$start&amp;end=$end#$stat"> href="?hist&amp;start=$start&amp;end=$end#$stat">
<img <img
width="30" class="badge"
height="30"
src="/${img//_/-}-gold.png" src="/${img//_/-}-gold.png"
title="$stat $id%" title="$stat $id%"
alt="$stat gold" /> alt="$stat gold" />
@ -329,9 +331,9 @@ then
fi fi
if (( platinumcount >= lvlplatinum[level] )) if (( platinumcount >= lvlplatinum[level] ))
then then
echo '<td style="text-align:center; background:lightgreen">'${lvlplatinum[level]}'</td>' echo '<td class="badge" style="background:lightgreen">'${lvlplatinum[level]}'</td>'
else else
echo "<td style=\"text-align:center; background:lightgrey\">${lvlplatinum[level]} (<span style=\"color:#FF2020;font-weight:bold\">$(( platinumcount - lvlplatinum[level] ))</span>)<br />" echo "<td class=\"badge\" style=\"background:lightgrey\">${lvlplatinum[level]} (<span class=\"missing\">$(( platinumcount - lvlplatinum[level] ))</span>)<br />"
for id in {100..0} for id in {100..0}
do do
[ -z "${upplatinum[id]}" ] && continue [ -z "${upplatinum[id]}" ] && continue
@ -342,11 +344,11 @@ then
img=${stat,,} img=${stat,,}
cat <<-EOHTML cat <<-EOHTML
<a <a
style="background:#$(printf %02x%02x $redlevel $greenlevel )00;color:black;text-decoration:none" class="badge"
style="background:#$(printf %02x%02x $redlevel $greenlevel )00"
href="?hist&amp;start=$start&amp;end=$end#$stat"> href="?hist&amp;start=$start&amp;end=$end#$stat">
<img <img
width="30" class="badge"
height="30"
src="/${img//_/-}-platinum.png" src="/${img//_/-}-platinum.png"
title="$stat $id%" title="$stat $id%"
alt="$stat platinum" /> alt="$stat platinum" />
@ -358,9 +360,9 @@ then
fi fi
if (( blackcount >= lvlblack[level] )) if (( blackcount >= lvlblack[level] ))
then then
echo '<td style="text-align:center; background:lightgreen">'${lvlblack[level]}'</td>' echo '<td class="badge" style="background:lightgreen">'${lvlblack[level]}'</td>'
else else
echo "<td style=\"text-align:center; background:lightgrey\">${lvlblack[level]} (<span style=\"color:#FF2020;font-weight:bold\">$(( blackcount - lvlblack[level] ))</span>)<br />" echo "<td class=\"badge\" style=\"background:lightgrey\">${lvlblack[level]} (<span class=\"missing\">$(( blackcount - lvlblack[level] ))</span>)<br />"
for id in {100..0} for id in {100..0}
do do
[ -z "${upblack[id]}" ] && continue [ -z "${upblack[id]}" ] && continue
@ -371,11 +373,11 @@ then
img=${stat,,} img=${stat,,}
cat <<-EOHTML cat <<-EOHTML
<a <a
style="background:#$(printf %02x%02x $redlevel $greenlevel )00;color:black;text-decoration:none" class="badge"
style="background:#$(printf %02x%02x $redlevel $greenlevel )00"
href="?hist&amp;start=$start&amp;end=$end#$stat"> href="?hist&amp;start=$start&amp;end=$end#$stat">
<img <img
width="30" class="badge"
height="30"
src="/${img//_/-}-black.png" src="/${img//_/-}-black.png"
title="$stat $id%" title="$stat $id%"
alt="$stat black" /> alt="$stat black" />
@ -393,31 +395,31 @@ then
EOHTML EOHTML
else else
cat <<-EOHTML cat <<-EOHTML
<div style="position:fixed; z-index:100; background:white"> <div class="menu">
<table style="width:$(( graph_width + 97 ))px; text-align:center; border:1px solid black; border-collapse:collapse"> <table class="menu" style="width:$(( graph_width + 97 ))px">
<tr> <tr>
<td><a href="?start=$start&amp;end=$end">Overview</a></td> <td class="menu"><a href="?start=$start&amp;end=$end">Overview</a></td>
<td style="background:black; color:white"> <td class="menu-inv">
<table style="width:100%; border-collapse:collapse"> <table class="menu">
<tr> <tr>
<td colspan="2" style="text-align:center">History</td> <td colspan="2" class="menu-inv">History</td>
</tr> </tr>
EOHTML EOHTML
if (( show_all )) if (( show_all ))
then then
cat <<-EOHTML cat <<-EOHTML
<tr> <tr>
<td style="background:white; color:black; border:1px solid black"> <td class="menu">
<a href="?hist&amp;start=$start&amp;end=$end">Medals</a> <a href="?hist&amp;start=$start&amp;end=$end">Medals</a>
</td> </td>
<td style="background:#505050; color:white; border:1px solid black">All</td> <td class="submenu-inv">All</td>
</tr> </tr>
EOHTML EOHTML
else else
cat <<-EOHTML cat <<-EOHTML
<tr> <tr>
<td style="background:#505050; color:white; border:1px solid black">Medals</td> <td class="submenu-inv">Medals</td>
<td style="background:white; color:black; border:1px solid black"> <td class="menu">
<a href="?hist&amp;show=all&amp;start=$start&amp;end=$end">All</a> <a href="?hist&amp;show=all&amp;start=$start&amp;end=$end">All</a>
</td> </td>
</tr> </tr>
@ -426,7 +428,7 @@ then
cat <<-EOHTML cat <<-EOHTML
</table> </table>
</td> </td>
<td><a href="add.html?start=$start&amp;end=$end"><b>Add data</b></a></td> <td class="menu"><a href="add.html?start=$start&amp;end=$end"><b>Add data</b></a></td>
</tr> </tr>
</table> </table>
<table style="width:$(( graph_width + 97 ))px"> <table style="width:$(( graph_width + 97 ))px">
@ -448,7 +450,7 @@ then
</tr> </tr>
</table> </table>
</div> </div>
<div style="position:absolute; top:4.5em"> <div class="main">
EOHTML EOHTML
if (( show_all )) if (( show_all ))
@ -495,14 +497,12 @@ then
height=155 height=155
fi fi
cat <<-EOHTML cat <<-EOHTML
<div> <div id="$stat" class="anchor" />
<img <img
src="?graph=$stat&amp;start=$start&amp;end=$end" src="?graph=$stat&amp;start=$start&amp;end=$end"
width="$(( graph_width + 97 ))" width="$(( graph_width + 97 ))"
height="$height" height="$height"
id="$stat"
alt="Ingress $stat evolution" /> alt="Ingress $stat evolution" />
</div>
EOHTML EOHTML
done done
fi fi