[locationinfo] Use styled DIVs instead of SVGs for PC icons

10 files changed, 81 insertions, 473 deletions

diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php
index ebea0ccb..74b9fc96 100644
--- a/modules-available/locationinfo/api.inc.php
+++ b/modules-available/locationinfo/api.inc.php
@@ -100,6 +100,7 @@ function appendMachineData(&$array, $idList = false, $withPosition = false)
 			}
 		}
 		$pc['pcState'] = LocationInfo::getPcState($row);
+		//$pc['pcState'] = ['BROKEN', 'OFF', 'IDLE', 'OCCUPIED'][mt_rand(0,3)];
 
 		// Add the array to the machines list.
 		$array[$row['locationid']]['machines'][] = $pc;
diff --git a/modules-available/locationinfo/frontend/doorsign.html b/modules-available/locationinfo/frontend/doorsign.html
index baee4dca..00fc9bce 100755
--- a/modules-available/locationinfo/frontend/doorsign.html
+++ b/modules-available/locationinfo/frontend/doorsign.html
@@ -140,11 +140,11 @@ optional:
 
 		.location-container {
 			position: absolute;
-			background-color: white;
 			width: 100%;
 			height: 100%;
 			overflow: hidden;
 			border: 1px solid darkgrey;
+			background: linear-gradient(#ddd, white);
 
 		}
 
@@ -152,11 +152,10 @@ optional:
 			float: left;
 			padding: 0;
 			box-sizing: border-box;
-			background: linear-gradient(#cccccc, white);
 		}
 
 		.free-busy-busy {
-			background: grey;
+			background: rgba(0,0,0,.25);
 		}
 
 		.ui-widget-content {
@@ -172,12 +171,67 @@ optional:
 			text-shadow: none;
 		}
 
+		.BROKEN {
+			opacity: 0.4;
+		}
+
 		.pc-container {
 			position: absolute;
 			left: 0;
 			bottom: 0;
 			display: inline-block;
+			padding: 0;
+			margin: 0;
+			overflow: hidden;
+		}
+
+		.pc-container div {
+			box-sizing: border-box;
+		}
+
+		.screen-frame {
+			position: relative;
+			background: black;
+			border-radius: 15%;
+			width: 100%;
+			height: 80%;
+			padding: 10%;
+		}
+
+		.screen-inner {
+			width: 100%;
+			height: 100%;
+			transition: background 2s;
+		}
+
+		.BROKEN .screen-inner {
+			background: #000;
+		}
+
+		.OFF .screen-inner {
+			background: #0c9;
+		}
+
+		.IDLE .screen-inner {
+			background: #3e4;
+		}
 
+		.OCCUPIED .screen-inner {
+			background: #800;
+		}
+
+		.screen-foot1 {
+			margin: 0 auto;
+			width: 10%;
+			height: 10%;
+			background: black;
+		}
+
+		.screen-foot2 {
+			width: 100%;
+			height: 10%;
+			background: black;
+			border-radius: 30% 30% 0 0;
 		}
 
 		.pc-overlay-container {
@@ -225,7 +279,7 @@ optional:
 		}
 
 		.wc-today {
-			background-color: white;
+			background-color: rgba(255,255,255,.66);
 		}
 
 		.wc-time-header-cell {
@@ -239,6 +293,7 @@ optional:
 
 		.wc-scrollable-grid {
 			transition: height 500ms;
+			background: rgba(0,0,0,0);
 		}
 
 		.wc-scrollable-grid .wc-day-column-first {
@@ -270,7 +325,14 @@ optional:
 	var globalConfig = {};
 	var roomIds = [];
 	var panelUuid = false;
-	var supportSvg = typeof(SVGRect) !== "undefined";
+	var list;
+	if (typeof(SVGRect) !== "undefined") {
+		list = [".svg", ".png", ".jpg", ".gif"];
+	} else {
+		list = [".png", ".jpg", ".gif"];
+	}
+	const IMG_FORMAT_LIST = list;
+	delete list;
 	// TODO: Get languages from slx-admin
 	var translation = {
 		"en": {
@@ -1366,10 +1428,13 @@ optional:
 	function setUpRoom(room, layout) {
 		for (var i = 0; i < layout.length; i++) {
 			if (!isNaN(layout[i].y) && !isNaN(layout[i].x)) {
-				var $img = $('<img>').prop('id', "pc-img_" + room.id + "_" + layout[i].id).addClass('pc-img');
+				//var $img = $('<img>').prop('id', "pc-img_" + room.id + "_" + layout[i].id).addClass('pc-img');
 				var $overlays = $('<div>').addClass('pc-overlay-container');
-				layout[i].$div = $('<div>').addClass('pc-container');
-				layout[i].$div.append($overlays).append($img);
+				layout[i].$div = $('<div>').prop('id', "pc_" + room.id + "_" + layout[i].id).addClass('pc-container');
+				layout[i].$div.append($('<div>').addClass('screen-frame').append($('<div>').addClass('screen-inner')));
+				layout[i].$div.append($('<div>').addClass('screen-foot1'));
+				layout[i].$div.append($('<div>').addClass('screen-foot2'));
+				//layout[i].$div.append($overlays).append($img);
 				room.$.layout.append(layout[i].$div);
 
 				if (layout[i].overlay && layout[i].overlay.constructor === Array) {
@@ -1387,16 +1452,15 @@ optional:
 	 * @param overlayName name of the overlay (image name without ending)
 	 */
 	function addOverlay($container, overlayName) {
-		var a = [".svg", ".png", ".jpg"];
 		var imgname;
-		for (var i = 0; i < a.length; a++) {
-			if (imageExists("img/overlay/" + overlayName + a[i])) {
-				imgname = "img/overlay/" + overlayName + a[i];
+		for (var i = 0; i < IMG_FORMAT_LIST.length; ++i) {
+			if (imageExists("img/overlay/" + overlayName + IMG_FORMAT_LIST[i])) {
+				imgname = "img/overlay/" + overlayName + IMG_FORMAT_LIST[i];
 				break;
 			}
 
 		}
-		if (!imgname) return null; // No image found on server, do nothing
+		if (!imgname) return; // No image found on server, do nothing TODO just div with class
 		var $overlay = $("<img>");
 		$overlay.addClass('overlay').attr('src', imgname).addClass("overlay-" + overlayName);
 		$container.append($overlay);
@@ -1461,39 +1525,13 @@ optional:
 		}
 		var freePcs = 0;
 		for (var i = 0; i < update.length; i++) {
-			var $imgobj = $("#pc-img_" + room.id + "_" + update[i].id);
-
-			var img;
-			var color;
+			var $div = $("#pc_" + room.id + "_" + update[i].id);
 			// Pc free
-			if (update[i].pcState === "IDLE") {
-				img = "img/pc_free";
-				color = 'green';
+			if (update[i].pcState === "IDLE" || update[i].pcState === "OFF") {
 				freePcs++;
-				// Pc in use
-			} else if (update[i].pcState === "OCCUPIED") {
-				img = "img/pc_used";
-				color = 'red';
-				// PC off
-			} else if (update[i].pcState === "OFF") {
-				img = "img/pc_off";
-				color = 'black';
-				freePcs++;
-				// Must be defect
-			} else {
-				img = "img/pc_defect";
-				color = 'black';
-			}
-
-			if (supportSvg) {
-				if (globalConfig.eco) {
-					img = img + "_eink";
-				}
-				$imgobj.attr('src', img + ".svg");
-			} else {
-				$imgobj.css('background-color', color);
 			}
 
+			$div.removeClass('BROKEN OFF IDLE OCCUPIED'.replace(update[i].pcState, '')).addClass(update[i].pcState);
 		}
 		room.freePcs = freePcs;
 		UpdateRoomHeader(room);
diff --git a/modules-available/locationinfo/frontend/img/pc_defect.svg b/modules-available/locationinfo/frontend/img/pc_defect.svg
deleted file mode 100644
index 219175e2..00000000
--- a/modules-available/locationinfo/frontend/img/pc_defect.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 viewBox="-184 310.3 241.8 172.7" style="enable-background:new -184 310.3 241.8 172.7;" xml:space="preserve">

-<style type="text/css">

-	.st0{fill:#3C3C3B;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st1{stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st2{fill:#FFFFFF;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st3{fill:#3C3C3B;}

-	.st4{fill:none;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st5{fill:#C6C6C6;}

-</style>

-<path id="XMLID_1_" class="st0" d="M50.1,450.7h-226.4c-4.3,0-7.7-3.5-7.7-7.7V318c0-4.3,3.5-7.7,7.7-7.7H50.1

-	c4.3,0,7.7,3.5,7.7,7.7v125C57.8,447.3,54.3,450.7,50.1,450.7z"/>

-<rect id="XMLID_3_" x="-90.9" y="454.2" class="st0" width="55.6" height="19.4"/>

-<g id="XMLID_8_">

-	<rect id="XMLID_4_" x="-173.7" y="321" class="st1" width="221.1" height="119"/>

-	<path id="XMLID_6_" class="st2" d="M38.2,447.7h-2.6c-1.6,0-2.9-1.3-2.9-2.9l0,0c0-1.6,1.3-2.9,2.9-2.9h2.6c1.6,0,2.9,1.3,2.9,2.9

-		l0,0C41.1,446.4,39.8,447.7,38.2,447.7z"/>

-</g>

-<g id="XMLID_10_">

-	<g id="XMLID_14_">

-		<g id="XMLID_72_">

-			<path id="XMLID_73_" class="st3" d="M8.7,470.2h-143.6c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4H8.7c3.5,0,6.4-2.9,6.4-6.4

-				S12.2,470.2,8.7,470.2z"/>

-		</g>

-		<g id="XMLID_56_">

-			<path id="XMLID_67_" class="st4" d="M8.7,470.2h-143.6c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4H8.7c3.5,0,6.4-2.9,6.4-6.4

-				S12.2,470.2,8.7,470.2z"/>

-		</g>

-	</g>

-	<g id="XMLID_26_">

-		<path id="XMLID_39_" class="st3" d="M-138.1,473.3h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8

-			l0,0C-141.3,476.4-139.9,473.3-138.1,473.3z"/>

-		<path id="XMLID_38_" class="st4" d="M-138.1,473.3h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8

-			l0,0C-141.3,476.4-139.9,473.3-138.1,473.3z"/>

-	</g>

-	<g id="XMLID_13_">

-		<g id="XMLID_69_">

-			<rect id="XMLID_70_" x="-141.3" y="476.5" class="st3" width="156.4" height="6.4"/>

-		</g>

-		<g id="XMLID_63_">

-			<rect id="XMLID_66_" x="-141.3" y="476.5" class="st4" width="156.4" height="6.4"/>

-		</g>

-	</g>

-</g>

-<g id="XMLID_2_">

-	<g id="XMLID_21_">

-		<path id="XMLID_25_" class="st4" d="M0.3,498.7"/>

-	</g>

-</g>

-<g>

-	<g>

-		<polygon class="st5" points="-45,321 -45.1,321.1 -46.8,323.1 -60.1,338.9 -42.7,390.6 -63.6,385.7 -48.8,420.6 -82,373.3 

-			-59.4,374.1 -83.5,345.3 -76.8,321 		"/>

-	</g>

-</g>

-</svg>

diff --git a/modules-available/locationinfo/frontend/img/pc_defect_eink.svg b/modules-available/locationinfo/frontend/img/pc_defect_eink.svg
deleted file mode 100644
index 219175e2..00000000
--- a/modules-available/locationinfo/frontend/img/pc_defect_eink.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 viewBox="-184 310.3 241.8 172.7" style="enable-background:new -184 310.3 241.8 172.7;" xml:space="preserve">

-<style type="text/css">

-	.st0{fill:#3C3C3B;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st1{stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st2{fill:#FFFFFF;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st3{fill:#3C3C3B;}

-	.st4{fill:none;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st5{fill:#C6C6C6;}

-</style>

-<path id="XMLID_1_" class="st0" d="M50.1,450.7h-226.4c-4.3,0-7.7-3.5-7.7-7.7V318c0-4.3,3.5-7.7,7.7-7.7H50.1

-	c4.3,0,7.7,3.5,7.7,7.7v125C57.8,447.3,54.3,450.7,50.1,450.7z"/>

-<rect id="XMLID_3_" x="-90.9" y="454.2" class="st0" width="55.6" height="19.4"/>

-<g id="XMLID_8_">

-	<rect id="XMLID_4_" x="-173.7" y="321" class="st1" width="221.1" height="119"/>

-	<path id="XMLID_6_" class="st2" d="M38.2,447.7h-2.6c-1.6,0-2.9-1.3-2.9-2.9l0,0c0-1.6,1.3-2.9,2.9-2.9h2.6c1.6,0,2.9,1.3,2.9,2.9

-		l0,0C41.1,446.4,39.8,447.7,38.2,447.7z"/>

-</g>

-<g id="XMLID_10_">

-	<g id="XMLID_14_">

-		<g id="XMLID_72_">

-			<path id="XMLID_73_" class="st3" d="M8.7,470.2h-143.6c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4H8.7c3.5,0,6.4-2.9,6.4-6.4

-				S12.2,470.2,8.7,470.2z"/>

-		</g>

-		<g id="XMLID_56_">

-			<path id="XMLID_67_" class="st4" d="M8.7,470.2h-143.6c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4H8.7c3.5,0,6.4-2.9,6.4-6.4

-				S12.2,470.2,8.7,470.2z"/>

-		</g>

-	</g>

-	<g id="XMLID_26_">

-		<path id="XMLID_39_" class="st3" d="M-138.1,473.3h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8

-			l0,0C-141.3,476.4-139.9,473.3-138.1,473.3z"/>

-		<path id="XMLID_38_" class="st4" d="M-138.1,473.3h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8

-			l0,0C-141.3,476.4-139.9,473.3-138.1,473.3z"/>

-	</g>

-	<g id="XMLID_13_">

-		<g id="XMLID_69_">

-			<rect id="XMLID_70_" x="-141.3" y="476.5" class="st3" width="156.4" height="6.4"/>

-		</g>

-		<g id="XMLID_63_">

-			<rect id="XMLID_66_" x="-141.3" y="476.5" class="st4" width="156.4" height="6.4"/>

-		</g>

-	</g>

-</g>

-<g id="XMLID_2_">

-	<g id="XMLID_21_">

-		<path id="XMLID_25_" class="st4" d="M0.3,498.7"/>

-	</g>

-</g>

-<g>

-	<g>

-		<polygon class="st5" points="-45,321 -45.1,321.1 -46.8,323.1 -60.1,338.9 -42.7,390.6 -63.6,385.7 -48.8,420.6 -82,373.3 

-			-59.4,374.1 -83.5,345.3 -76.8,321 		"/>

-	</g>

-</g>

-</svg>

diff --git a/modules-available/locationinfo/frontend/img/pc_free.svg b/modules-available/locationinfo/frontend/img/pc_free.svg
deleted file mode 100644
index d49fc9da..00000000
--- a/modules-available/locationinfo/frontend/img/pc_free.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 viewBox="119.9 123 241.8 172.7" style="enable-background:new 119.9 123 241.8 172.7;" xml:space="preserve">

-<style type="text/css">

-	.st0{fill:#3C3C3B;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st1{fill:#00983A;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st2{fill:#3C3C3B;}

-	.st3{fill:none;stroke:#3C3C3B;stroke-miterlimit:10;}

-</style>

-<path id="XMLID_1_" class="st0" d="M354,263.4H127.6c-4.3,0-7.7-3.5-7.7-7.7v-125c0-4.3,3.5-7.7,7.7-7.7H354c4.3,0,7.7,3.5,7.7,7.7

-	v125C361.7,260,358.2,263.4,354,263.4z"/>

-<rect id="XMLID_3_" x="213" y="266.9" class="st0" width="55.6" height="19.4"/>

-<g id="XMLID_8_">

-	<rect id="XMLID_4_" x="130.3" y="132.6" class="st1" width="221.1" height="119"/>

-	<path id="XMLID_6_" class="st1" d="M342.1,260.4h-2.6c-1.6,0-2.9-1.3-2.9-2.9l0,0c0-1.6,1.3-2.9,2.9-2.9h2.6c1.6,0,2.9,1.3,2.9,2.9

-		l0,0C345,259.1,343.7,260.4,342.1,260.4z"/>

-</g>

-<g id="XMLID_10_">

-	<g id="XMLID_14_">

-		<g id="XMLID_72_">

-			<path id="XMLID_73_" class="st2" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4

-				S316.1,282.9,312.6,282.9z"/>

-		</g>

-		<g id="XMLID_56_">

-			<path id="XMLID_67_" class="st3" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4

-				S316.1,282.9,312.6,282.9z"/>

-		</g>

-	</g>

-	<g id="XMLID_26_">

-		<path id="XMLID_39_" class="st2" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0

-			C162.6,289.1,164,286,165.8,286z"/>

-		<path id="XMLID_38_" class="st3" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0

-			C162.6,289.1,164,286,165.8,286z"/>

-	</g>

-	<g id="XMLID_13_">

-		<g id="XMLID_69_">

-			<rect id="XMLID_70_" x="162.6" y="289.2" class="st2" width="156.4" height="6.4"/>

-		</g>

-		<g id="XMLID_63_">

-			<rect id="XMLID_66_" x="162.6" y="289.2" class="st3" width="156.4" height="6.4"/>

-		</g>

-	</g>

-</g>

-<g id="XMLID_2_">

-	<g id="XMLID_21_">

-		<path id="XMLID_25_" class="st3" d="M304.2,311.4"/>

-	</g>

-</g>

-</svg>

diff --git a/modules-available/locationinfo/frontend/img/pc_free_eink.svg b/modules-available/locationinfo/frontend/img/pc_free_eink.svg
deleted file mode 100644
index 39418e7b..00000000
--- a/modules-available/locationinfo/frontend/img/pc_free_eink.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 viewBox="-184 310.3 241.8 172.7" style="enable-background:new -184 310.3 241.8 172.7;" xml:space="preserve">

-<style type="text/css">

-	.st0{fill:#3C3C3B;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st1{fill:#FFFFFF;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st2{fill:#3C3C3B;}

-	.st3{fill:none;stroke:#3C3C3B;stroke-miterlimit:10;}

-</style>

-<path id="XMLID_1_" class="st0" d="M50.1,450.7h-226.4c-4.3,0-7.7-3.5-7.7-7.7V318c0-4.3,3.5-7.7,7.7-7.7H50.1

-	c4.3,0,7.7,3.5,7.7,7.7v125C57.8,447.3,54.3,450.7,50.1,450.7z"/>

-<rect id="XMLID_3_" x="-90.9" y="454.2" class="st0" width="55.6" height="19.4"/>

-<g id="XMLID_8_">

-	<rect id="XMLID_4_" x="-173.7" y="321" class="st1" width="221.1" height="119"/>

-	<path id="XMLID_6_" class="st1" d="M38.2,447.7h-2.6c-1.6,0-2.9-1.3-2.9-2.9l0,0c0-1.6,1.3-2.9,2.9-2.9h2.6c1.6,0,2.9,1.3,2.9,2.9

-		l0,0C41.1,446.4,39.8,447.7,38.2,447.7z"/>

-</g>

-<g id="XMLID_10_">

-	<g id="XMLID_14_">

-		<g id="XMLID_72_">

-			<path id="XMLID_73_" class="st2" d="M8.7,470.2h-143.6c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4H8.7c3.5,0,6.4-2.9,6.4-6.4

-				S12.2,470.2,8.7,470.2z"/>

-		</g>

-		<g id="XMLID_56_">

-			<path id="XMLID_67_" class="st3" d="M8.7,470.2h-143.6c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4H8.7c3.5,0,6.4-2.9,6.4-6.4

-				S12.2,470.2,8.7,470.2z"/>

-		</g>

-	</g>

-	<g id="XMLID_26_">

-		<path id="XMLID_39_" class="st2" d="M-138.1,473.3h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8

-			l0,0C-141.3,476.4-139.9,473.3-138.1,473.3z"/>

-		<path id="XMLID_38_" class="st3" d="M-138.1,473.3h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8

-			l0,0C-141.3,476.4-139.9,473.3-138.1,473.3z"/>

-	</g>

-	<g id="XMLID_13_">

-		<g id="XMLID_69_">

-			<rect id="XMLID_70_" x="-141.3" y="476.5" class="st2" width="156.4" height="6.4"/>

-		</g>

-		<g id="XMLID_63_">

-			<rect id="XMLID_66_" x="-141.3" y="476.5" class="st3" width="156.4" height="6.4"/>

-		</g>

-	</g>

-</g>

-<g id="XMLID_2_">

-	<g id="XMLID_21_">

-		<path id="XMLID_25_" class="st3" d="M0.3,498.7"/>

-	</g>

-</g>

-<g>

-	<g>

-		<path class="st2" d="M-5.9,350.7c0,0.7-0.3,1.4-0.8,1.9L-81,427c-0.5,0.6-1.1,0.8-1.9,0.8H-83h-0.1c-0.7,0-1.3-0.3-1.9-0.8

-			l-34.4-34.3c-0.6-0.7-0.8-1.4-0.8-2c0-0.6,0.3-1.3,0.8-2l14.7-14.7c1.3-1.2,2.7-1.2,4,0l17.7,17.8l57.6-57.7

-			c0.7-0.6,1.4-0.8,2-0.8c0.6,0,1.3,0.3,2,0.8l14.7,14.7C-6.2,349.3-5.9,350-5.9,350.7z"/>

-	</g>

-</g>

-</svg>

diff --git a/modules-available/locationinfo/frontend/img/pc_off.svg b/modules-available/locationinfo/frontend/img/pc_off.svg
deleted file mode 100644
index 9a98f7b5..00000000
--- a/modules-available/locationinfo/frontend/img/pc_off.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 viewBox="119.9 123 241.8 172.7" style="enable-background:new 119.9 123 241.8 172.7;" xml:space="preserve">

-<style type="text/css">

-	.st0{fill:#3C3C3B;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st1{stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st2{fill:#3C3C3B;}

-	.st3{fill:none;stroke:#3C3C3B;stroke-miterlimit:10;}

-</style>

-<path id="XMLID_1_" class="st0" d="M354,263.4H127.6c-4.3,0-7.7-3.5-7.7-7.7v-125c0-4.3,3.5-7.7,7.7-7.7H354c4.3,0,7.7,3.5,7.7,7.7

-	v125C361.7,260,358.2,263.4,354,263.4z"/>

-<rect id="XMLID_3_" x="213" y="266.9" class="st0" width="55.6" height="19.4"/>

-<g id="XMLID_8_">

-	<rect id="XMLID_4_" x="130.3" y="132.6" class="st1" width="221.1" height="119"/>

-	<path id="XMLID_6_" class="st1" d="M342.1,260.4h-2.6c-1.6,0-2.9-1.3-2.9-2.9l0,0c0-1.6,1.3-2.9,2.9-2.9h2.6c1.6,0,2.9,1.3,2.9,2.9

-		l0,0C345,259.1,343.7,260.4,342.1,260.4z"/>

-</g>

-<g id="XMLID_10_">

-	<g id="XMLID_14_">

-		<g id="XMLID_72_">

-			<path id="XMLID_73_" class="st2" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4

-				S316.1,282.9,312.6,282.9z"/>

-		</g>

-		<g id="XMLID_56_">

-			<path id="XMLID_67_" class="st3" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4

-				S316.1,282.9,312.6,282.9z"/>

-		</g>

-	</g>

-	<g id="XMLID_26_">

-		<path id="XMLID_39_" class="st2" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0

-			C162.6,289.1,164,286,165.8,286z"/>

-		<path id="XMLID_38_" class="st3" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0

-			C162.6,289.1,164,286,165.8,286z"/>

-	</g>

-	<g id="XMLID_13_">

-		<g id="XMLID_69_">

-			<rect id="XMLID_70_" x="162.6" y="289.2" class="st2" width="156.4" height="6.4"/>

-		</g>

-		<g id="XMLID_63_">

-			<rect id="XMLID_66_" x="162.6" y="289.2" class="st3" width="156.4" height="6.4"/>

-		</g>

-	</g>

-</g>

-<g id="XMLID_2_">

-	<g id="XMLID_21_">

-		<path id="XMLID_25_" class="st3" d="M304.2,311.4"/>

-	</g>

-</g>

-</svg>

diff --git a/modules-available/locationinfo/frontend/img/pc_off_eink.svg b/modules-available/locationinfo/frontend/img/pc_off_eink.svg
deleted file mode 100644
index 9a98f7b5..00000000
--- a/modules-available/locationinfo/frontend/img/pc_off_eink.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 viewBox="119.9 123 241.8 172.7" style="enable-background:new 119.9 123 241.8 172.7;" xml:space="preserve">

-<style type="text/css">

-	.st0{fill:#3C3C3B;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st1{stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st2{fill:#3C3C3B;}

-	.st3{fill:none;stroke:#3C3C3B;stroke-miterlimit:10;}

-</style>

-<path id="XMLID_1_" class="st0" d="M354,263.4H127.6c-4.3,0-7.7-3.5-7.7-7.7v-125c0-4.3,3.5-7.7,7.7-7.7H354c4.3,0,7.7,3.5,7.7,7.7

-	v125C361.7,260,358.2,263.4,354,263.4z"/>

-<rect id="XMLID_3_" x="213" y="266.9" class="st0" width="55.6" height="19.4"/>

-<g id="XMLID_8_">

-	<rect id="XMLID_4_" x="130.3" y="132.6" class="st1" width="221.1" height="119"/>

-	<path id="XMLID_6_" class="st1" d="M342.1,260.4h-2.6c-1.6,0-2.9-1.3-2.9-2.9l0,0c0-1.6,1.3-2.9,2.9-2.9h2.6c1.6,0,2.9,1.3,2.9,2.9

-		l0,0C345,259.1,343.7,260.4,342.1,260.4z"/>

-</g>

-<g id="XMLID_10_">

-	<g id="XMLID_14_">

-		<g id="XMLID_72_">

-			<path id="XMLID_73_" class="st2" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4

-				S316.1,282.9,312.6,282.9z"/>

-		</g>

-		<g id="XMLID_56_">

-			<path id="XMLID_67_" class="st3" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4

-				S316.1,282.9,312.6,282.9z"/>

-		</g>

-	</g>

-	<g id="XMLID_26_">

-		<path id="XMLID_39_" class="st2" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0

-			C162.6,289.1,164,286,165.8,286z"/>

-		<path id="XMLID_38_" class="st3" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0

-			C162.6,289.1,164,286,165.8,286z"/>

-	</g>

-	<g id="XMLID_13_">

-		<g id="XMLID_69_">

-			<rect id="XMLID_70_" x="162.6" y="289.2" class="st2" width="156.4" height="6.4"/>

-		</g>

-		<g id="XMLID_63_">

-			<rect id="XMLID_66_" x="162.6" y="289.2" class="st3" width="156.4" height="6.4"/>

-		</g>

-	</g>

-</g>

-<g id="XMLID_2_">

-	<g id="XMLID_21_">

-		<path id="XMLID_25_" class="st3" d="M304.2,311.4"/>

-	</g>

-</g>

-</svg>

diff --git a/modules-available/locationinfo/frontend/img/pc_used.svg b/modules-available/locationinfo/frontend/img/pc_used.svg
deleted file mode 100644
index d5d10c10..00000000
--- a/modules-available/locationinfo/frontend/img/pc_used.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 viewBox="119.9 123 241.8 172.7" style="enable-background:new 119.9 123 241.8 172.7;" xml:space="preserve">

-<style type="text/css">

-	.st0{fill:#3C3C3B;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st1{fill:#FF0000;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st2{fill:#3C3C3B;}

-	.st3{fill:none;stroke:#3C3C3B;stroke-miterlimit:10;}

-</style>

-<path id="XMLID_1_" class="st0" d="M354,263.4H127.6c-4.3,0-7.7-3.5-7.7-7.7v-125c0-4.3,3.5-7.7,7.7-7.7H354c4.3,0,7.7,3.5,7.7,7.7

-	v125C361.7,260,358.2,263.4,354,263.4z"/>

-<rect id="XMLID_3_" x="213" y="266.9" class="st0" width="55.6" height="19.4"/>

-<g id="XMLID_8_">

-	<rect id="XMLID_4_" x="130.3" y="132.6" class="st1" width="221.1" height="119"/>

-	<path id="XMLID_6_" class="st1" d="M342.1,260.4h-2.6c-1.6,0-2.9-1.3-2.9-2.9l0,0c0-1.6,1.3-2.9,2.9-2.9h2.6c1.6,0,2.9,1.3,2.9,2.9

-		l0,0C345,259.1,343.7,260.4,342.1,260.4z"/>

-</g>

-<g id="XMLID_10_">

-	<g id="XMLID_14_">

-		<g id="XMLID_72_">

-			<path id="XMLID_73_" class="st2" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4

-				S316.1,282.9,312.6,282.9z"/>

-		</g>

-		<g id="XMLID_56_">

-			<path id="XMLID_67_" class="st3" d="M312.6,282.9H169c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4h143.6c3.5,0,6.4-2.9,6.4-6.4

-				S316.1,282.9,312.6,282.9z"/>

-		</g>

-	</g>

-	<g id="XMLID_26_">

-		<path id="XMLID_39_" class="st2" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0

-			C162.6,289.1,164,286,165.8,286z"/>

-		<path id="XMLID_38_" class="st3" d="M165.8,286h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8l0,0

-			C162.6,289.1,164,286,165.8,286z"/>

-	</g>

-	<g id="XMLID_13_">

-		<g id="XMLID_69_">

-			<rect id="XMLID_70_" x="162.6" y="289.2" class="st2" width="156.4" height="6.4"/>

-		</g>

-		<g id="XMLID_63_">

-			<rect id="XMLID_66_" x="162.6" y="289.2" class="st3" width="156.4" height="6.4"/>

-		</g>

-	</g>

-</g>

-<g id="XMLID_2_">

-	<g id="XMLID_21_">

-		<path id="XMLID_25_" class="st3" d="M304.2,311.4"/>

-	</g>

-</g>

-</svg>

diff --git a/modules-available/locationinfo/frontend/img/pc_used_eink.svg b/modules-available/locationinfo/frontend/img/pc_used_eink.svg
deleted file mode 100644
index ededaa58..00000000
--- a/modules-available/locationinfo/frontend/img/pc_used_eink.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 viewBox="-184 310.3 241.8 172.7" style="enable-background:new -184 310.3 241.8 172.7;" xml:space="preserve">

-<style type="text/css">

-	.st0{fill:#3C3C3B;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st1{fill:#FFFFFF;stroke:#3C3C3B;stroke-miterlimit:10;}

-	.st2{fill:#3C3C3B;}

-	.st3{fill:none;stroke:#3C3C3B;stroke-miterlimit:10;}

-</style>

-<path id="XMLID_1_" class="st0" d="M50.1,450.7h-226.4c-4.3,0-7.7-3.5-7.7-7.7V318c0-4.3,3.5-7.7,7.7-7.7H50.1

-	c4.3,0,7.7,3.5,7.7,7.7v125C57.8,447.3,54.3,450.7,50.1,450.7z"/>

-<rect id="XMLID_3_" x="-90.9" y="454.2" class="st0" width="55.6" height="19.4"/>

-<g id="XMLID_8_">

-	<rect id="XMLID_4_" x="-173.7" y="321" class="st1" width="221.1" height="119"/>

-	<path id="XMLID_6_" class="st1" d="M38.2,447.7h-2.6c-1.6,0-2.9-1.3-2.9-2.9l0,0c0-1.6,1.3-2.9,2.9-2.9h2.6c1.6,0,2.9,1.3,2.9,2.9

-		l0,0C41.1,446.4,39.8,447.7,38.2,447.7z"/>

-</g>

-<g id="XMLID_10_">

-	<g id="XMLID_14_">

-		<g id="XMLID_72_">

-			<path id="XMLID_73_" class="st2" d="M8.7,470.2h-143.6c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4H8.7c3.5,0,6.4-2.9,6.4-6.4

-				S12.2,470.2,8.7,470.2z"/>

-		</g>

-		<g id="XMLID_56_">

-			<path id="XMLID_67_" class="st3" d="M8.7,470.2h-143.6c-3.5,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4H8.7c3.5,0,6.4-2.9,6.4-6.4

-				S12.2,470.2,8.7,470.2z"/>

-		</g>

-	</g>

-	<g id="XMLID_26_">

-		<path id="XMLID_39_" class="st2" d="M-138.1,473.3h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8

-			l0,0C-141.3,476.4-139.9,473.3-138.1,473.3z"/>

-		<path id="XMLID_38_" class="st3" d="M-138.1,473.3h150c1.8,0,3.2,3,3.2,4.8l0,0c0,1.8-1.4,4.8-3.2,4.8h-150c-1.8,0-3.2-3-3.2-4.8

-			l0,0C-141.3,476.4-139.9,473.3-138.1,473.3z"/>

-	</g>

-	<g id="XMLID_13_">

-		<g id="XMLID_69_">

-			<rect id="XMLID_70_" x="-141.3" y="476.5" class="st2" width="156.4" height="6.4"/>

-		</g>

-		<g id="XMLID_63_">

-			<rect id="XMLID_66_" x="-141.3" y="476.5" class="st3" width="156.4" height="6.4"/>

-		</g>

-	</g>

-</g>

-<g id="XMLID_2_">

-	<g id="XMLID_21_">

-		<path id="XMLID_25_" class="st3" d="M0.3,498.7"/>

-	</g>

-</g>

-<g>

-	<g id="x">

-		<g>

-			<polygon class="st2" points="-27.1,402.1 -48.7,380.5 -27.1,358.9 -41.5,344.5 -63.1,366.1 -84.7,344.5 -99.1,358.9 -77.5,380.5 

-				-99.1,402.1 -84.7,416.5 -63.1,394.9 -41.5,416.5 			"/>

-		</g>

-	</g>

-</g>

-</svg>