diff --git a/webapp/src/components/appContent.vue b/webapp/src/components/appContent.vue index fcbf7296..bc292f88 100644 --- a/webapp/src/components/appContent.vue +++ b/webapp/src/components/appContent.vue @@ -138,6 +138,7 @@ import viewContent from "./tabContentComponents/viewContent.vue"; import settingsContent from "./tabContentComponents/settingsContent.vue"; import aboutContent from "./tabContentComponents/aboutContent.vue"; import loggingContent from "./tabContentComponents/loggingContent.vue"; +import powerContent from "./tabContentComponents/powerContent.vue"; // ImJoy is loaded asynchronously to allow it to be disabled if needed const imjoyContent = () => import( @@ -164,6 +165,7 @@ export default { aboutContent, loggingContent, TabIcon, + powerContent, imjoyContent }, data: function() { @@ -185,6 +187,11 @@ export default { id: "about", icon: "info", component: aboutContent + }, + { + id: "power", + icon: "power_settings_new", + component: powerContent } ] }; diff --git a/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue b/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue index e3ca4f35..2d215f06 100644 --- a/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue +++ b/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue @@ -25,7 +25,7 @@
Server Version:
- TODO + V3 (pre-alpha)

@@ -48,28 +48,6 @@
- -
-
- -
- -
- -
-
Loading... @@ -82,7 +60,6 @@ diff --git a/webapp/src/components/tabContentComponents/powerContent.vue b/webapp/src/components/tabContentComponents/powerContent.vue new file mode 100644 index 00000000..855174d8 --- /dev/null +++ b/webapp/src/components/tabContentComponents/powerContent.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/webapp/src/main.js b/webapp/src/main.js index ed49dbc1..7844a302 100644 --- a/webapp/src/main.js +++ b/webapp/src/main.js @@ -86,6 +86,9 @@ Vue.mixin({ // Stop GPU preview to show modal context.$root.$emit("globalTogglePreview", false); + // force OK to be capitalised + UIkit.modal.i18n = { ok: "OK", cancel: "Cancel" }; + var showModal = function(resolve, reject) { UIkit.modal .confirm(modalText, { stack: true }) @@ -150,7 +153,7 @@ Vue.mixin({ return `${error.response.data.detail}`; } // If the response is just some generic error response - if (error.response.data){ + if (error.response.data) { return `${error.response.data}`; } return `${error.response}`;