This commit is contained in:
Vincent Riquer 2014-06-21 03:39:09 +02:00
parent f6e2ae750b
commit 806c141d9f
2 changed files with 92 additions and 51 deletions

View File

@ -59,20 +59,29 @@ Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z')
<title>IngRRD - Add data</title> <title>IngRRD - Add data</title>
</head> </head>
<body> <body>
<table style="border:1px solid black; border-collapse:collapse"> <div style="position:relative; clear:both; margin:auto; width:$(( graph_width + 97 ))px">
<table style="width:$(( graph_width + 97 ))px; text-align:center; border:1px solid black; border-collapse:collapse">
<tr> <tr>
<td style="border:1px solid black"><a href="/cgi/$webuser/?start=$start&amp;end=$end">Overview</a></td> <td style="border:1px solid black"><a href="/cgi/$webuser/?start=$start&amp;end=$end">Overview</a></td>
<td style="border:1px solid black"> <td style="border:1px solid black">
<table> <table style="width:100%; border-collapse:collapse">
<tr> <tr>
<td rowspan="2"><a href="?hist&amp;start=$start&amp;end=$end">History /</a></td> <td colspan="2" style="text-align:center">
<td> <a href="/cgi/$webuser/?hist&amp;start=$start&amp;end=$end">
<a href="?hist&amp;start=$start&amp;end=$end">Medals</a> History
</a>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td style="border:1px solid black">
<a href="?hist&amp;show=all&amp;start=$start&amp;end=$end">All</a> <a href="/cgi/$webuser/?hist&amp;start=$start&amp;end=$end">
Medals
</a>
</td>
<td style="border:1px solid black">
<a href="/cgi/$webuser/?hist&amp;show=all&amp;start=$start&amp;end=$end">
All
</a>
</td> </td>
</tr> </tr>
</table> </table>
@ -143,6 +152,29 @@ cat <<-EOHTML
<input type="hidden" name="end" value="$end" /> <input type="hidden" name="end" value="$end" />
<button type="submit" name="submit" value="send">Send</button> <button type="submit" name="submit" value="send">Send</button>
</form> </form>
<table style="width:$(( graph_width + 97 ))px">
<tr>
<td>
<a
href="http://validator.w3.org/check?uri=https%3A%2F%2F$SERVER_NAME$encodeduri">
<img
src="/valid-xhtml11"
alt="Valid XHTML 1.1"
height="31"
width="88" />
</a>
</td>
<td style="text-align:center">
Generated by <a href="https://forge.riquer.fr/p/ingrrd/">IngRRD</a> &copy; 2014 Vincent Riquer
</td>
<td style="text-align:right">
<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">
<img src="/AGPL.png" height="31" width="88" />
</a>
</td>
</tr>
</table>
</div>
</body> </body>
</html> </html>
EOHTML EOHTML

97
index
View File

