diff --git a/html/images/base_status_error.png b/html/images/base_status_error.png
deleted file mode 100644
index 73a678ea..00000000
Binary files a/html/images/base_status_error.png and /dev/null differ
diff --git a/html/images/base_status_off.png b/html/images/base_status_off.png
index ec8e3814..fbadb1a6 100644
Binary files a/html/images/base_status_off.png and b/html/images/base_status_off.png differ
diff --git a/html/images/base_status_ready.png b/html/images/base_status_ready.png
index 9dfd12d8..13f5b504 100644
Binary files a/html/images/base_status_ready.png and b/html/images/base_status_ready.png differ
diff --git a/html/images/base_status_ready_alert.png b/html/images/base_status_ready_alert.png
deleted file mode 100644
index 86ffba66..00000000
Binary files a/html/images/base_status_ready_alert.png and /dev/null differ
diff --git a/html/images/base_status_ready_low.png b/html/images/base_status_ready_low.png
deleted file mode 100644
index 079b0a35..00000000
Binary files a/html/images/base_status_ready_low.png and /dev/null differ
diff --git a/html/images/base_status_searching.gif b/html/images/base_status_searching.gif
deleted file mode 100644
index cd89ffec..00000000
Binary files a/html/images/base_status_searching.gif and /dev/null differ
diff --git a/html/images/base_status_searching_alert.gif b/html/images/base_status_searching_alert.gif
deleted file mode 100644
index 515675c5..00000000
Binary files a/html/images/base_status_searching_alert.gif and /dev/null differ
diff --git a/html/images/base_status_standby.png b/html/images/base_status_standby.png
deleted file mode 100644
index b575ec1d..00000000
Binary files a/html/images/base_status_standby.png and /dev/null differ
diff --git a/html/images/controller_status_error.png b/html/images/controller_status_error.png
deleted file mode 100644
index 89b2eacb..00000000
Binary files a/html/images/controller_status_error.png and /dev/null differ
diff --git a/html/images/controller_status_off.png b/html/images/controller_status_off.png
index 75afa937..161b6d1e 100644
Binary files a/html/images/controller_status_off.png and b/html/images/controller_status_off.png differ
diff --git a/html/images/controller_status_ready.png b/html/images/controller_status_ready.png
index 63fb2c6c..c7738444 100644
Binary files a/html/images/controller_status_ready.png and b/html/images/controller_status_ready.png differ
diff --git a/html/images/controller_status_ready_alert.png b/html/images/controller_status_ready_alert.png
deleted file mode 100644
index 328fc5bd..00000000
Binary files a/html/images/controller_status_ready_alert.png and /dev/null differ
diff --git a/html/images/controller_status_ready_low.png b/html/images/controller_status_ready_low.png
index 46b05594..b42be707 100644
Binary files a/html/images/controller_status_ready_low.png and b/html/images/controller_status_ready_low.png differ
diff --git a/html/images/controller_status_searching.gif b/html/images/controller_status_searching.gif
deleted file mode 100644
index 6ced2930..00000000
Binary files a/html/images/controller_status_searching.gif and /dev/null differ
diff --git a/html/images/controller_status_searching_alert.gif b/html/images/controller_status_searching_alert.gif
deleted file mode 100644
index 752a1716..00000000
Binary files a/html/images/controller_status_searching_alert.gif and /dev/null differ
diff --git a/html/images/controller_status_standby.png b/html/images/controller_status_standby.png
deleted file mode 100644
index 28f72051..00000000
Binary files a/html/images/controller_status_standby.png and /dev/null differ
diff --git a/html/images/headset_status_error.png b/html/images/headset_status_error.png
deleted file mode 100644
index e75a3033..00000000
Binary files a/html/images/headset_status_error.png and /dev/null differ
diff --git a/html/images/headset_status_off.png b/html/images/headset_status_off.png
deleted file mode 100644
index 5f37e0b9..00000000
Binary files a/html/images/headset_status_off.png and /dev/null differ
diff --git a/html/images/headset_status_ready.png b/html/images/headset_status_ready.png
deleted file mode 100644
index c03e99d4..00000000
Binary files a/html/images/headset_status_ready.png and /dev/null differ
diff --git a/html/images/headset_status_ready_alert.png b/html/images/headset_status_ready_alert.png
deleted file mode 100644
index 1f45f833..00000000
Binary files a/html/images/headset_status_ready_alert.png and /dev/null differ
diff --git a/html/images/headset_status_ready_low.png b/html/images/headset_status_ready_low.png
deleted file mode 100644
index 8a3c777b..00000000
Binary files a/html/images/headset_status_ready_low.png and /dev/null differ
diff --git a/html/images/headset_status_searching.gif b/html/images/headset_status_searching.gif
deleted file mode 100644
index 19ae8872..00000000
Binary files a/html/images/headset_status_searching.gif and /dev/null differ
diff --git a/html/images/headset_status_searching_alert.gif b/html/images/headset_status_searching_alert.gif
deleted file mode 100644
index e0abd9d1..00000000
Binary files a/html/images/headset_status_searching_alert.gif and /dev/null differ
diff --git a/html/images/headset_status_standby.png b/html/images/headset_status_standby.png
deleted file mode 100644
index 358ba317..00000000
Binary files a/html/images/headset_status_standby.png and /dev/null differ
diff --git a/html/images/invalid_status.png b/html/images/invalid_status.png
deleted file mode 100644
index 2e05a9fc..00000000
Binary files a/html/images/invalid_status.png and /dev/null differ
diff --git a/html/images/other_status_error.png b/html/images/other_status_error.png
deleted file mode 100644
index 4a9cd77c..00000000
Binary files a/html/images/other_status_error.png and /dev/null differ
diff --git a/html/images/other_status_ready_alert.png b/html/images/other_status_ready_alert.png
deleted file mode 100644
index 35b37c56..00000000
Binary files a/html/images/other_status_ready_alert.png and /dev/null differ
diff --git a/html/images/other_status_searching.gif b/html/images/other_status_searching.gif
deleted file mode 100644
index 1648f62c..00000000
Binary files a/html/images/other_status_searching.gif and /dev/null differ
diff --git a/html/images/other_status_searching_alert.gif b/html/images/other_status_searching_alert.gif
deleted file mode 100644
index 643f303d..00000000
Binary files a/html/images/other_status_searching_alert.gif and /dev/null differ
diff --git a/html/images/other_status_standby.png b/html/images/other_status_standby.png
deleted file mode 100644
index 4cf5202b..00000000
Binary files a/html/images/other_status_standby.png and /dev/null differ
diff --git a/html/images/tracker_status_off.png b/html/images/tracker_status_off.png
index 4f266aa4..a1de5e2c 100644
Binary files a/html/images/tracker_status_off.png and b/html/images/tracker_status_off.png differ
diff --git a/html/images/tracker_status_ready.png b/html/images/tracker_status_ready.png
index ce8be5fd..729c4b85 100644
Binary files a/html/images/tracker_status_ready.png and b/html/images/tracker_status_ready.png differ
diff --git a/html/images/tracker_status_ready_alert.png b/html/images/tracker_status_ready_alert.png
deleted file mode 100644
index c145d41f..00000000
Binary files a/html/images/tracker_status_ready_alert.png and /dev/null differ
diff --git a/html/images/tracker_status_ready_low.png b/html/images/tracker_status_ready_low.png
index 1cb7ee3c..940d0a0c 100644
Binary files a/html/images/tracker_status_ready_low.png and b/html/images/tracker_status_ready_low.png differ
diff --git a/html/images/tracker_status_searching.gif b/html/images/tracker_status_searching.gif
deleted file mode 100644
index ff2e1e6c..00000000
Binary files a/html/images/tracker_status_searching.gif and /dev/null differ
diff --git a/html/images/tracker_status_searching_alert.gif b/html/images/tracker_status_searching_alert.gif
deleted file mode 100644
index fe9eeb1a..00000000
Binary files a/html/images/tracker_status_searching_alert.gif and /dev/null differ
diff --git a/html/images/tracker_status_standby.png b/html/images/tracker_status_standby.png
deleted file mode 100644
index 80e23cbd..00000000
Binary files a/html/images/tracker_status_standby.png and /dev/null differ
diff --git a/html/src/vr.js b/html/src/vr.js
index 7e7b5c16..5398269c 100644
--- a/html/src/vr.js
+++ b/html/src/vr.js
@@ -382,10 +382,34 @@ Vue.component('marquee-text', MarqueeText);
devices.forEach((device) => {
device[2] = parseInt(device[2], 10);
});
+ devices.sort((a, b) => {
+ if (a[0] === b[0]) {
+ return 0;
+ }
+ if (a[0] === 'base') {
+ return 1;
+ }
+ if (a[0].toLowerCase().includes('controller')) {
+ return -1;
+ }
+ return 0;
+ });
+ devices.sort((a, b) => {
+ if (a[1] === b[1]) {
+ return 0;
+ }
+ if (a[1] === 'connected') {
+ return -1;
+ }
+ if (a[1] === 'disconnected') {
+ return 1;
+ }
+ return 0;
+ });
this.devices = devices;
});
} else {
- this.devices = '';
+ this.devices = [];
}
if (this.config.pcUptimeOnFeed) {
AppApi.GetUptime().then((uptime) => {
diff --git a/html/src/vr.pug b/html/src/vr.pug
index 9466541f..13309bf8 100644
--- a/html/src/vr.pug
+++ b/html/src/vr.pug
@@ -409,45 +409,36 @@ html
span.time {{ feed.created_at | formatDate }}
| #[span.name(v-text="feed.displayName")] has unmuted you
.x-containerbottom
- div(style="display:flex;flex-direction:row")
- template(v-if="devices.length")
- div(v-for="device in devices" style="flex:none;text-align:center;width:62px;height:82px")
- template(v-if="device[0] === 'tracker'")
- img(v-if="device[1] !== 'connected'" src="images/tracker_status_off.png" style="width:32px;height:32px")
- img(v-else-if="device[2] < 20" src="images/tracker_status_ready_low.png" style="width:32px;height:32px")
- img(v-else src="images/tracker_status_ready.png" style="width:32px;height:32px")
- br
- span {{ device[2] }}%
- template(v-else-if="device[0] === 'leftController'")
- img(v-if="device[1] !== 'connected'" src="images/controller_status_off.png" style="width:32px;height:32px")
- img(v-else-if="device[2] < 20" src="images/controller_status_ready_low.png" style="width:32px;height:32px")
- img(v-else src="images/controller_status_ready.png" style="width:32px;height:32px")
- br
- span L:{{ device[2] }}%
- template(v-else-if="device[0] === 'rightController'")
- img(v-if="device[1] !== 'connected'" src="images/controller_status_off.png" style="width:32px;height:32px")
- img(v-else-if="device[2] < 20" src="images/controller_status_ready_low.png" style="width:32px;height:32px")
- img(v-else src="images/controller_status_ready.png" style="width:32px;height:32px")
- br
- span R:{{ device[2] }}%
- template(v-else-if="device[0] === 'controller'")
- img(v-if="device[1] !== 'connected'" src="images/controller_status_off.png" style="width:32px;height:32px")
- img(v-else-if="device[2] < 20" src="images/controller_status_ready_low.png" style="width:32px;height:32px")
- img(v-else src="images/controller_status_ready.png" style="width:32px;height:32px")
- br
- span {{ device[2] }}%
- template(v-else-if="device[0] === 'base'")
- img(v-if="device[1] !== 'connected'" src="images/base_status_off.png" style="width:32px;height:32px")
- img(v-else-if="device[2] < 20" src="images/base_status_ready_low.png" style="width:32px;height:32px")
- img(v-else src="images/base_status_ready.png" style="width:32px;height:32px")
- br
- span {{ device[2] }}%
- template(v-else)
- img(v-if="device[1] !== 'connected'" src="images/other_status_off.png" style="width:32px;height:32px")
- img(v-else-if="device[2] < 20" src="images/other_status_ready_low.png" style="width:32px;height:32px")
- img(v-else src="images/other_status_ready.png" style="width:32px;height:32px")
- br
- span {{ device[2] }}%
+ div(style="display:flex;flex-direction:row;flex-wrap:wrap")
+ div(v-for="device in devices" class="tracker-container")
+ template(v-if="device[0] === 'leftController'")
+ img(v-if="device[1] !== 'connected'" src="images/controller_status_off.png" class="tracker-device")
+ img(v-else-if="device[2] < 20" src="images/controller_status_ready_low.png" class="tracker-device")
+ img(v-else src="images/controller_status_ready.png" class="tracker-device")
+ span L:{{ device[2] }}%
+ template(v-else-if="device[0] === 'rightController'")
+ img(v-if="device[1] !== 'connected'" src="images/controller_status_off.png" class="tracker-device")
+ img(v-else-if="device[2] < 20" src="images/controller_status_ready_low.png" class="tracker-device")
+ img(v-else src="images/controller_status_ready.png" class="tracker-device")
+ span R:{{ device[2] }}%
+ template(v-else-if="device[0] === 'controller'")
+ img(v-if="device[1] !== 'connected'" src="images/controller_status_off.png" class="tracker-device")
+ img(v-else-if="device[2] < 20" src="images/controller_status_ready_low.png" class="tracker-device")
+ img(v-else src="images/controller_status_ready.png" class="tracker-device")
+ span {{ device[2] }}%
+ template(v-else-if="device[0] === 'tracker'")
+ img(v-if="device[1] !== 'connected'" src="images/tracker_status_off.png" class="tracker-device")
+ img(v-else-if="device[2] < 20" src="images/tracker_status_ready_low.png" class="tracker-device")
+ img(v-else src="images/tracker_status_ready.png" class="tracker-device")
+ span {{ device[2] }}%
+ template(v-else-if="device[0] === 'base'")
+ img(v-if="device[1] !== 'connected'" src="images/base_status_off.png" class="tracker-device")
+ img(v-else src="images/base_status_ready.png" class="tracker-device")
+ template(v-else)
+ img(v-if="device[1] !== 'connected'" src="images/other_status_off.png" class="tracker-device")
+ img(v-else-if="device[2] < 20" src="images/other_status_ready_low.png" class="tracker-device")
+ img(v-else src="images/other_status_ready.png" class="tracker-device")
+ span {{ device[2] }}%
.x-containerbottom
template(v-if="nowPlaying.playing")
span(style="float:right;padding-left:10px") {{ nowPlaying.remainingText }}
diff --git a/html/src/vr.scss b/html/src/vr.scss
index 77ed3dbf..b9547c47 100644
--- a/html/src/vr.scss
+++ b/html/src/vr.scss
@@ -396,3 +396,14 @@ i.x-user-status.busy {
right: -160px;
bottom: 0;
}
+
+.tracker-container {
+ flex: 1 1 auto;
+ text-align: center;
+ line-height: 16px;
+}
+
+.tracker-device img {
+ width: 32px;
+ height: 32px;
+}