From: Jo-Philipp Wich <jo@mein.io>
Date: Sat, 7 Jul 2018 13:02:37 +0000 (+0200)
Subject: luci-mod-admin-full: use sans-serif fonts for realtime graph legends
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=069c0c93e1045188c9e86c8e7204b0647d2fdb19;p=oweals%2Fluci.git

luci-mod-admin-full: use sans-serif fonts for realtime graph legends

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg b/modules/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg
index 4f9148833..d7f0eeef3 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg
+++ b/modules/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg
@@ -2,15 +2,15 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 
 <svg width="100%" height="100%" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<polyline id="rx" points="" style="fill:blue;fill-opacity:0.4;stroke:blue;stroke-width:1" />
+	<polyline id="tx" points="" style="fill:green;fill-opacity:0.4;stroke:green;stroke-width:1" />
+
 	<line x1="0" y1="25%" x2="100%" y2="25%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt"> </text>
+	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 
 	<line x1="0" y1="50%" x2="100%" y2="50%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt"> </text>
+	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 
 	<line x1="0" y1="75%" x2="100%" y2="75%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt"> </text>
-
-	<polyline id="rx" points="" style="fill:blue;fill-opacity:0.4;stroke:blue;stroke-width:1" />
-	<polyline id="tx" points="" style="fill:green;fill-opacity:0.4;stroke:green;stroke-width:1" />
+	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 </svg>
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg b/modules/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg
index 816f7e6a7..40ee6c409 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg
+++ b/modules/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg
@@ -2,16 +2,16 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 
 <svg width="100%" height="100%" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<polyline id="tcp" points="" style="fill:green;fill-opacity:0.4;stroke:green;stroke-width:1" />
+	<polyline id="udp" points="" style="fill:blue;fill-opacity:0.4;stroke:blue;stroke-width:1" />
+	<polyline id="other" points="" style="fill:red;fill-opacity:0.4;stroke:red;stroke-width:1" />
+
 	<line x1="0" y1="25%" x2="100%" y2="25%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt"> </text>
+	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 
 	<line x1="0" y1="50%" x2="100%" y2="50%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt"> </text>
+	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 
 	<line x1="0" y1="75%" x2="100%" y2="75%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt"> </text>
-
-	<polyline id="tcp" points="" style="fill:green;fill-opacity:0.4;stroke:green;stroke-width:1" />
-	<polyline id="udp" points="" style="fill:blue;fill-opacity:0.4;stroke:blue;stroke-width:1" />
-	<polyline id="other" points="" style="fill:red;fill-opacity:0.4;stroke:red;stroke-width:1" />
+	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 </svg>
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/load.svg b/modules/luci-mod-admin-full/htdocs/luci-static/resources/load.svg
index d6817027a..e705d5261 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/load.svg
+++ b/modules/luci-mod-admin-full/htdocs/luci-static/resources/load.svg
@@ -2,16 +2,16 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 
 <svg width="100%" height="100%" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<polyline id="load01" points="" style="fill:#ff0000;fill-opacity:0.4;stroke:#ff0000;stroke-width:1" />
+	<polyline id="load05" points="" style="fill:#ff6600;fill-opacity:0.4;stroke:#ff6600;stroke-width:1" />
+	<polyline id="load15" points="" style="fill:#ffaa00;fill-opacity:0.4;stroke:#ffaa00;stroke-width:1" />
+
 	<line x1="0" y1="25%" x2="100%" y2="25%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt"> </text>
+	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 
 	<line x1="0" y1="50%" x2="100%" y2="50%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt"> </text>
+	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 
 	<line x1="0" y1="75%" x2="100%" y2="75%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt"> </text>
-
-	<polyline id="load01" points="" style="fill:#ff0000;fill-opacity:0.4;stroke:#ff0000;stroke-width:1" />
-	<polyline id="load05" points="" style="fill:#ff6600;fill-opacity:0.4;stroke:#ff6600;stroke-width:1" />
-	<polyline id="load15" points="" style="fill:#ffaa00;fill-opacity:0.4;stroke:#ffaa00;stroke-width:1" />
+	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 </svg>
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg b/modules/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg
index d3e848b93..7184cbb03 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg
+++ b/modules/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg
@@ -2,14 +2,14 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 
 <svg width="100%" height="100%" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<polyline id="rate" points="" style="fill:green;fill-opacity:0.4;stroke:green;stroke-width:1" />
