[BS5] rearrange nav items

mailcow · Jul 8, 2022 · d3cd219 · d3cd219
1 parent b149da2
commit d3cd219
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 33 deletions.
diff --git a/data/web/lang/lang.ca.json b/data/web/lang/lang.ca.json
@@ -270,7 +270,7 @@
         "administration": "Administració",
         "debug": "Debug",
         "mailboxes": "Bústies",
-        "mailcow_settings": "Configuració",
+        "mailcow_config": "Configuració",
         "quarantine": "Quarantena",
         "restart_sogo": "Reiniciar SOGo",
         "user_settings": "Preferències d'usuari"

diff --git a/data/web/lang/lang.cs.json b/data/web/lang/lang.cs.json
@@ -644,7 +644,7 @@
         "apps": "Aplikace",
         "debug": "Systémové informace",
         "mailboxes": "Nastavení mailů",
-        "mailcow_settings": "Nastavení",
+        "mailcow_config": "Nastavení",
         "quarantine": "Karanténa",
         "restart_netfilter": "Restartovat netfilter",
         "restart_sogo": "Restartovat SOGo",

diff --git a/data/web/lang/lang.da.json b/data/web/lang/lang.da.json
@@ -582,7 +582,7 @@
         "apps": "Apps",
         "debug": "Systemoplysninger",
         "mailboxes": "Mailopsætning",
-        "mailcow_settings": "Konfiguration",
+        "mailcow_config": "Konfiguration",
         "quarantine": "Karantæne",
         "restart_netfilter": "Genstart netfilter",
         "restart_sogo": "Genstart SOGo",

