Merge remote-tracking branch 'origin/master' into prod
* origin/master: show owned badges fix table width
This commit is contained in:
commit
f6e2c43832
126
graph
126
graph
@ -180,53 +180,134 @@ then
|
||||
if (( last["$stat"] >= bronze["$stat"] ))
|
||||
then
|
||||
(( bronzecount++ ))
|
||||
bronzes+=( "$stat" )
|
||||
else
|
||||
upbronze[last["$stat"] * 100 / bronze["$stat"]]+="$stat "
|
||||
fi
|
||||
if (( last["$stat"] >= silver["$stat"] ))
|
||||
then
|
||||
(( silvercount++ ))
|
||||
silvers+=( "$stat" )
|
||||
else
|
||||
upsilver[last["$stat"] * 100 / silver["$stat"]]+="$stat "
|
||||
fi
|
||||
if (( last["$stat"] >= gold["$stat"] ))
|
||||
then
|
||||
(( goldcount++ ))
|
||||
golds+=( "$stat" )
|
||||
else
|
||||
upgold[last["$stat"] * 100 / gold["$stat"]]+="$stat "
|
||||
fi
|
||||
if (( last["$stat"] >= platinum["$stat"] ))
|
||||
then
|
||||
(( platinumcount++ ))
|
||||
platinums+=( "$stat" )
|
||||
else
|
||||
upplatinum[last["$stat"] * 100 / platinum["$stat"]]+="$stat "
|
||||
fi
|
||||
if (( last["$stat"] >= black["$stat"] ))
|
||||
then
|
||||
(( blackcount++ ))
|
||||
blacks+=( "$stat" )
|
||||
else
|
||||
upblack[last["$stat"] * 100 / black["$stat"]]+="$stat "
|
||||
fi
|
||||
done
|
||||
cat <<-EOHTML
|
||||
<div>
|
||||
<table>
|
||||
<table style="width:840px">
|
||||
<tr>
|
||||
<td>Level</td>
|
||||
<td>AP</td>
|
||||
<td>Silver</td>
|
||||
<td>Gold</td>
|
||||
<td>Platinum</td>
|
||||
<td>Black</td>
|
||||
<td style="width:170px">Silver</td>
|
||||
<td style="width:170px">Gold</td>
|
||||
<td style="width:170px">Platinum</td>
|
||||
<td style="width:170px">Black</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> </td>
|
||||
<td>${last["AP"]}</td>
|
||||
<td>$silvercount</td>
|
||||
<td>$goldcount</td>
|
||||
<td>$platinumcount</td>
|
||||
<td>$blackcount</td>
|
||||
</tr>
|
||||
<td>
|
||||
EOHTML
|
||||
for stat in ${silvers[@]}
|
||||
do
|
||||
img=${stat,,}
|
||||
cat <<-EOHTML
|
||||
<a
|
||||
style="color:black;text-decoration:none"
|
||||
href="#$stat">
|
||||
<img
|
||||
width="30"
|
||||
height="30"
|
||||
src="/${img//_/-}-silver.png"
|
||||
title="$stat"
|
||||
alt="$stat silver" />
|
||||
</a>
|
||||
EOHTML
|
||||
done
|
||||
cat <<-EOHTML
|
||||
</td>
|
||||
<td>
|
||||
EOHTML
|
||||
for stat in ${golds[@]}
|
||||
do
|
||||
img=${stat,,}
|
||||
cat <<-EOHTML
|
||||
<a
|
||||
style="color:black;text-decoration:none"
|
||||
href="#$stat">
|
||||
<img
|
||||
width="30"
|
||||
height="30"
|
||||
src="/${img//_/-}-gold.png"
|
||||
title="$stat"
|
||||
alt="$stat gold" />
|
||||
</a>
|
||||
EOHTML
|
||||
done
|
||||
cat <<-EOHTML
|
||||
</td>
|
||||
<td>
|
||||
EOHTML
|
||||
for stat in ${platinums[@]}
|
||||
do
|
||||
img=${stat,,}
|
||||
cat <<-EOHTML
|
||||
<a
|
||||
style="color:black;text-decoration:none"
|
||||
href="#$stat">
|
||||
<img
|
||||
width="30"
|
||||
height="30"
|
||||
src="/${img//_/-}-platinum.png"
|
||||
title="$stat"
|
||||
alt="$stat platinum" />
|
||||
</a>
|
||||
EOHTML
|
||||
done
|
||||
cat <<-EOHTML
|
||||
</td>
|
||||
<td>
|
||||
EOHTML
|
||||
for stat in ${blacks[@]}
|
||||
do
|
||||
img=${stat,,}
|
||||
cat <<-EOHTML
|
||||
<a
|
||||
style="color:black;text-decoration:none"
|
||||
href="#$stat">
|
||||
<img
|
||||
width="30"
|
||||
height="30"
|
||||
src="/${img//_/-}-black.png"
|
||||
title="$stat"
|
||||
alt="$stat black" />
|
||||
</a>
|
||||
EOHTML
|
||||
done
|
||||
cat <<-EOHTML
|
||||
</td>
|
||||
</tr>
|
||||
EOHTML
|
||||
for level in {1..16}
|
||||
do
|
||||
@ -237,11 +318,10 @@ then
|
||||
printf "%'li" ${lvl[level]}
|
||||
echo '</td>'
|
||||
else
|
||||
echo '<td style="background:lightgrey">'
|
||||
printf "%'li" ${lvl[level]}
|
||||
echo " (<span style=\"color:#FF2020;font-weight:bold\">"
|
||||
printf "%'li" $(( last["AP"] - lvl[level] ))
|
||||
echo '</span>)</td>'
|
||||
readable=$(printf "%'li" ${lvl[level]})
|
||||
echo '<td style="background:lightgrey">'"${readable// / }"
|
||||
readable=$(printf "%'li" $(( last["AP"] - lvl[level] )))
|
||||
echo "<br />(<span style=\"color:#FF2020;font-weight:bold\">${readable// / }</span>)</td>"
|
||||
fi
|
||||
if (( silvercount >= lvlsilver[level] ))
|
||||
then
|
||||
@ -261,8 +341,8 @@ then
|
||||
style="background:#$(printf %02x%02x $redlevel $greenlevel )00;color:black;text-decoration:none"
|
||||
href="#$stat">
|
||||
<img
|
||||
width="40"
|
||||
height="40"
|
||||
width="30"
|
||||
height="30"
|
||||
src="/${img//_/-}-silver.png"
|
||||
title="$stat $id%"
|
||||
alt="$stat silver" />
|
||||
@ -290,8 +370,8 @@ then
|
||||
style="background:#$(printf %02x%02x $redlevel $greenlevel )00;color:black;text-decoration:none"
|
||||
href="#$stat">
|
||||
<img
|
||||
width="40"
|
||||
height="40"
|
||||
width="30"
|
||||
height="30"
|
||||
src="/${img//_/-}-gold.png"
|
||||
title="$stat $id%"
|
||||
alt="$stat gold" />
|
||||
@ -319,8 +399,8 @@ then
|
||||
style="background:#$(printf %02x%02x $redlevel $greenlevel )00;color:black;text-decoration:none"
|
||||
href="#$stat">
|
||||
<img
|
||||
width="40"
|
||||
height="40"
|
||||
width="30"
|
||||
height="30"
|
||||
src="/${img//_/-}-platinum.png"
|
||||
title="$stat $id%"
|
||||
alt="$stat platinum" />
|
||||
@ -348,8 +428,8 @@ then
|
||||
style="background:#$(printf %02x%02x $redlevel $greenlevel )00;color:black;text-decoration:none"
|
||||
href="#$stat">
|
||||
<img
|
||||
width="40"
|
||||
height="40"
|
||||
width="30"
|
||||
height="30"
|
||||
src="/${img//_/-}-black.png"
|
||||
title="$stat $id%"
|
||||
alt="$stat black" />
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user