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

* origin/master:
  * medals: 0% is 100% for the lower medal

ingrrd.css

@@ -126,11 +126,23 @@ img.badge {
 	height: 30px;
 }
 
+img.nobadge {
+	width: 30px;
+	height: 30px;
+	opacity: 0.8;
+}
+
 img.minibadge {
 	width: 20px;
 	height: 20px;
 }
 
+img.nominibadge {
+	width: 20px;
+	height: 20px;
+	opacity: 0.5;
+}
+
 span.missing {
 	color: red;
 	font-weight: bold;

lib/globals

@@ -1,7 +1,11 @@
 #!/bin/bash
 
-declare -A	\
+declare -A		\
-	last	\
+	last		\
+	nosilver	\
+	nogold		\
+	noplatinum	\
+	noblack		\
 
 declare -a		\
 	bronzes		\

lib/medals

@@ -17,29 +17,41 @@ medals() {
 		then
 			(( silvercount++ ))
 			silvers+=( "$stat" )
+		elif (( last["$stat"] >= bronze["$stat"] ))
+		then
+			upsilver[( last["$stat"] - bronze["$stat"] ) * 100 / ( silver["$stat"] - bronze["$stat"] )]+="$stat "
 		else
-			upsilver[last["$stat"] * 100 / silver["$stat"]]+="$stat "
+			nosilver["$stat"]=1
 		fi
 		if (( last["$stat"] >= gold["$stat"] ))
 		then
 			(( goldcount++ ))
 			golds+=( "$stat" )
+		elif (( last["$stat"] >= silver["$stat"] ))
+		then
+			upgold[( last["$stat"] - silver["$stat"] ) * 100 / ( gold["$stat"] - silver["$stat"] )]+="$stat "
 		else
-			upgold[last["$stat"] * 100 / gold["$stat"]]+="$stat "
+			nogold["$stat"]=1
 		fi
 		if (( last["$stat"] >= platinum["$stat"] ))
 		then
 			(( platinumcount++ ))
 			platinums+=( "$stat" )
+		elif (( last["$stat"] >= gold["$stat"] ))
+		then
+			upplatinum[( last["$stat"] - gold["$stat"] ) * 100 / ( platinum["$stat"] - gold["$stat"] )]+="$stat "
 		else
-			upplatinum[last["$stat"] * 100 / platinum["$stat"]]+="$stat "
+			noplatinum["$stat"]=1
 		fi
 		if (( last["$stat"] >= black["$stat"] ))
 		then
 			(( blackcount++ ))
 			blacks+=( "$stat" )
+		elif (( last["$stat"] >= platinum["$stat"] ))
+		then
+			upblack[( last["$stat"] - platinum["$stat"] ) * 100 / ( black["$stat"] - platinum["$stat"] )]+="$stat "
 		else
-			upblack[last["$stat"] * 100 / black["$stat"]]+="$stat "
+			noblack["$stat"]=1
 		fi
 	done
 }

lib/show_current_level

@@ -84,6 +84,21 @@ show_current_level() {
 				EOHTML
 			done
 		done
+		for stat in ${!nosilver[@]}
+		do
+			img=${stat,,}
+			cat <<-EOHTML
+				<a
+				class="badge"
+				href="?hist&amp;start=$start&amp;end=$end#$stat">
+					<img
+					class="nominibadge"
+					src="/${img//_/-}-silver.png"
+					title="$stat $id%"
+					alt="$stat silver" />
+				</a>
+			EOHTML
+		done
 	cat <<-EOHTML
 				</td>
 				<td class="curbadge">
@@ -124,6 +139,21 @@ show_current_level() {
 			EOHTML
 		done
 	done
+	for stat in ${!nogold[@]}
+	do
+		img=${stat,,}
+		cat <<-EOHTML
+			<a
+			class="badge"
+			href="?hist&amp;start=$start&amp;end=$end#$stat">
+				<img
+				class="nominibadge"
+				src="/${img//_/-}-gold.png"
+				title="$stat $id%"
+				alt="$stat gold" />
+			</a>
+		EOHTML
+	done
 	cat <<-EOHTML
 				</td>
 				<td class="curbadge">
@@ -164,6 +194,21 @@ show_current_level() {
 			EOHTML
 		done
 	done
+	for stat in ${!noplatinum[@]}
+	do
+		img=${stat,,}
+		cat <<-EOHTML
+			<a
+			class="badge"
+			href="?hist&amp;start=$start&amp;end=$end#$stat">
+				<img
+				class="nominibadge"
+				src="/${img//_/-}-platinum.png"
+				title="$stat $id%"
+				alt="$stat platinum" />
+			</a>
+		EOHTML
+	done
 	cat <<-EOHTML
 				</td>
 				<td class="curbadge">
@@ -204,6 +249,21 @@ show_current_level() {
 			EOHTML
 		done
 	done
+	for stat in ${!noblack[@]}
+	do
+		img=${stat,,}
+		cat <<-EOHTML
+			<a
+			class="badge"
+			href="?hist&amp;start=$start&amp;end=$end#$stat">
+				<img
+				class="nominibadge"
+				src="/${img//_/-}-black.png"
+				title="$stat $id%"
+				alt="$stat black" />
+			</a>
+		EOHTML
+	done
 	cat <<-EOHTML
 				</td>
 			</tr>