diff --git a/docker/routlin-dash/app/pages/bannedips/content.json b/docker/routlin-dash/app/pages/bannedips/content.json index de07162..546bb44 100644 --- a/docker/routlin-dash/app/pages/bannedips/content.json +++ b/docker/routlin-dash/app/pages/bannedips/content.json @@ -42,25 +42,10 @@ "row_actions": [ { "client_requirement": "client_is_administrator+", - "action": "/action/bannedips/table_edit", - "method": "inline_edit", + "method": "js_edit", + "target": "add-form", "text": "Edit", - "class": "btn-ghost btn-sm", - "fields": [ - { - "col": "description", - "input_type": "text" - }, - { - "col": "ip", - "input_type": "text" - }, - { - "col": "enabled", - "input_type": "checkbox", - "checkbox_label": "Enabled" - } - ] + "class": "btn-ghost btn-sm" }, { "client_requirement": "client_is_administrator+", @@ -82,6 +67,11 @@ "action": "/action/bannedips/addip_add", "method": "post", "items": [ + { + "type": "hidden", + "name": "row_index", + "value": "" + }, { "type": "field", "label": "Description", @@ -97,6 +87,12 @@ "input_type": "text", "placeholder": "e.g. 1.2.3.4 or 1.2.3.0/24" }, + { + "type": "field", + "label": "Enabled", + "name": "enabled", + "input_type": "checkbox" + }, { "type": "button_row", "items": [ @@ -117,4 +113,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/docker/routlin-dash/app/pages/ddns/content.json b/docker/routlin-dash/app/pages/ddns/content.json index 2b229f3..6a50e88 100644 --- a/docker/routlin-dash/app/pages/ddns/content.json +++ b/docker/routlin-dash/app/pages/ddns/content.json @@ -124,33 +124,10 @@ "row_actions": [ { "client_requirement": "client_is_administrator+", - "action": "/action/ddns/accounts_edit", - "method": "inline_edit", + "method": "js_edit", + "target": "add-form", "text": "Edit", - "class": "btn-ghost btn-sm", - "fields": [ - { - "col": "description", - "input_type": "text" - }, - { - "col": "provider", - "input_type": "select", - "options": "%DDNS_PROVIDER_OPTIONS%" - }, - { - "col": "hostnames", - "input_type": "textarea" - }, - { - "col": "enabled", - "input_type": "checkbox" - }, - { - "col": "credentials", - "input_type": "credentials" - } - ] + "class": "btn-ghost btn-sm" }, { "client_requirement": "client_is_administrator+", @@ -163,6 +140,7 @@ }, { "type": "card", + "id": "add-form", "label": "Add DDNS Account", "client_requirement": "client_is_administrator+", "items": [ @@ -171,6 +149,11 @@ "action": "/action/ddns/addaccount_add", "method": "post", "items": [ + { + "type": "hidden", + "name": "row_index", + "value": "" + }, { "type": "field", "label": "Description", @@ -192,6 +175,12 @@ "input_type": "textarea", "placeholder": "e.g. myhome.duckdns.org" }, + { + "type": "field", + "label": "Enabled", + "name": "enabled", + "input_type": "checkbox" + }, { "type": "credential_fields", "provider_select": "provider" @@ -295,4 +284,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/docker/routlin-dash/app/pages/dhcpreservations/content.json b/docker/routlin-dash/app/pages/dhcpreservations/content.json index 9e5ee29..f5f2693 100644 --- a/docker/routlin-dash/app/pages/dhcpreservations/content.json +++ b/docker/routlin-dash/app/pages/dhcpreservations/content.json @@ -67,44 +67,10 @@ "row_actions": [ { "client_requirement": "client_is_administrator+", - "action": "/action/dhcpreservations/reservations_edit", - "method": "inline_edit", + "method": "js_edit", + "target": "add-form", "text": "Edit", - "class": "btn-ghost btn-sm", - "fields": [ - { - "col": "description", - "input_type": "text" - }, - { - "col": "hostname", - "input_type": "text", - "validate": "VALIDATION_NETWORK_NAME" - }, - { - "col": "mac", - "input_type": "text", - "validate": "VALIDATION_MAC" - }, - { - "col": "ip", - "input_type": "text", - "validate": "VALIDATION_IPV4_FORMAT|VALIDATION_ADDRESS", - "attrs": { - "data-vlan-subnets": "%VLAN_SUBNET_INFO_JSON%" - } - }, - { - "col": "radius_client", - "input_type": "checkbox", - "checkbox_label": "Enabled" - }, - { - "col": "enabled", - "input_type": "checkbox", - "checkbox_label": "Enabled" - } - ] + "class": "btn-ghost btn-sm" }, { "client_requirement": "client_is_administrator+", @@ -126,6 +92,11 @@ "action": "/action/dhcpreservations/addreservation_add", "method": "post", "items": [ + { + "type": "hidden", + "name": "row_index", + "value": "" + }, { "type": "field", "label": "VLAN", @@ -183,6 +154,12 @@ "input_type": "checkbox", "hint": "This device acts as a RADIUS authenticator, verifying credentials of other devices on the network." }, + { + "type": "field", + "label": "Enabled", + "name": "enabled", + "input_type": "checkbox" + }, { "type": "button_row", "items": [ diff --git a/docker/routlin-dash/app/pages/dnsblocking/content.json b/docker/routlin-dash/app/pages/dnsblocking/content.json index b372cde..e891835 100644 --- a/docker/routlin-dash/app/pages/dnsblocking/content.json +++ b/docker/routlin-dash/app/pages/dnsblocking/content.json @@ -41,31 +41,10 @@ "row_actions": [ { "client_requirement": "client_is_administrator+", - "action": "/action/dnsblocking/blocklists_edit", - "method": "inline_edit", + "method": "js_edit", + "target": "add-form", "text": "Edit", - "class": "btn-ghost btn-sm", - "fields": [ - { - "col": "name", - "input_type": "text", - "validate": "VALIDATION_DASH_NAME" - }, - { - "col": "description", - "input_type": "text" - }, - { - "col": "format", - "input_type": "select", - "options": "%BLOCKLIST_FORMAT_OPTIONS%" - }, - { - "col": "url", - "input_type": "text", - "validate": "VALIDATION_URL" - } - ] + "class": "btn-ghost btn-sm" }, { "client_requirement": "client_is_administrator+", @@ -87,6 +66,11 @@ "action": "/action/dnsblocking/addblocklist_add", "method": "post", "items": [ + { + "type": "hidden", + "name": "row_index", + "value": "" + }, { "type": "field", "label": "Name", @@ -243,4 +227,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/docker/routlin-dash/app/pages/hostoverrides/content.json b/docker/routlin-dash/app/pages/hostoverrides/content.json index 9f2ca4e..5745831 100644 --- a/docker/routlin-dash/app/pages/hostoverrides/content.json +++ b/docker/routlin-dash/app/pages/hostoverrides/content.json @@ -42,31 +42,10 @@ "row_actions": [ { "client_requirement": "client_is_administrator+", - "action": "/action/hostoverrides/table_edit", - "method": "inline_edit", + "method": "js_edit", + "target": "add-form", "text": "Edit", - "class": "btn-ghost btn-sm", - "fields": [ - { - "col": "description", - "input_type": "text" - }, - { - "col": "host", - "input_type": "text", - "validate": "VALIDATION_DOMAIN_NAME" - }, - { - "col": "ip", - "input_type": "text", - "validate": "VALIDATION_IPV4_FORMAT" - }, - { - "col": "enabled", - "input_type": "checkbox", - "checkbox_label": "Enabled" - } - ] + "class": "btn-ghost btn-sm" }, { "client_requirement": "client_is_administrator+", @@ -88,6 +67,11 @@ "action": "/action/hostoverrides/addoverride_add", "method": "post", "items": [ + { + "type": "hidden", + "name": "row_index", + "value": "" + }, { "type": "field", "label": "Description", @@ -111,6 +95,12 @@ "validate": "VALIDATION_IPV4_FORMAT", "placeholder": "e.g. 192.168.1.100" }, + { + "type": "field", + "label": "Enabled", + "name": "enabled", + "input_type": "checkbox" + }, { "type": "button_row", "items": [ @@ -131,4 +121,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/docker/routlin-dash/app/pages/intervlan/content.json b/docker/routlin-dash/app/pages/intervlan/content.json index 8fd7247..4089933 100644 --- a/docker/routlin-dash/app/pages/intervlan/content.json +++ b/docker/routlin-dash/app/pages/intervlan/content.json @@ -57,42 +57,10 @@ "row_actions": [ { "client_requirement": "client_is_administrator+", - "action": "/action/intervlan/table_edit", - "method": "inline_edit", + "method": "js_edit", + "target": "add-form", "text": "Edit", - "class": "btn-ghost btn-sm", - "fields": [ - { - "col": "description", - "input_type": "text" - }, - { - "col": "protocol", - "input_type": "select", - "options": "%PROTOCOL_OPTIONS%" - }, - { - "col": "src_ip_or_subnet", - "input_type": "text" - }, - { - "col": "dst_ip_or_subnet", - "input_type": "text" - }, - { - "col": "dest_port_start", - "input_type": "number" - }, - { - "col": "dest_port_end", - "input_type": "number" - }, - { - "col": "enabled", - "input_type": "checkbox", - "checkbox_label": "Enabled" - } - ] + "class": "btn-ghost btn-sm" }, { "client_requirement": "client_is_administrator+", @@ -114,6 +82,11 @@ "action": "/action/intervlan/addexception_add", "method": "post", "items": [ + { + "type": "hidden", + "name": "row_index", + "value": "" + }, { "type": "field", "label": "Description", @@ -178,6 +151,12 @@ "type": "raw_html", "html": "
This exception only applies to traffic matching the selected protocol and destination port range.
" }, + { + "type": "field", + "label": "Enabled", + "name": "enabled", + "input_type": "checkbox" + }, { "type": "button_row", "items": [ diff --git a/docker/routlin-dash/app/pages/portforwarding/content.json b/docker/routlin-dash/app/pages/portforwarding/content.json index 264def2..cec9b88 100644 --- a/docker/routlin-dash/app/pages/portforwarding/content.json +++ b/docker/routlin-dash/app/pages/portforwarding/content.json @@ -52,38 +52,10 @@ "row_actions": [ { "client_requirement": "client_is_administrator+", - "action": "/action/portforwarding/rules_edit", - "method": "inline_edit", + "method": "js_edit", + "target": "add-form", "text": "Edit", - "class": "btn-ghost btn-sm", - "fields": [ - { - "col": "description", - "input_type": "text" - }, - { - "col": "protocol", - "input_type": "select", - "options": "%PROTOCOL_OPTIONS%" - }, - { - "col": "dest_port", - "input_type": "text" - }, - { - "col": "nat_ip", - "input_type": "text" - }, - { - "col": "nat_port", - "input_type": "text" - }, - { - "col": "enabled", - "input_type": "checkbox", - "checkbox_label": "Enabled" - } - ] + "class": "btn-ghost btn-sm" }, { "client_requirement": "client_is_administrator+", @@ -105,6 +77,11 @@ "action": "/action/portforwarding/addrule_add", "method": "post", "items": [ + { + "type": "hidden", + "name": "row_index", + "value": "" + }, { "type": "field", "label": "Description", @@ -143,6 +120,12 @@ "validate": "VALIDATION_PORT", "placeholder": "e.g. 25565" }, + { + "type": "field", + "label": "Enabled", + "name": "enabled", + "input_type": "checkbox" + }, { "type": "button_row", "items": [ @@ -163,4 +146,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/docker/routlin-dash/app/pages/portwrangling/content.json b/docker/routlin-dash/app/pages/portwrangling/content.json index 8eba17b..5ae05a5 100644 --- a/docker/routlin-dash/app/pages/portwrangling/content.json +++ b/docker/routlin-dash/app/pages/portwrangling/content.json @@ -62,38 +62,10 @@ "row_actions": [ { "client_requirement": "client_is_administrator+", - "action": "/action/portwrangling/rules_edit", - "method": "inline_edit", + "method": "js_edit", + "target": "add-form", "text": "Edit", - "class": "btn-ghost btn-sm", - "fields": [ - { - "col": "description", - "input_type": "text" - }, - { - "col": "protocol", - "input_type": "select", - "options": "%PROTOCOL_OPTIONS%" - }, - { - "col": "dest_port", - "input_type": "number" - }, - { - "col": "redirect_to", - "input_type": "text", - "validate": "VALIDATION_IPV4_FORMAT|VALIDATION_ADDRESS", - "attrs": { - "data-vlan-subnets": "%VLAN_SUBNET_INFO_JSON%" - } - }, - { - "col": "enabled", - "input_type": "checkbox", - "checkbox_label": "Enabled" - } - ] + "class": "btn-ghost btn-sm" }, { "client_requirement": "client_is_administrator+", @@ -115,6 +87,11 @@ "action": "/action/portwrangling/addrule_add", "method": "post", "items": [ + { + "type": "hidden", + "name": "row_index", + "value": "" + }, { "type": "field", "label": "VLAN", @@ -165,6 +142,12 @@ } ] }, + { + "type": "field", + "label": "Enabled", + "name": "enabled", + "input_type": "checkbox" + }, { "type": "button_row", "items": [