wip: cleanup

2025-09-13 14:31:15 +00:00 · 2020-11-10 09:31:02 +01:00
parent 556d7bff4b
commit 07e7d1d6e9
32 changed files with 710 additions and 897 deletions
--- a/assets/img/PROLICHT.png
+++ b/assets/img/PROLICHT.png
--- a/assets/img/PROLICHT_FULL.png
+++ b/assets/img/PROLICHT_FULL.png
--- a/assets/img/avatar.png
+++ b/assets/img/avatar.png
--- a/assets/img/close.png
+++ b/assets/img/close.png
--- a/assets/img/header-logo.png
+++ b/assets/img/header-logo.png
--- a/assets/img/loading.gif
+++ b/assets/img/loading.gif
--- a/assets/img/login.jpg
+++ b/assets/img/login.jpg
--- a/assets/img/next.png
+++ b/assets/img/next.png
--- a/assets/img/prev.png
+++ b/assets/img/prev.png
--- a/assets/img/prolicht_fallback.jpg
+++ b/assets/img/prolicht_fallback.jpg
--- a/assets/tpl/admin_create_clients.html
+++ b/assets/tpl/admin_create_clients.html
@@ -7,7 +7,6 @@
    <meta name="description" content="{{ .Static.WebsiteTitle }}">
    <link rel="stylesheet" href="/css/jquery-ui.min.css">
    <link rel="stylesheet" href="/css/bootstrap.min.css">
-    <!--link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i"-->
    <link rel="stylesheet" href="/fonts/fontawesome-all.min.css">
    <link rel="stylesheet" href="/css/bootstrap-tokenfield.min.css">
    <link rel="stylesheet" href="/css/tokenfield-typeahead.min.css">
@@ -43,7 +42,7 @@
            <a href="/admin" class="btn btn-secondary">Cancel</a>
        </form>
    </div>
-    {{template "prt_footer.html"}}
+    {{template "prt_footer.html" .}}
    <script src="/js/jquery.min.js"></script>
    <script src="/js/bootstrap.bundle.min.js"></script>
    <script src="/js/jquery.easing.js"></script>
--- a/assets/tpl/admin_edit_client.html
+++ b/assets/tpl/admin_edit_client.html
@@ -6,7 +6,6 @@
    <title>{{ .Static.WebsiteTitle }} - Admin</title>
    <meta name="description" content="{{ .Static.WebsiteTitle }}">
    <link rel="stylesheet" href="/css/bootstrap.min.css">
-    <!--link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i"-->
    <link rel="stylesheet" href="/fonts/fontawesome-all.min.css">
    <link rel="stylesheet" href="/css/custom.css">
 </head>
@@ -83,7 +82,7 @@
            <a href="/admin" class="btn btn-secondary">Cancel</a>
        </form>
    </div>
-    {{template "prt_footer.html"}}
+    {{template "prt_footer.html" .}}
    <script src="/js/jquery.min.js"></script>
    <script src="/js/bootstrap.bundle.min.js"></script>
    <script src="/js/jquery.easing.js"></script>
--- a/assets/tpl/admin_edit_interface.html
+++ b/assets/tpl/admin_edit_interface.html
@@ -6,7 +6,6 @@
    <title>{{ .Static.WebsiteTitle }} - Admin</title>
    <meta name="description" content="{{ .Static.WebsiteTitle }}">
    <link rel="stylesheet" href="/css/bootstrap.min.css">
-    <!--link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i"-->
    <link rel="stylesheet" href="/fonts/fontawesome-all.min.css">
    <link rel="stylesheet" href="/css/custom.css">
 </head>
@@ -99,7 +98,7 @@
            <a href="/admin" class="btn btn-secondary">Cancel</a>
        </form>
    </div>
-    {{template "prt_footer.html"}}
+    {{template "prt_footer.html" .}}
    <script src="/js/jquery.min.js"></script>
    <script src="/js/bootstrap.bundle.min.js"></script>
    <script src="/js/jquery.easing.js"></script>
--- a/assets/tpl/admin_index.html
+++ b/assets/tpl/admin_index.html
@@ -6,7 +6,6 @@
    <title>{{ .Static.WebsiteTitle }} - Admin</title>
    <meta name="description" content="{{ .Static.WebsiteTitle }}">
    <link rel="stylesheet" href="/css/bootstrap.min.css">
