From 53dcf3cc38f77d3cf5e764e742b72f26a3366856 Mon Sep 17 00:00:00 2001
From: aceberg <1502200+aceberg@users.noreply.github.com>
Date: Fri, 20 Sep 2024 23:55:08 +0700
Subject: [PATCH] Fix double select for Theme, Color, Log level

---
 CHANGELOG.md                       |  5 +++++
 internal/web/templates/config.html | 17 +++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 733b1a8..0690ae6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [v2.0.4] - 2024-
+### Fixed
+- [#101](https://github.com/aceberg/WatchYourLAN/issues/101) 
+- The same problem for Theme, Color mode, Log level
+
 ## [v2.0.3] - 2024-09-17
 ### Fixed
 - `ARP_STRS_JOINED` should be empty in config file
diff --git a/internal/web/templates/config.html b/internal/web/templates/config.html
index db64b1b..f32d4ee 100644
--- a/internal/web/templates/config.html
+++ b/internal/web/templates/config.html
@@ -20,18 +20,16 @@
                 <tr>
                   <td>Theme</td>
                   <td><select name="theme" class="form-select">
-                    <option selected>{{ .Config.Theme }}</option>
                     {{ range .Themes }}
-                        <option value="{{ . }}">{{ . }}</option>
+                      <option value="{{ . }}" {{ if eq . $.Config.Theme }}selected{{ end }}>{{ . }}</option>
                     {{ end }}
                   </select></td>
                 </tr>
                 <tr>
                   <td>Color mode</td>
                   <td><select name="color" class="form-select">
-                    <option selected>{{ .Config.Color }}</option>
-                    <option value="light">light</option>
-                    <option value="dark">dark</option>
+                    <option value="light" {{ if eq "light" .Config.Color }}selected{{ end }}>light</option>
+                    <option value="dark" {{ if eq "dark" .Config.Color }}selected{{ end }}>dark</option>
                   </select></td>
                 </tr>
                 <tr>
@@ -80,11 +78,10 @@
                 <tr>
                   <td>Log level</td>
                   <td><select name="log" class="form-select">
-                    <option selected>{{ .Config.LogLevel }}</option>
-                    <option value="debug">debug</option>
-                    <option value="info">info</option>
-                    <option value="warn">warn</option>
-                    <option value="error">error</option>
+                    <option value="debug" {{ if eq "debug" .Config.LogLevel }}selected{{ end }}>debug</option>
+                    <option value="info" {{ if eq "info" .Config.LogLevel }}selected{{ end }}>info</option>
+                    <option value="warn" {{ if eq "warn" .Config.LogLevel }}selected{{ end }}>warn</option>
+                    <option value="error" {{ if eq "error" .Config.LogLevel }}selected{{ end }}>error</option>
                   </select></td>
                 </tr>
                 <tr>