From 6f48041c9dd52f4d98c3defec030232aa0bbfeb9 Mon Sep 17 00:00:00 2001 From: lonkaars Date: Sat, 23 Mar 2024 20:51:35 +0100 Subject: merge Sean's code --- old_code/overview_control.html | 47 ----------- ui/css/style.css | 25 +++++- ui/grid.html | 47 ----------- ui/index.html | 150 +++++++++++++++++++++++++----------- ui/sections/lfv/barrier.html | 10 --- ui/sections/lfv/lights.html | 13 ---- ui/sections/lfv/traffic_lights.html | 10 --- ui/sections/lfv_selector.html | 5 -- ui/sections/map.html | 1 - ui/sections/notifications.html | 10 --- 10 files changed, 124 insertions(+), 194 deletions(-) delete mode 100644 old_code/overview_control.html delete mode 100644 ui/grid.html delete mode 100644 ui/sections/lfv/barrier.html delete mode 100644 ui/sections/lfv/lights.html delete mode 100644 ui/sections/lfv/traffic_lights.html delete mode 100644 ui/sections/lfv_selector.html delete mode 100644 ui/sections/map.html delete mode 100644 ui/sections/notifications.html diff --git a/old_code/overview_control.html b/old_code/overview_control.html deleted file mode 100644 index 4a27e53..0000000 --- a/old_code/overview_control.html +++ /dev/null @@ -1,47 +0,0 @@ - \ No newline at end of file diff --git a/ui/css/style.css b/ui/css/style.css index 963f4c5..7b8f8d2 100644 --- a/ui/css/style.css +++ b/ui/css/style.css @@ -27,9 +27,13 @@ body, html { overflow-y: auto; /* Add vertical scrolling */ } -/*.section.overview_control { +.section.overview_control { grid-row: 1 / span 2; /* Span the top left section across both rows */ -/*}*/ + justify-content: unset; + align-items: normal; + padding: 8px; + gap: 8px; +} .table-wrapper { flex-grow: 1; /* Table wrapper takes remaining space */ @@ -98,7 +102,7 @@ ul { border: 5px solid black; width: calc(20% - 5px); height: calc(40% - 5px); - background-color: gray; + background-color: #ccc; } .traffic-light { width: 20px; @@ -136,10 +140,23 @@ ul { left: 5px; } - /* Styles for the inner content of the squares */ .inner-content { position: relative; width: 100%; height: 100%; } + +details { + border: 1px solid #0008; + padding: 4px; +} + +details summary { + user-select: none; +} + +details[open] summary { + border-bottom: 1px solid #0008; +} + diff --git a/ui/grid.html b/ui/grid.html deleted file mode 100644 index 70810e5..0000000 --- a/ui/grid.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - Four Sections Layout - - - - -
-
-
-
-
-
- - - - - \ No newline at end of file diff --git a/ui/index.html b/ui/index.html index 1d0eb37..ae263f3 100644 --- a/ui/index.html +++ b/ui/index.html @@ -1,5 +1,6 @@ + @@ -7,57 +8,110 @@ +
-
    -
  • - Fotocellen -
    - - -
    -
  • -
  • - CCTV -
    - - -
    -
  • -
  • - Verlichting -
    - - -
    -
  • -
  • - Verkeerslicht -
    - - -
    -
  • -
  • - Slagboom -
    - - -
    -
  • -
  • - Matrixbord -
    - -
    -
  • -
+ +
+ State controls +
+
    +
  • + Fotocellen +
    + + +
    +
  • +
  • + CCTV +
    + + +
    +
  • +
  • + Verlichting +
    + + +
    +
  • +
  • + Verkeerslicht +
    + + +
    +
  • +
  • + Slagboom +
    + + +
    +
  • +
  • + Matrixbord +
    + +
    +
  • +
+
+
+ +
+ Lights +
+
    +
  • +
  • +
  • +
+
Percentage: 0%
+ +
+
+ +
+ Traffic lights +
+ + +
Status:
+ +
+
+ +
+ Barrier +
+ + +
Status:
+ +
+
+
@@ -70,6 +124,7 @@
+

Start

@@ -100,6 +155,7 @@

End

+ diff --git a/ui/sections/lfv/barrier.html b/ui/sections/lfv/barrier.html deleted file mode 100644 index 64705b0..0000000 --- a/ui/sections/lfv/barrier.html +++ /dev/null @@ -1,10 +0,0 @@ -

Barrier Control

- - -
Status:
- - diff --git a/ui/sections/lfv/lights.html b/ui/sections/lfv/lights.html deleted file mode 100644 index bb37603..0000000 --- a/ui/sections/lfv/lights.html +++ /dev/null @@ -1,13 +0,0 @@ -

Lights Control

- -
Percentage: 0%
- - diff --git a/ui/sections/lfv/traffic_lights.html b/ui/sections/lfv/traffic_lights.html deleted file mode 100644 index 8fa3eb4..0000000 --- a/ui/sections/lfv/traffic_lights.html +++ /dev/null @@ -1,10 +0,0 @@ -

Traffic Lights Control

- - -
Status:
- - diff --git a/ui/sections/lfv_selector.html b/ui/sections/lfv_selector.html deleted file mode 100644 index 3608d31..0000000 --- a/ui/sections/lfv_selector.html +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/ui/sections/map.html b/ui/sections/map.html deleted file mode 100644 index 734ebe1..0000000 --- a/ui/sections/map.html +++ /dev/null @@ -1 +0,0 @@ -This is a map \ No newline at end of file diff --git a/ui/sections/notifications.html b/ui/sections/notifications.html deleted file mode 100644 index cd2863e..0000000 --- a/ui/sections/notifications.html +++ /dev/null @@ -1,10 +0,0 @@ -
- -
-
- - - - -
Column 1
-
-- cgit v1.2.3