-    <!--link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i"-->
    <link rel="stylesheet" href="/fonts/fontawesome-all.min.css">
    <link rel="stylesheet" href="/css/custom.css">
 </head>
@@ -92,7 +91,9 @@
                <h2 class="mt-2">Current VPN Users</h2>
            </div>
            <div class="col-sm-2 col-12 text-right">
+                {{if not .Static.LdapDisabled}}
                <a href="/admin/peer/createldap" title="Add a LDAP user" class="btn btn-primary"><i class="fa fa-fw fa-user-plus"></i></a>
+                {{end}}
                <a href="/admin/peer/create" title="Manual add a user" class="btn btn-primary"><i class="fa fa-fw fa-plus"></i>M</a>
            </div>
        </div>
@@ -191,7 +192,7 @@
            <p>Currently listed peers: <strong>{{len .Peers}}</strong></p>
        </div>
    </div>
-    {{template "prt_footer.html"}}
+    {{template "prt_footer.html" .}}
    <script src="/js/jquery.min.js"></script>
    <script src="/js/bootstrap.bundle.min.js"></script>
    <script src="/js/jquery.easing.js"></script>
--- a/assets/tpl/error.html
+++ b/assets/tpl/error.html
@@ -6,7 +6,6 @@
    <title>{{ .Static.WebsiteTitle }} - Error</title>
    <meta name="description" content="{{ .Static.WebsiteTitle }}">
    <link rel="stylesheet" href="/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">
    <link rel="stylesheet" href="/fonts/fontawesome-all.min.css">
    <link rel="stylesheet" href="/css/custom.css">
 </head>
@@ -22,7 +21,7 @@
        <p class="text-black-50 mb-0">{{.Data.Details}}</p><a href="/">← Back to Dashboard</a>
    </div>
 </div>
-{{template "prt_footer.html"}}
+{{template "prt_footer.html" .}}
 <script src="/js/jquery.min.js"></script>
 <script src="/js/bootstrap.bundle.min.js"></script>
 <script src="/js/jquery.easing.js"></script>
--- a/assets/tpl/index.html
+++ b/assets/tpl/index.html
@@ -1,13 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
-<!-- https://bootswatch.com/lux/ -->
+<!-- Theme: https://bootswatch.com/lux/ -->
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
    <title>{{ .Static.WebsiteTitle }}</title>
    <meta name="description" content="{{ .Static.WebsiteTitle }}">
    <link rel="stylesheet" href="/css/bootstrap.min.css">
-    <!--link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i"-->
    <link rel="stylesheet" href="/fonts/fontawesome-all.min.css">
    <link rel="stylesheet" href="/css/custom.css">
 </head>
@@ -26,7 +25,7 @@
        <h3>Client Software</h3>
        <p>Installation instructions for client software can be found on the official WireGuard website: <a href="https://www.wireguard.com/install/" title="WireGuard" target="_blank">https://www.wireguard.com/</a> </p>
    </div>
-    {{template "prt_footer.html"}}
+    {{template "prt_footer.html" .}}
    <script src="/js/jquery.min.js"></script>
    <script src="/js/bootstrap.bundle.min.js"></script>
    <script src="/js/jquery.easing.js"></script>
--- a/assets/tpl/login.html
+++ b/assets/tpl/login.html
@@ -7,7 +7,6 @@
    <title>{{ .static.WebsiteTitle }} - Login</title>
    <meta name="description" content="{{ .static.WebsiteTitle }}">
    <link rel="stylesheet" href="/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">
    <link rel="stylesheet" href="/fonts/fontawesome-all.min.css">
    <link rel="stylesheet" href="/fonts/font-awesome.min.css">
    <link rel="stylesheet" href="/fonts/fontawesome5-overrides.min.css">
@@ -46,7 +45,7 @@
        </div>
    </div>
    <script src="/js/jquery.min.js"></script>
-    <script src="/js/bootstrap.min.js"></script>
+    <script src="/js/bootstrap.bundle.min.js"></script>
    <script src="/js/jquery.easing.js"></script>
    <script src="/js/jquery.fancybox.min.js"></script>
    <script src="/js/custom.js"></script>