diff --git a/data/web/lang/lang.de.json b/data/web/lang/lang.de.json
@@ -675,9 +675,9 @@
     "header": {
         "administration": "Server-Konfiguration",
         "apps": "Apps",
-        "debug": "Systeminformation",
+        "debug": "Information",
         "mailboxes": "E-Mail-Setup",
-        "mailcow_settings": "Konfiguration",
+        "mailcow_config": "Konfiguration",
         "quarantine": "Quarantäne",
         "restart_netfilter": "Netfilter neustarten",
         "restart_sogo": "SOGo neustarten",

diff --git a/data/web/lang/lang.en.json b/data/web/lang/lang.en.json
@@ -675,9 +675,10 @@
     "header": {
         "administration": "Configuration & Details",
         "apps": "Apps",
-        "debug": "System Information",
+        "debug": "Information",
         "mailboxes": "Mail Setup",
-        "mailcow_settings": "Configuration",
+        "mailcow_system": "System",
+        "mailcow_config": "Configuration",
         "quarantine": "Quarantine",
         "restart_netfilter": "Restart netfilter",
         "restart_sogo": "Restart SOGo",

diff --git a/data/web/lang/lang.es.json b/data/web/lang/lang.es.json
@@ -438,7 +438,7 @@
         "administration": "Administración",
         "debug": "Información del sistema",
         "mailboxes": "Buzones",
-        "mailcow_settings": "Configuración",
+        "mailcow_config": "Configuración",
         "quarantine": "Cuarentena",
         "restart_sogo": "Reiniciar SOGo",
         "user_settings": "Configuraciones de usuario"

diff --git a/data/web/lang/lang.fi.json b/data/web/lang/lang.fi.json
@@ -507,7 +507,7 @@
         "apps": "Sovellukset",
         "debug": "Järjestelmä tiedot",
         "mailboxes": "Verkkotunnuksien asetukset",
-        "mailcow_settings": "Kokoonpano",
+        "mailcow_config": "Kokoonpano",
         "quarantine": "Karanteeni",
         "restart_netfilter": "Uudelleen käynnistä netfilter",
         "restart_sogo": "Uudelleen käynnistä SOGo",

diff --git a/data/web/lang/lang.fr.json b/data/web/lang/lang.fr.json
@@ -599,7 +599,7 @@
         "apps": "Applications",
         "debug": "Information Système",
         "mailboxes": "Configuration du courrier",
-        "mailcow_settings": "Configuration",
+        "mailcow_config": "Configuration",
         "quarantine": "Quarantaine",
         "restart_netfilter": "Redémarrer Netfilter",
         "restart_sogo": "Redémarrer SOGo",

diff --git a/data/web/lang/lang.hu.json b/data/web/lang/lang.hu.json
@@ -55,7 +55,7 @@
         "apps": "Appok",
         "debug": "Rendszer információ",
         "mailboxes": "Email beállítások",
-        "mailcow_settings": "Beállítások",
+        "mailcow_config": "Beállítások",
         "quarantine": "Karantén",
         "restart_netfilter": "Netfilter újraindítása",
         "restart_sogo": "SOGo újraindítása",

diff --git a/data/web/lang/lang.it.json b/data/web/lang/lang.it.json
@@ -651,7 +651,7 @@
         "apps": "App",
         "debug": "Informazioni di sistema",
         "mailboxes": "Caselle",
-        "mailcow_settings": "Configurazione",
+        "mailcow_config": "Configurazione",
         "quarantine": "Quarantena",
         "restart_netfilter": "Riavvia netfilter",
         "restart_sogo": "Riavvia SOGo",

diff --git a/data/web/lang/lang.ko.json b/data/web/lang/lang.ko.json
@@ -573,7 +573,7 @@
         "apps": "Apps",
         "debug": "System Information",
         "mailboxes": "Mail Setup",
-        "mailcow_settings": "Configuration",
+        "mailcow_config": "Configuration",
         "quarantine": "Quarantine",
         "restart_netfilter": "Restart netfilter",
         "restart_sogo": "Restart SOGo",

diff --git a/data/web/lang/lang.lv.json b/data/web/lang/lang.lv.json
@@ -278,7 +278,7 @@
         "administration": "Administrēšana",
         "debug": "Atkļūdošana",
         "mailboxes": "Pastkastes",
-        "mailcow_settings": "Configurācija",
+        "mailcow_config": "Configurācija",
         "quarantine": "Karantīna",
         "restart_sogo": "Restartēt SOGo",
         "user_settings": "Lietotāja uzstādījumi"

diff --git a/data/web/lang/lang.nl.json b/data/web/lang/lang.nl.json
@@ -592,7 +592,7 @@
         "apps": "Apps",
         "debug": "Systeeminformatie",
         "mailboxes": "Mailconfiguratie",
-        "mailcow_settings": "Beheer",
+        "mailcow_config": "Beheer",
         "quarantine": "Quarantaine",
         "restart_netfilter": "Herstart netfilter",
         "restart_sogo": "Herstart SOGo",

diff --git a/data/web/lang/lang.pl.json b/data/web/lang/lang.pl.json
@@ -202,7 +202,7 @@
     "header": {
         "administration": "Administrowanie",
         "mailboxes": "Skrzynki",
-        "mailcow_settings": "Konfiguracja",
+        "mailcow_config": "Konfiguracja",
         "quarantine": "Kwarantanna",
         "restart_sogo": "Uruchom ponownie SOGo",
         "user_settings": "Ustawienia użytkownika"

diff --git a/data/web/lang/lang.pt.json b/data/web/lang/lang.pt.json
@@ -137,7 +137,7 @@
     "header": {
         "administration": "Administração",
         "mailboxes": "Contas",
-        "mailcow_settings": "Configuração",
+        "mailcow_config": "Configuração",
         "user_settings": "Configurações do usuário"
     },
     "info": {

diff --git a/data/web/lang/lang.ro.json b/data/web/lang/lang.ro.json
@@ -650,7 +650,7 @@
         "apps": "Aplicații",
         "debug": "Informații Sistem",
         "mailboxes": "Configurare Mail",
-        "mailcow_settings": "Configurație",
+        "mailcow_config": "Configurație",
         "quarantine": "Carantină",
         "restart_netfilter": "Repornire netfilter",
         "restart_sogo": "Repornire SOGo",

diff --git a/data/web/lang/lang.ru.json b/data/web/lang/lang.ru.json
@@ -648,7 +648,7 @@
         "apps": "Приложения",
         "debug": "Состояние сервера",
         "mailboxes": "Настройка почты",
-        "mailcow_settings": "Конфигурация",
+        "mailcow_config": "Конфигурация",
         "quarantine": "Карантин",
         "restart_netfilter": "Перезапустить netfilter",
         "restart_sogo": "Перезапустить SOGo",

diff --git a/data/web/lang/lang.sk.json b/data/web/lang/lang.sk.json
@@ -650,7 +650,7 @@
         "apps": "Aplikácie",
         "debug": "Systémové informácie",
         "mailboxes": "Nastavenie mailov",
-        "mailcow_settings": "Konfigurácia",
+        "mailcow_config": "Konfigurácia",
         "quarantine": "Karanténa",
         "restart_netfilter": "Reštartovať netfilter",
         "restart_sogo": "Reštart SOGo",

diff --git a/data/web/lang/lang.sv.json b/data/web/lang/lang.sv.json
@@ -608,7 +608,7 @@
         "apps": "Applikationer",
         "debug": "Systeminformation",
         "mailboxes": "Ställ in mejl",
-        "mailcow_settings": "Konfiguration",
+        "mailcow_config": "Konfiguration",
         "quarantine": "Karantän",
         "restart_netfilter": "Starta om netfilter",
         "restart_sogo": "Starta om SOGo",

diff --git a/data/web/lang/lang.uk.json b/data/web/lang/lang.uk.json
@@ -655,7 +655,7 @@
         "restart_netfilter": "Перезапустити netfilter",
         "restart_sogo": "Перезапустити SOGo",
         "user_settings": "Налаштування користувача",
-        "mailcow_settings": "Конфігурація"
+        "mailcow_config": "Конфігурація"
     },
     "info": {
         "no_action": "Дій не передбачено",

diff --git a/data/web/lang/lang.zh.json b/data/web/lang/lang.zh.json
@@ -583,7 +583,7 @@
         "apps": "应用",
         "debug": "系统信息",
         "mailboxes": "邮箱设置",
-        "mailcow_settings": "配置",
+        "mailcow_config": "配置",
         "quarantine": "隔离",
         "restart_netfilter": "重启netfilter",
         "restart_sogo": "重启SOGo",

diff --git a/data/web/templates/base.twig b/data/web/templates/base.twig
@@ -59,24 +59,27 @@
         {% endif %}
         {% if mailcow_cc_role %}
         <li class="nav-item dropdown">
-          <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-expanded="false">{{ lang.header.mailcow_settings }}</a>
+          <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-expanded="false">{{ lang.header.mailcow_system }}</a>
           <ul class="dropdown-menu">
             {% if mailcow_cc_role == 'admin' %}
-            <li><a href="/admin" class="dropdown-item {% if is_uri('admin') %}active{% endif %}">{{ lang.header.administration }}</a></li>
             <li><a href="/debug" class="dropdown-item {% if is_uri('debug') %}active{% endif %}">{{ lang.header.debug }}</a></li>
-            {% endif %}
-            {% if mailcow_cc_role == 'admin' or mailcow_cc_role == 'domainadmin' %}
-            <li><a href="/mailbox" class="dropdown-item {% if is_uri('mailbox') %}active{% endif %}">{{ lang.header.mailboxes }}</a></li>
+            <li><a href="/admin" class="dropdown-item {% if is_uri('admin') %}active{% endif %}">{{ lang.header.mailcow_config }}</a></li>
             {% endif %}
             {% if mailcow_cc_role != 'admin' %}
             <li><a href="/user" class="dropdown-item {% if is_uri('user') %}active{% endif %}">{{ lang.header.user_settings }}</a></li>
             {% endif %}
           </ul>
         </li>
-        <li class="nav-item"><a href="/quarantine" class="nav-link {% if is_uri('quarantine') %}active{% endif %}"><i class="bi bi-inbox-fill me-2"></i> {{ lang.header.quarantine }}</a></li>
-        {% endif %}
-        {% if mailcow_cc_role == 'admin' and not skip_sogo %}
-        <li class="nav-item"><a href="#" class="nav-link" data-bs-toggle="modal" data-container="sogo-mailcow" data-bs-target="#RestartContainer"><i class="bi bi-arrow-repeat me-2"></i> {{ lang.header.restart_sogo }}</a></li>
+        <li class="nav-item dropdown">
+          <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-expanded="false">{{ lang.header.mailboxes }}</a>
+          <ul class="dropdown-menu">
+            {% if mailcow_cc_role == 'admin' or mailcow_cc_role == 'domainadmin' %}
+            <li><a href="/mailbox" class="dropdown-item {% if is_uri('mailbox') %}active{% endif %}">{{ lang.header.mailboxes }}</a></li>
+            {% endif %}
+            <li><a href="/quarantine" class="dropdown-item {% if is_uri('quarantine') %}active{% endif %}">{{ lang.header.quarantine }}</a></li>
+            <li><a href="#" class="dropdown-item" data-bs-toggle="modal" data-container="sogo-mailcow" data-bs-target="#RestartContainer">{{ lang.header.restart_sogo }}</a></li>
+          </ul>
+        </li>
         {% endif %}
         {% if mailcow_apps or app_links %}
         <li class="nav-item dropdown">
@@ -132,6 +135,14 @@
   var lang_tfa = {{ lang_tfa|raw }};
   var lang_fido2 = {{ lang_fido2|raw }};
   var docker_timeout = {{ docker_timeout|raw }} * 1000;
+  var mailcow_info = {
+    version_tag: '{{ mailcow_info.version_tag }}',
+    last_version_tag: '{{ mailcow_info.last_version_tag }}',
+    updatedAt: '{{ mailcow_info.updatedAt }}',
+    project_url: '{{ mailcow_info.project_url }}',
+    project_owner: '{{ mailcow_info.project_owner }}',
+    project_repo: '{{ mailcow_info.project_repo }}'
+  };
 
 $(window).scroll(function() {
   sessionStorage.scrollTop = $(this).scrollTop();
@@ -439,7 +450,7 @@ function recursiveBase64StrToArrayBuffer(obj) {
   {% if mailcow_cc_username and mailcow_info.version_tag|default %}
   <span class="version">
     🐮 + 🐋 = 💕
-    <a href="{{ mailcow_info.git_project_url }}/releases/tag/{{ mailcow_info.version_tag }}" target="_blank">
+    <a href="{{ mailcow_info.project_url }}/releases/tag/{{ mailcow_info.version_tag }}" target="_blank">
         Version: {{ mailcow_info.version_tag }}
     </a>
   </span>