From 85ba8cb4029f887a2c786b9f9dce23ca82e2fdc5 Mon Sep 17 00:00:00 2001 From: schrom01 Date: Tue, 16 Aug 2022 03:22:01 +0200 Subject: [PATCH] implemented Webhooks for Operation Mode --- Webserver/Templates/dashboard.html | 28 +++++++++++++++++---------- Webserver/Templates/header.html | 21 ++++++++++++++++---- Webserver/Templates/system.html | 3 +-- Webserver/Templates/times.html | 4 ++-- Webserver/Templates/zone.html | 3 +-- Webserver/Templates/zones.html | 4 ++-- Webserver/static/Styles/dashboard.css | 19 ------------------ 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Webserver/Templates/dashboard.html b/Webserver/Templates/dashboard.html index c657192..37d55c9 100644 --- a/Webserver/Templates/dashboard.html +++ b/Webserver/Templates/dashboard.html @@ -1,29 +1,29 @@ - - - + + {{ translater.getTranslation("Irrigation") }}{{ translater.getTranslation("system") }} + {% include "header.html" %} @@ -34,7 +34,7 @@

{{ translater.getTranslation("Dashboard") }}

- {% for zone in zones %} + {% for zone in zoneManager.zones %}

{{ zone.name }}

@@ -48,9 +48,14 @@ {{ translater.getTranslation("state") }}: - -

{{ translater.getTranslation("switched on") if zone.state else translater.getTranslation("switched off") }}

-

{{ translater.getTranslation("turn off") if zone.state else translater.getTranslation("turn on") }}

+ {{ translater.getTranslation("switched on") if zone.state else translater.getTranslation("switched off") }} + + + @@ -62,6 +67,9 @@ {{ translater.getTranslation("operating mode") }}: {{translater.getTranslation("automatic mode") if zone.autoMode else translater.getTranslation("manual mode")}} + + + diff --git a/Webserver/Templates/header.html b/Webserver/Templates/header.html index 8b87bdb..5dbb9bd 100644 --- a/Webserver/Templates/header.html +++ b/Webserver/Templates/header.html @@ -1,8 +1,19 @@ - + + + +
@@ -19,13 +30,15 @@
- +

{{ translater.getTranslation("Irrigation") }}-
{{ translater.getTranslation("system") }}

- +
+ - \ No newline at end of file + + diff --git a/Webserver/Templates/system.html b/Webserver/Templates/system.html index 4875170..58d6f66 100644 --- a/Webserver/Templates/system.html +++ b/Webserver/Templates/system.html @@ -1,8 +1,7 @@ - - + {{ translater.getTranslation("Irrigation") }}{{ translater.getTranslation("system") }} diff --git a/Webserver/Templates/times.html b/Webserver/Templates/times.html index a3b998b..f8f4c6b 100644 --- a/Webserver/Templates/times.html +++ b/Webserver/Templates/times.html @@ -1,8 +1,8 @@ - - + + {{ translater.getTranslation("Irrigation") }}{{ translater.getTranslation("system") }} diff --git a/Webserver/Templates/zone.html b/Webserver/Templates/zone.html index 7a1604f..36fbc27 100644 --- a/Webserver/Templates/zone.html +++ b/Webserver/Templates/zone.html @@ -1,8 +1,7 @@ - - + {{ translater.getTranslation("Irrigation") }}{{ translater.getTranslation("system") }} diff --git a/Webserver/Templates/zones.html b/Webserver/Templates/zones.html index 10d4e81..61d3c36 100644 --- a/Webserver/Templates/zones.html +++ b/Webserver/Templates/zones.html @@ -1,8 +1,8 @@ - - + + {{ translater.getTranslation("Irrigation") }}{{ translater.getTranslation("system") }} diff --git a/Webserver/static/Styles/dashboard.css b/Webserver/static/Styles/dashboard.css index 857f94e..5fee598 100644 --- a/Webserver/static/Styles/dashboard.css +++ b/Webserver/static/Styles/dashboard.css @@ -57,25 +57,6 @@ td.value{ position: relative; } -.state{ - display: inline; -} -.on_off{ - display: none; - color: green; - position: absolute; - background: #bbb; - padding-right: 50px; - padding-left: 5px; - top: -15px; - left: 0px; - z-index: 1; -} -.state:hover + .on_off, .on_off:hover{ - display: inline; -} - - .outer_dot {