--- a/assets/tpl/profile.html
+++ b/assets/tpl/profile.html
@@ -1,120 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<!-- http://paintstrap.com/preview_by_id/27826?design=large -->
-<!-- http://www.colourlovers.com/palette/4657935 -->
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>{{ .static.WebsiteTitle }} - Profile</title>
-    <meta name="description" content="{{ .static.WebsiteTitle }}">
-    <link rel="stylesheet" href="/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">
-    <link rel="stylesheet" href="/fonts/fontawesome-all.min.css">
-    <link rel="stylesheet" href="/css/custom.css">
-</head>
-
-<body id="page-top">
-    {{template "prt_nav.html" .}}
-    <div class="container user-edit-container">
-        <div class="jumbotron user-edit-jumbotron">
-            <div class="row">
-                <div class="form-row">
-                    <div class="form-group col-md-6 text-center">
-                        <img class="list-image-edit" src="/user/{{$.user.Username}}/user.jpg?cc={{len $.user.Image}}" alt="User Image"/>
-                    </div>
-                    <div class="form-group col-md-6">
-                        <label for="inputName">Name</label>
-                        <input type="text" name="displayName" class="form-control" id="inputName" placeholder="" value="{{index $.user.Attributes "displayName" }}" readonly>
-                        <label for="inputMail">Email</label>
-                        <input type="email" name="mail" class="form-control" id="inputMail" placeholder="" value="{{index $.user.Attributes "mail" }}" readonly>
-                        <label for="inputUserID">User ID</label>
-                        <input type="text" name="sAMAccountName" class="form-control" id="inputUserID" placeholder="" value="{{index $.user.Attributes "sAMAccountName" }}" readonly>
-                    </div>
-                </div>
-            </div>
-            <br>
-            <div class="row">
-                <div class="form-row">
-                    <div class="form-group col-md-4">
-                        <label for="inputPhone">Phone Number</label>
-                        <input type="text" name="telephoneNumber" class="form-control" id="inputPhone" value="{{index $.user.Attributes "telephoneNumber" }}" placeholder="" readonly>
-                    </div>
-                    <div class="form-group col-md-4">
-                        <label for="inputMobile">Mobile Number</label>
-                        <input type="text" name="mobile" class="form-control" id="inputMobile" value="{{index $.user.Attributes "mobile" }}" placeholder="" readonly>
-                    </div>
-                    <div class="form-group col-md-4">
-                        <label for="inputEmployeeID">Employee ID</label>
-                        <input type="text" name="employeeID" class="form-control" id="inputEmployeeID" value="{{index $.user.Attributes "employeeID" }}" placeholder="" readonly>
-                    </div>
-                </div>
-                <div class="form-row">
-                    <div class="form-group col-md-6">
-                        <label for="inputTitle">Title</label>
-                        <input type="text" name="title" class="form-control" id="inputTitle" value="{{index $.user.Attributes "title" }}" placeholder="" readonly>
-                    </div>
-                    <div class="form-group col-md-6">
-                        <label for="inputDepartment">Department</label>
-                        <input type="text" name="department" class="form-control" id="inputDepartment" value="{{index $.user.Attributes "department" }}" placeholder="" readonly>
-                    </div>
-                </div>
-                <div class="form-row">
-                    <div class="form-group col-md-6">
-                        <label for="inputCompany">Company</label>
-                        <input type="text" name="company" class="form-control" id="inputCompany" value="{{index $.user.Attributes "company" }}" placeholder="" readonly>
-                    </div>
-                    <div class="form-group col-md-6">
-                        <label for="inputManager">Teamleader</label>
-                        <select name="manager" id="inputManager" class="form-control" readonly>
-                            <option value="">No Teamleader</option>
-                            {{range $i, $leader := $.teamLeaders}}
-                                {{if eq $leader.DN (index $.user.Attributes "manager")}}
-                                    <option value="{{$leader.DN}}" selected>{{$leader.Firstname}} {{$leader.Lastname}}</option>
-                                {{end}}
-                                <option value="{{$leader.DN}}">{{$leader.Firstname}} {{$leader.Lastname}}</option>
-                            {{end}}
-                        </select>
-                    </div>
-                </div>
-                <div class="form-row">
-                    <div class="form-group col-md-4">
-                        <label for="inputStreet">Street</label>
-                        <input type="text" name="streetAddress" class="form-control" id="inputStreet" value="{{index $.user.Attributes "streetAddress" }}" placeholder="" readonly>
-                    </div>
-                    <div class="form-group col-md-4">
-                        <label for="inputZip">Street</label>
-                        <input type="text" name="postalCode" class="form-control" id="inputZip" value="{{index $.user.Attributes "postalCode" }}" placeholder="" readonly>
-                    </div>
-                    <div class="form-group col-md-4">
-                        <label for="inputCity">City</label>
-                        <input type="text" name="l" class="form-control" id="inputCity" value="{{index $.user.Attributes "l" }}" placeholder="" readonly>
-                    </div>
-                </div>
-                <div class="form-row">
-                    <div class="form-group col-md-6">
-                        <label for="inputState">State/Province</label>
-                        <input type="text" name="st" class="form-control" id="inputState" value="{{index $.user.Attributes "st" }}" placeholder="" readonly>
-                    </div>
-                    <div class="form-group col-md-6">
-                        <label for="inputCountry">Country</label>
-                        <input type="text" name="co" class="form-control" id="inputCountry" value="{{index $.user.Attributes "co" }}" placeholder="" readonly>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="form-row">
-                    <div class="form-group col-md-12">
-                        <a href="/" class="btn btn-primary">Go Back</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    {{template "prt_footer.html"}}
-    <script src="/js/jquery.min.js"></script>
-    <script src="/js/bootstrap.min.js"></script>
-    <script src="/js/jquery.easing.js"></script>
-    <script src="/js/custom.js"></script>
-</body>
-
-</html>
--- a/assets/tpl/prt_footer.html
+++ b/assets/tpl/prt_footer.html
@@ -1,5 +1,5 @@
 <footer class="page-footer mt-auto">
    <div class="container mt-3">