+
 	<line x1="0" y1="25%" x2="100%" y2="25%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt"> </text>
+	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 
 	<line x1="0" y1="50%" x2="100%" y2="50%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt"> </text>
+	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 
 	<line x1="0" y1="75%" x2="100%" y2="75%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt"> </text>
-
-	<polyline id="rate" points="" style="fill:green;fill-opacity:0.4;stroke:green;stroke-width:1" />
+	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 </svg>
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg b/modules/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg
index 99d9840f6..aa1f63f10 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg
+++ b/modules/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg
@@ -2,15 +2,15 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 
 <svg width="100%" height="100%" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<polyline id="rssi" points="" style="fill:blue;fill-opacity:0.4;stroke:blue;stroke-width:1" />
+	<polyline id="noise" points="" style="fill:red;fill-opacity:0.4;stroke:red;stroke-width:1" />
+
 	<line x1="0" y1="25%" x2="100%" y2="25%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt"> </text>
+	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 
 	<line x1="0" y1="50%" x2="100%" y2="50%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt"> </text>
+	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 
 	<line x1="0" y1="75%" x2="100%" y2="75%" style="stroke:black;stroke-width:0.1" />
-	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt"> </text>
-
-	<polyline id="rssi" points="" style="fill:blue;fill-opacity:0.4;stroke:blue;stroke-width:1" />
-	<polyline id="noise" points="" style="fill:red;fill-opacity:0.4;stroke:red;stroke-width:1" />
+	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt; font-family:sans-serif;"> </text>
 </svg>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
index ae8a6bb7c..152167424 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
@@ -124,7 +124,7 @@
 					var text = G.createElementNS('http://www.w3.org/2000/svg', 'text');
 						text.setAttribute('x', i + 5);
 						text.setAttribute('y', 15);
-						text.setAttribute('style', 'fill:#999999; font-size:9pt');
+						text.setAttribute('style', 'fill:#999999; font-size:9pt; font-family:sans-serif');
 						text.appendChild(G.createTextNode(Math.round((width - i) / step / 60) + 'm'));
 
 					label_25.parentNode.appendChild(line);
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
index dc7d927de..8cd36a308 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
@@ -119,7 +119,7 @@
 					var text = G.createElementNS('http://www.w3.org/2000/svg', 'text');
 						text.setAttribute('x', i + 5);
 						text.setAttribute('y', 15);
-						text.setAttribute('style', 'fill:#999999; font-size:9pt');
+						text.setAttribute('style', 'fill:#999999; font-size:9pt; font-family:sans-serif');
 						text.appendChild(G.createTextNode(Math.round((width - i) / step / 60) + 'm'));
 
 					label_25.parentNode.appendChild(line);
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
index 1806f4a6c..a19a1235b 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
@@ -141,7 +141,7 @@
 					var text = G.createElementNS('http://www.w3.org/2000/svg', 'text');
 						text.setAttribute('x', i + 5);
 						text.setAttribute('y', 15);
-						text.setAttribute('style', 'fill:#999999; font-size:9pt');
+						text.setAttribute('style', 'fill:#999999; font-size:9pt; font-family:sans-serif');
 						text.appendChild(G.createTextNode(Math.round((width - i) / step / 60) + 'm'));
 
 					label_25.parentNode.appendChild(line);
@@ -158,7 +158,7 @@
 					var text2 = G2.createElementNS('http://www.w3.org/2000/svg', 'text');
 						text2.setAttribute('x', i + 5);
 						text2.setAttribute('y', 15);
-						text2.setAttribute('style', 'fill:#999999; font-size:9pt');
+						text2.setAttribute('style', 'fill:#999999; font-size:9pt; font-family:sans-serif');
 						text2.appendChild(G.createTextNode(Math.round((width - i) / step / 60) + 'm'));
 
 					label_25_2.parentNode.appendChild(line2);