From 5510e2c276bc691e13565296397670268430996e Mon Sep 17 00:00:00 2001
From: Matthew Grotke <mgrotke@gmail.com>
Date: Thu, 28 May 2026 01:57:36 -0400
Subject: [PATCH] Development

---
 .../app/pages/networklayout/content.json         | 16 +++++++---------
 docker/routlin-dash/app/view_page.py             | 16 +++++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docker/routlin-dash/app/pages/networklayout/content.json b/docker/routlin-dash/app/pages/networklayout/content.json
index bbfa519..660593d 100644
--- a/docker/routlin-dash/app/pages/networklayout/content.json
+++ b/docker/routlin-dash/app/pages/networklayout/content.json
@@ -250,30 +250,28 @@
             {
               "type": "hr"
             },
-            {
-              "type": "p",
-              "text": "Servers provided to network clients via DHCP"
-            },
             {
               "type": "field_row",
               "cols": 4,
               "items": [
                 {
-                  "type": "dhcp_gateway_select",
+                  "type": "readonly_select",
                   "label": "Gateway",
                   "name": "gateway"
                 },
                 {
-                  "type": "dhcp_override_textarea",
+                  "type": "overridable_textarea",
                   "label": "DNS Server(s)",
                   "name": "dns_server",
-                  "override_name": "dns_server_override"
+                  "override_name": "dns_server_override",
+                  "validate": "ip_in_subnet"
                 },
                 {
-                  "type": "dhcp_override_textarea",
+                  "type": "overridable_textarea",
                   "label": "NTP Server(s)",
                   "name": "ntp_server",
-                  "override_name": "ntp_server_override"
+                  "override_name": "ntp_server_override",
+                  "validate": "ip_in_subnet"
                 },
                 {
                   "type": "field",
diff --git a/docker/routlin-dash/app/view_page.py b/docker/routlin-dash/app/view_page.py
index c18b262..940b005 100644
--- a/docker/routlin-dash/app/view_page.py
+++ b/docker/routlin-dash/app/view_page.py
@@ -1276,31 +1276,33 @@ def _render_item(item, tokens, inherited_req=None):
             f'</div>'
         )
 
-    if t == 'dhcp_gateway_select':
+    if t == 'readonly_select':
         label = e(item.get('label', 'Gateway'))
         name  = e(item.get('name',  'gateway'))
         return (
             f'<div class="form-group">'
             f'<label class="form-label">{label}</label>'
-            f'<select name="{name}" class="form-select dhcp-gateway-select" disabled>'
+            f'<select name="{name}" class="form-select readonly-select" disabled>'
             f'<option value="">— add identities first —</option>'
             f'</select>'
             f'</div>'
         )
 
-    if t == 'dhcp_override_textarea':
+    if t == 'overridable_textarea':
         label         = e(item.get('label', ''))
         name          = e(item.get('name',  ''))
         override_name = e(item.get('override_name', name + '_override'))
+        validate      = e(item.get('validate', ''))
+        validate_attr = f' data-validate-lines="{validate}"' if validate else ''
         return (
             f'<div class="form-group">'
-            f'<label class="form-label dhcp-override-header">'
+            f'<label class="form-label override-header">'
             f'<span>{label}</span>'
-            f'<label class="dhcp-override-toggle">'
-            f'<input type="checkbox" name="{override_name}" class="form-checkbox dhcp-override-check"/> Override'
+            f'<label class="override-toggle">'
+            f'<input type="checkbox" name="{override_name}" class="form-checkbox override-check"/> Override'
             f'</label>'
             f'</label>'
-            f'<textarea name="{name}" class="form-input dhcp-auto-textarea" rows="2" readonly></textarea>'
+            f'<textarea name="{name}" class="form-input auto-textarea" rows="2" readonly{validate_attr}></textarea>'
             f'</div>'
         )