From b918648475b387c472d31c3f460ed853b69618f8 Mon Sep 17 00:00:00 2001 From: Michael Reber Date: Fri, 7 Feb 2025 18:06:29 +0100 Subject: [PATCH] Fix Menu and remove deprecated stuff --- templates/base.html | 120 +++++++++++++++++++++++++++------ templates/clients.html | 4 +- templates/global_settings.html | 8 +-- templates/login.html | 67 ++++++++++++++++++ templates/profile.html | 6 +- templates/server.html | 12 ++-- templates/status.html | 4 +- templates/users_settings.html | 4 +- 8 files changed, 186 insertions(+), 39 deletions(-) diff --git a/templates/base.html b/templates/base.html index 6422add..cdf89f1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -27,6 +27,91 @@ {{template "top_css" .}} + @@ -99,13 +184,13 @@ {{if .baseData.CurrentUser}} {{if .baseData.Admin}} - Administrator: {{.baseData.CurrentUser}} + My Account: {{.baseData.CurrentUser}} {{else}} - Manager: {{.baseData.CurrentUser}} + My Account: {{.baseData.CurrentUser}} {{end}} {{else}} - Administrator + My Account {{end}} @@ -118,12 +203,20 @@

- WireGuard Clients + VPN Clients +

+ + +
  • + + +

    + VPN Connected

    • - {{if .baseData.Admin}} +
  • SETTINGS
  • @@ -132,14 +225,11 @@

    • - - -
  • SETTINGS

  • - Global Settings + Client Config Settings

    • @@ -148,22 +238,12 @@

    - Users Settings + WGM User Accounts

    {{end}} {{end}} - -
  • UTILITIES
    • -
  • - - -

    - Status -

    -     -
    • diff --git a/templates/clients.html b/templates/clients.html index fc603dd..a44ed48 100644 --- a/templates/clients.html +++ b/templates/clients.html @@ -1,5 +1,5 @@ {{define "title"}} -WireGuard Clients +VPN WireGuard Clients {{end}} {{define "top_css"}} @@ -17,7 +17,7 @@ WireGuard Clients {{end}} {{define "page_title"}} -WireGuard Clients +VPN WireGuard Clients {{end}} {{define "page_content"}} diff --git a/templates/global_settings.html b/templates/global_settings.html index 1c667b8..549f402 100644 --- a/templates/global_settings.html +++ b/templates/global_settings.html @@ -1,5 +1,5 @@ {{define "title"}} -Global Settings +Client Config Settings {{end}} {{define "top_css"}} @@ -10,19 +10,19 @@ Global Settings {{end}} {{define "page_title"}} -Global Settings +Client Config Settings {{end}} {{define "page_content"}}
    - +
    -

    WireGuard Global Settings

    +

    WireGuard Client Config Settings

    diff --git a/templates/login.html b/templates/login.html index 4567e02..0d2142f 100644 --- a/templates/login.html +++ b/templates/login.html @@ -16,6 +16,73 @@ + diff --git a/templates/profile.html b/templates/profile.html index fa80157..775da08 100644 --- a/templates/profile.html +++ b/templates/profile.html @@ -1,5 +1,5 @@ {{ define "title"}} -Profile +My Account {{ end }} {{ define "top_css"}} @@ -10,13 +10,13 @@ Profile {{ end }} {{ define "page_title"}} -Profile +My Account {{ end }} {{ define "page_content"}}
    - +
    diff --git a/templates/server.html b/templates/server.html index d745959..d17fbbf 100644 --- a/templates/server.html +++ b/templates/server.html @@ -29,27 +29,27 @@ WireGuard Server Settings
    - +
    - +
    - +
    - +
    - +
    @@ -67,7 +67,7 @@ WireGuard Server Settings
    -

    Key Pair

    +

    Key Pair (Don't regenerate if server already in use!)

    diff --git a/templates/status.html b/templates/status.html index a9b770b..bc2e550 100644 --- a/templates/status.html +++ b/templates/status.html @@ -1,5 +1,5 @@ {{define "title"}} -Connected Peers +VPN Connected Users (Peers) {{end}} {{define "top_css"}} @@ -10,7 +10,7 @@ Connected Peers {{end}} {{define "page_title"}} -Connected Peers +VPN Connected Users (Peers) {{end}} {{define "page_content"}} diff --git a/templates/users_settings.html b/templates/users_settings.html index 11a8ef8..fecf509 100644 --- a/templates/users_settings.html +++ b/templates/users_settings.html @@ -1,5 +1,5 @@ {{define "title"}} -Users Settings +WGM User Accounts {{end}} {{define "top_css"}} @@ -10,7 +10,7 @@ Users Settings {{end}} {{define "page_title"}} -Users Settings +WGM User Accounts {{end}} {{define "page_content"}}