Merge remote-tracking branch 'origin/master' into prod
* origin/master: fancier
This commit is contained in:
Vincent Riquer
commit
67b0823520
46
add.html
46
add.html
@ -59,20 +59,29 @@ Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z')
|
||||
<title>IngRRD - Add data</title>
|
||||
</head>
|
||||
<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>
|
||||
<td style="border:1px solid black"><a href="/cgi/$webuser/?start=$start&end=$end">Overview</a></td>
|
||||
<td style="border:1px solid black">
|
||||
<table>
|
||||
<table style="width:100%; border-collapse:collapse">
|
||||
<tr>
|
||||
<td rowspan="2"><a href="?hist&start=$start&end=$end">History /</a></td>
|
||||
<td>
|
||||
<a href="?hist&start=$start&end=$end">Medals</a>
|
||||
<td colspan="2" style="text-align:center">
|
||||
<a href="/cgi/$webuser/?hist&start=$start&end=$end">
|
||||
History
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<a href="?hist&show=all&start=$start&end=$end">All</a>
|
||||
<td style="border:1px solid black">
|
||||
<a href="/cgi/$webuser/?hist&start=$start&end=$end">
|
||||
Medals
|
||||
</a>
|
||||
</td>
|
||||
<td style="border:1px solid black">
|
||||
<a href="/cgi/$webuser/?hist&show=all&start=$start&end=$end">
|
||||
All
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@ -143,6 +152,29 @@ cat <<-EOHTML
|
||||
<input type="hidden" name="end" value="$end" />
|
||||
<button type="submit" name="submit" value="send">Send</button>
|
||||
</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> © 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>
|
||||
</html>
|
||||
EOHTML
|
||||
|
||||
97
index
97
index
@ -78,24 +78,25 @@ then
|
||||
<title>IngRRD - Graph</title>
|
||||
</head>
|
||||
<body>
|
||||
<div style="position:relative; clear:both; margin:auto; width:$(( graph_width + 97 ))px">
|
||||
EOHTML
|
||||
|
||||
if (( ! show_graphs ))
|
||||
then
|
||||
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>
|
||||
<td style="background:black; color:white">Overview</td>
|
||||
<td style="border:1px solid black">
|
||||
<table>
|
||||
<table style="width:100%; border-collapse:collapse">
|
||||
<tr>
|
||||
<td rowspan="2"><a href="?hist&start=$start&end=$end">History /</a></td>
|
||||
<td>
|
||||
<a href="?hist&start=$start&end=$end">Medals</a>
|
||||
</td>
|
||||
<td colspan="2" style="text-align:center"><a href="?hist&start=$start&end=$end">History</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<td style="border:1px solid black">
|
||||
<a href="?hist&start=$start&end=$end">Medals</a>
|
||||
</td>
|
||||
<td style="border:1px solid black">
|
||||
<a href="?hist&show=all&start=$start&end=$end">All</a>
|
||||
</td>
|
||||
</tr>
|
||||
@ -168,8 +169,8 @@ then
|
||||
</tr>
|
||||
<tr>
|
||||
<td> </td>
|
||||
<td>${last["AP"]}</td>
|
||||
<td>
|
||||
<td style="text-align:right">$(printf "%'li" ${last["AP"]})</td>
|
||||
<td style="text-align:center">
|
||||
EOHTML
|
||||
for stat in ${silvers[@]}
|
||||
do
|
||||
@ -189,7 +190,7 @@ then
|
||||
done
|
||||
cat <<-EOHTML
|
||||
</td>
|
||||
<td>
|
||||
<td style="text-align:center">
|
||||
EOHTML
|
||||
for stat in ${golds[@]}
|
||||
do
|
||||
@ -209,7 +210,7 @@ then
|
||||
done
|
||||
cat <<-EOHTML
|
||||
</td>
|
||||
<td>
|
||||
<td style="text-align:center">
|
||||
EOHTML
|
||||
for stat in ${platinums[@]}
|
||||
do
|
||||
@ -229,7 +230,7 @@ then
|
||||
done
|
||||
cat <<-EOHTML
|
||||
</td>
|
||||
<td>
|
||||
<td style="text-align:center">
|
||||
EOHTML
|
||||
for stat in ${blacks[@]}
|
||||
do
|
||||
@ -389,31 +390,30 @@ then
|
||||
EOHTML
|
||||
else
|
||||
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>
|
||||
<td><a href="?start=$start&end=$end">Overview</a></td>
|
||||
<td style="background:black; color:white">
|
||||
<table>
|
||||
<table style="width:100%; border-collapse:collapse">
|
||||
<tr>
|
||||
<td rowspan="2">History /</td>
|
||||
<td colspan="2" style="text-align:center">History</td>
|
||||
</tr>
|
||||
EOHTML
|
||||
if (( show_all ))
|
||||
then
|
||||
cat <<-EOHTML
|
||||
<td style="background:white; color:black">
|
||||
<tr>
|
||||
<td style="background:white; color:black; border:1px solid black">
|
||||
<a href="?hist&start=$start&end=$end">Medals</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="background:#505050; color:white">All</td>
|
||||
<td style="background:#505050; color:white; border:1px solid black">All</td>
|
||||
</tr>
|
||||
EOHTML
|
||||
else
|
||||
cat <<-EOHTML
|
||||
<td style="background:#505050; color:white">Medals</td>
|
||||
</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&show=all&start=$start&end=$end">All</a>
|
||||
</td>
|
||||
</tr>
|
||||
@ -482,10 +482,18 @@ then
|
||||
|
||||
for stat in "${stats[@]}"
|
||||
do
|
||||
if [[ $stat == AP ]] || (( bronze["$stat"] ))
|
||||
then
|
||||
height=169
|
||||
else
|
||||
height=155
|
||||
fi
|
||||
cat <<-EOHTML
|
||||
<div>
|
||||
<img
|
||||
src="?graph=$stat&start=$start&end=$end"
|
||||
width="$(( graph_width + 97 ))"
|
||||
height="$height"
|
||||
id="$stat"
|
||||
alt="Ingress $stat evolution" />
|
||||
</div>
|
||||
@ -497,28 +505,29 @@ then
|
||||
encodeduri="${encodeduri//\=/%3D}"
|
||||
encodeduri="${encodeduri//\&/%26}"
|
||||
cat <<-EOHTML
|
||||
<table>
|
||||
<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>
|
||||
Generated by <a href="https://forge.riquer.fr/p/ingrrd/">IngRRD</a> © 2014 Vincent Riquer
|
||||
</td>
|
||||
<td>
|
||||
<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">
|
||||
<img src="/AGPL.png" height="31" width="88" />
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<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> © 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></html>
|
||||
EOHTML
|
||||
else
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user