diff --git a/internal/app/server/routes/internet/conn-profiles.go b/internal/app/server/routes/internet/conn-profiles.go index 9fc9e67..80526b9 100644 --- a/internal/app/server/routes/internet/conn-profiles.go +++ b/internal/app/server/routes/internet/conn-profiles.go @@ -359,6 +359,8 @@ func parseConnProfileSettingsConnField( return nil, errors.Errorf("autoconnect priority %d out of range [-999, 999]", value) } return value, nil + case "zone": + return rawValue, nil } } diff --git a/web/templates/internet/conn-profiles/settings-form.partial.tmpl b/web/templates/internet/conn-profiles/settings-form.partial.tmpl index 9e7cc96..fcfb7f9 100644 --- a/web/templates/internet/conn-profiles/settings-form.partial.tmpl +++ b/web/templates/internet/conn-profiles/settings-form.partial.tmpl @@ -42,123 +42,123 @@

Connection

- -
-
- -
-
-
-
- {{if $conn.ID}} - {{$conn.ID}} - {{else}} - none - {{end}} -
-
-
+
+
+
- -
-
- -
-
-
-
- {{if $conn.UUID.String}} - {{$conn.UUID.String}} - {{else}} - none - {{end}} -
+
+
+
+ {{if $conn.ID}} + {{$conn.ID}} + {{else}} + none + {{end}}
+
- {{if $conn.StableID}} -
-
- -
-
-
-
- {{$conn.StableID}} -
-
+
+
+ +
+
+
+
+ {{if $conn.UUID.String}} + {{$conn.UUID.String}} + {{else}} + none + {{end}}
- {{end}} +
+
+ {{if $conn.StableID}}
- {{if $conn.Type}} - {{if eq $conn.Type.Info.Short $conn.Type}} - {{$conn.Type}} - {{else}} - {{$conn.Type.Info.Short}} - {{end}} - {{else}} - none - {{end}} + {{$conn.StableID}}
+ {{end}} -
-
- -
-
-
-
- {{if $conn.InterfaceName}} - - {{$conn.InterfaceName}} - +
+
+ +
+
+
+
+ {{if $conn.Type}} + {{if eq $conn.Type.Info.Short $conn.Type}} + {{$conn.Type}} {{else}} - any appropriate interface + {{$conn.Type.Info.Short}} {{end}} -
+ {{else}} + none + {{end}}
+
-
-
- +
+
+ +
+
+
+
+ {{if $conn.InterfaceName}} + + {{$conn.InterfaceName}} + + {{else}} + any appropriate interface + {{end}} +
-
-
-
+
+
+ +
+
+ +
+
+
+
+ {{if $conn.Timestamp.IsZero}} never, or unknown {{else}} @@ -166,30 +166,34 @@ {{durationRound (ago $conn.Timestamp)}} ago {{end}} -
+
+
-
-
- -
-
-
-
- {{if and ($conn.Zone) (not (eq $conn.Zone "NULL"))}} - {{$conn.Zone}} - {{else}} - the firewall's default zone - {{end}} -
+
+
+ +
+
+
+
+
- +

Autoconnect