-        <p class="text-muted">Copyright © Prolicht GmbH 2020 <a class="scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a></p>
+        <p class="text-muted">Copyright © {{ $.Static.CompanyName }} {{$.Static.Year}} <a class="scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a></p>
    </div>
 </footer>
--- a/assets/tpl/prt_nav.html
+++ b/assets/tpl/prt_nav.html
@@ -3,7 +3,7 @@
        <span class="navbar-toggler-icon"></span>
    </button>

-    <a class="navbar-brand" href="/"><img src="/img/PROLICHT_FULL.png" alt="PROLICHT"/></a>
+    <a class="navbar-brand" href="/"><img src="{{$.Static.WebsiteLogo}}" alt="{{$.Static.CompanyName}}"/></a>
    <div id="topNavbar" class="navbar-collapse collapse">
        <ul class="navbar-nav mr-auto mt-2 mt-lg-0">
            <li class="nav-spacer"></li>
@@ -24,11 +24,11 @@
                    {{end}}{{end}}
                    <a class="dropdown-item" href="/user/profile"><i class="fas fa-user"></i> Profile</a>
                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="{{ $.Static.LogoutURL }}"><i class="fas fa-sign-out-alt"></i> Logout</a>
+                    <a class="dropdown-item" href="/auth/logout"><i class="fas fa-sign-out-alt"></i> Logout</a>
                </div>
            </div>
        {{else}}
-            <a href="{{ $.Static.LoginURL }}" class="navbar-text"><i class="fas fa-sign-in-alt fa-sm fa-fw mr-2 text-gray-400"></i> Login</a></li>
+            <a href="/auth/login" class="navbar-text"><i class="fas fa-sign-in-alt fa-sm fa-fw mr-2 text-gray-400"></i> Login</a></li>
        {{end}}
    </div><!--/.navbar-collapse -->
 </nav>
--- a/assets/tpl/user_index.html
+++ b/assets/tpl/user_index.html
@@ -6,7 +6,6 @@
    <title>{{ .Static.WebsiteTitle }} - Profile</title>
    <meta name="description" content="{{ .Static.WebsiteTitle }}">
    <link rel="stylesheet" href="/css/bootstrap.min.css">
-    <!--link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i"-->
    <link rel="stylesheet" href="/fonts/fontawesome-all.min.css">
    <link rel="stylesheet" href="/css/custom.css">
 </head>
@@ -100,7 +99,7 @@
            <p>Currently listed peers: <strong>{{len .Peers}}</strong></p>
        </div>
    </div>
-    {{template "prt_footer.html"}}
+    {{template "prt_footer.html" .}}
    <script src="/js/jquery.min.js"></script>
    <script src="/js/bootstrap.bundle.min.js"></script>
    <script src="/js/jquery.easing.js"></script>