@ -78,24 +78,25 @@ then
<title>IngRRD - Graph</title> <title>IngRRD - Graph</title>
</head> </head>
<body> <body>
<div style="position:relative; clear:both; margin:auto; width:$(( graph_width + 97 ))px">
EOHTML EOHTML
if (( ! show_graphs )) if (( ! show_graphs ))
then then
cat <<-EOHTML cat <<-EOHTML
<table style="border:1px solid black; border-collapse:collapse"> <table style="width:$(( graph_width + 97 ))px; text-align:center; border:1px solid black; border-collapse:collapse">
<tr> <tr>
<td style="background:black; color:white">Overview</td> <td style="background:black; color:white">Overview</td>
<td style="border:1px solid black"> <td style="border:1px solid black">
<table> <table style="width:100%; border-collapse:collapse">
<tr> <tr>
<td rowspan="2"><a href="?hist&amp;start=$start&amp;end=$end">History /</a></td> <td colspan="2" style="text-align:center"><a href="?hist&amp;start=$start&amp;end=$end">History</a></td>
<td>
<a href="?hist&amp;start=$start&amp;end=$end">Medals</a>
</td>
</tr> </tr>
<tr> <tr>
<td> <td style="border:1px solid black">
<a href="?hist&amp;start=$start&amp;end=$end">Medals</a>
</td>
<td style="border:1px solid black">
<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>
@ -168,8 +169,8 @@ then
</tr> </tr>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>${last["AP"]}</td> <td style="text-align:right">$(printf "%'li" ${last["AP"]})</td>
<td> <td style="text-align:center">
EOHTML EOHTML
for stat in ${silvers[@]} for stat in ${silvers[@]}
do do
@ -189,7 +190,7 @@ then
done done
cat <<-EOHTML cat <<-EOHTML
</td> </td>
<td> <td style="text-align:center">
EOHTML EOHTML
for stat in ${golds[@]} for stat in ${golds[@]}
do do
@ -209,7 +210,7 @@ then
done done
cat <<-EOHTML cat <<-EOHTML
</td> </td>
<td> <td style="text-align:center">
EOHTML EOHTML
for stat in ${platinums[@]} for stat in ${platinums[@]}
do do
@ -229,7 +230,7 @@ then
done done
cat <<-EOHTML cat <<-EOHTML
</td> </td>
<td> <td style="text-align:center">
EOHTML EOHTML
for stat in ${blacks[@]} for stat in ${blacks[@]}
do do
@ -389,31 +390,30 @@ then
EOHTML EOHTML
else else
cat <<-EOHTML cat <<-EOHTML
<table style="border:1px solid black; border-collapse:collapse"> <table style="width:$(( graph_width + 97 ))px; text-align:center; border:1px solid black; border-collapse:collapse">
<tr> <tr>
<td><a href="?start=$start&amp;end=$end">Overview</a></td> <td><a href="?start=$start&amp;end=$end">Overview</a></td>
<td style="background:black; color:white"> <td style="background:black; color:white">
<table> <table style="width:100%; border-collapse:collapse">
<tr> <tr>
<td rowspan="2">History /</td> <td colspan="2" style="text-align:center">History</td>
</tr>
EOHTML EOHTML
if (( show_all )) if (( show_all ))
then then
cat <<-EOHTML cat <<-EOHTML
<td style="background:white; color:black"> <tr>
<td style="background:white; color:black; border:1px solid black">
<a href="?hist&amp;start=$start&amp;end=$end">Medals</a> <a href="?hist&amp;start=$start&amp;end=$end">Medals</a>
</td> </td>
</tr> <td style="background:#505050; color:white; border:1px solid black">All</td>
<tr>
<td style="background:#505050; color:white">All</td>
</tr> </tr>
EOHTML EOHTML
else else
cat <<-EOHTML cat <<-EOHTML
<td style="background:#505050; color:white">Medals</td>
</tr>
<tr> <tr>
<td style="background:white; color:black"> <td style="background:#505050; color:white; border:1px solid black">Medals</td>
<td style="background:white; color:black; border:1px solid black">
<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>
@ -482,10 +482,18 @@ then
for stat in "${stats[@]}" for stat in "${stats[@]}"
do do
if [[ $stat == AP ]] || (( bronze["$stat"] ))
then
height=169
else
height=155
fi
cat <<-EOHTML cat <<-EOHTML
<div> <div>
<img <img
src="?graph=$stat&amp;start=$start&amp;end=$end" src="?graph=$stat&amp;start=$start&amp;end=$end"
width="$(( graph_width + 97 ))"
height="$height"
id="$stat" id="$stat"
alt="Ingress $stat evolution" /> alt="Ingress $stat evolution" />
</div> </div>
@ -497,28 +505,29 @@ then
encodeduri="${encodeduri//\=/%3D}" encodeduri="${encodeduri//\=/%3D}"
encodeduri="${encodeduri//\&/%26}" encodeduri="${encodeduri//\&/%26}"
cat <<-EOHTML cat <<-EOHTML
<table> <table style="width:$(( graph_width + 97 ))px">
<tr> <tr>
<td> <td>
<a <a
href="http://validator.w3.org/check?uri=https%3A%2F%2F$SERVER_NAME$encodeduri"> href="http://validator.w3.org/check?uri=https%3A%2F%2F$SERVER_NAME$encodeduri">
<img <img
src="/valid-xhtml11" src="/valid-xhtml11"
alt="Valid XHTML 1.1" alt="Valid XHTML 1.1"
height="31" height="31"
width="88" /> width="88" />
</a> </a>
</td> </td>
<td> <td style="text-align:center">
Generated by <a href="https://forge.riquer.fr/p/ingrrd/">IngRRD</a> &copy; 2014 Vincent Riquer Generated by <a href="https://forge.riquer.fr/p/ingrrd/">IngRRD</a> &copy; 2014 Vincent Riquer
</td> </td>
<td> <td style="text-align:right">
<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html"> <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">
<img src="/AGPL.png" height="31" width="88" /> <img src="/AGPL.png" height="31" width="88" />
</a> </a>
</td> </td>
</tr> </tr>
</table> </table>
</div>
</body></html> </body></html>
EOHTML EOHTML
else else