From fb42797ab793e52428fa092fb370998c55e166e4 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Fri, 10 Nov 2017 15:00:51 +0100
Subject: [PATCH] Use SITENAME and WEBSITE properly in the admin ui

---
 core/admin/mailu/__init__.py               | 1 +
 core/admin/mailu/ui/templates/base.html    | 2 +-
 core/admin/mailu/ui/templates/sidebar.html | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/admin/mailu/__init__.py b/core/admin/mailu/__init__.py
index 51a25c96..c5733325 100644
--- a/core/admin/mailu/__init__.py
+++ b/core/admin/mailu/__init__.py
@@ -48,6 +48,7 @@ default_config = {
     'SITENAME': 'Mailu',
     'WEBSITE': 'https://mailu.io',
     'WEB_ADMIN': '/admin',
+    'WEB_WEBMAIL': '/webmail',
     # Advanced settings
     'PASSWORD_SCHEME': 'SHA512-CRYPT',
 }
diff --git a/core/admin/mailu/ui/templates/base.html b/core/admin/mailu/ui/templates/base.html
index 0aa380c8..03e7f1b7 100644
--- a/core/admin/mailu/ui/templates/base.html
+++ b/core/admin/mailu/ui/templates/base.html
@@ -29,7 +29,7 @@ class="hold-transition skin-blue sidebar-mini"
     {% block navbar %}
     <header class="main-header">
       <a href="/admin/" class="logo">
-        <span class="logo-lg">Mailu</span>
+        <span class="logo-lg">{{ config["SITENAME"] }}</span>
       </a>
     </header>
     <aside class="main-sidebar">
diff --git a/core/admin/mailu/ui/templates/sidebar.html b/core/admin/mailu/ui/templates/sidebar.html
index 5f18e408..22bbfce5 100644
--- a/core/admin/mailu/ui/templates/sidebar.html
+++ b/core/admin/mailu/ui/templates/sidebar.html
@@ -77,18 +77,18 @@
     <li class="header">{% trans %}Go to{% endtrans %}</li>
     {% if config["WEBMAIL"] != "none" %}
     <li>
-      <a href="/webmail/">
+      <a href="{{ config["WEB_WEBMAIL"] }}/">
         <i class="fa fa-envelope-o"></i> <span>{% trans %}Webmail{% endtrans %}</span>
       </a>
     </li>
     {% endif %}
     <li>
-      <a href="https://mailu.io">
+      <a href="{{ config["WEBSITE"] }}">
         <i class="fa fa-globe"></i> <span>{% trans %}Website{% endtrans %}</span>
       </a>
     </li>
     <li>
-      <a href="https://github.com/Mailu/Mailu">
+      <a href="https://mailu.io">
         <i class="fa fa-life-ring"></i> <span>{% trans %}Help{% endtrans %}</span>
       </a>
     </li>