git subrepo commit mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "308860af"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "3f1a5af8"
git-subrepo: version: "0.4.5"
origin: "???"
commit: "???"
Change-Id: I5d51c14b45db54fe706be40a591ddbfcea50d4b0
diff --git a/mailcow/src/mailcow-dockerized/data/web/templates/mailbox.twig b/mailcow/src/mailcow-dockerized/data/web/templates/mailbox.twig
index 80177b8..cdb6a42 100644
--- a/mailcow/src/mailcow-dockerized/data/web/templates/mailbox.twig
+++ b/mailcow/src/mailcow-dockerized/data/web/templates/mailbox.twig
@@ -1,54 +1,62 @@
{% extends 'base.twig' %}
{% block content %}
-<ul class="nav nav-tabs responsive-tabs" role="tablist">
- <li role="presentation" class="active"><a href="#tab-domains" aria-controls="tab-domains" role="tab" data-toggle="tab">{{ lang.mailbox.domains }}</a></li>
- <li role="presentation"><a href="#tab-mailboxes" aria-controls="tab-mailboxes" role="tab" data-toggle="tab">{{ lang.mailbox.mailboxes }}</a></li>
- {# <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ lang.mailbox.mailboxes }}
- <span class="caret"></span></a>
- <ul class="dropdown-menu">
- <li role="presentation"><a href="#tab-mailboxes" aria-controls="tab-mailboxes" role="tab" data-toggle="tab">{{ lang.mailbox.mailboxes }}</a></li>
- <li role="presentation"><a href="#tab-mailbox-defaults" aria-controls="tab-mailbox-defaults" role="tab" data-toggle="tab">{{ lang.mailbox.mailbox_defaults }}</a></li>
- </ul>
- </li> #}
- <li role="presentation"><a href="#tab-resources" aria-controls="tab-resources" role="tab" data-toggle="tab">{{ lang.mailbox.resources }}</a></li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ lang.mailbox.aliases }}
- <span class="caret"></span></a>
+<div id="mail-content" class="responsive-tabs">
+ <ul class="nav nav-tabs" role="tablist">
+ <li class="nav-item dropdown" role="presentation">
+ <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.domains }}</a>
<ul class="dropdown-menu">
- <li role="presentation"><a href="#tab-mbox-aliases" aria-controls="tab-mbox-aliases" role="tab" data-toggle="tab">{{ lang.mailbox.aliases }}</a></li>
- <li role="presentation"><a href="#tab-domain-aliases" aria-controls="tab-domain-aliases" role="tab" data-toggle="tab">{{ lang.mailbox.domain_aliases }}</a></li>
+ <li><button class="dropdown-item" aria-selected="false" aria-controls="tab-domains" role="tab" data-bs-toggle="tab" data-bs-target="#tab-domains">{{ lang.mailbox.domains }}</button></li>
+ <li><button class="dropdown-item {% if mailcow_cc_role != 'admin' %} d-none{% endif %}" aria-selected="false" aria-controls="tab-templates-domains" role="tab" data-bs-toggle="tab" data-bs-target="#tab-templates-domains">{{ lang.mailbox.templates }}</button></li>
</ul>
- </li>
- <li role="presentation"><a href="#tab-syncjobs" aria-controls="tab-syncjobs" role="tab" data-toggle="tab">{{ lang.mailbox.sync_jobs }}</a></li>
- <li role="presentation"><a href="#tab-filters" aria-controls="tab-filters" role="tab" data-toggle="tab">{{ lang.mailbox.filters }}</a></li>
- <li role="presentation"><a href="#tab-bcc" aria-controls="tab-bcc" role="tab" data-toggle="tab">{{ lang.mailbox.address_rewriting }}</a></li>
- <li role="presentation"{% if mailcow_cc_role != 'admin' %} class="hidden"{% endif %}><a href="#tab-tls-policy" aria-controls="tab-tls-policy" role="tab" data-toggle="tab">{{ lang.mailbox.tls_policy_maps }}</a></li>
-</ul>
+ </li>
+ <li class="nav-item dropdown" role="presentation">
+ <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.mailboxes }}</a>
+ <ul class="dropdown-menu">
+ <li><button class="dropdown-item" aria-selected="false" aria-controls="tab-mailboxes" role="tab" data-bs-toggle="tab" data-bs-target="#tab-mailboxes">{{ lang.mailbox.mailboxes }}</button></li>
+ <li><button class="dropdown-item {% if mailcow_cc_role != 'admin' %} d-none{% endif %}" aria-selected="false" aria-controls="tab-templates-mbox" role="tab" data-bs-toggle="tab" data-bs-target="#tab-templates-mbox">{{ lang.mailbox.templates }}</button></li>
+ </ul>
+ </li>
+ <li class="nav-item" role="presentation"><button class="nav-link" aria-controls="tab-resources" role="tab" data-bs-toggle="tab" data-bs-target="#tab-resources">{{ lang.mailbox.resources }}</button></li>
+ <li class="nav-item dropdown">
+ <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" data-bs-target="#">{{ lang.mailbox.aliases }}</a>
+ <ul class="dropdown-menu">
+ <li role="presentation"><button class="dropdown-item" aria-selected="false" aria-controls="tab-mbox-aliases" role="tab" data-bs-toggle="tab" data-bs-target="#tab-mbox-aliases">{{ lang.mailbox.aliases }}</button></li>
+ <li role="presentation"><button class="dropdown-item" aria-selected="false" aria-controls="tab-domain-aliases" role="tab" data-bs-toggle="tab" data-bs-target="#tab-domain-aliases">{{ lang.mailbox.domain_aliases }}</button></li>
+ </ul>
+ </li>
+ <li class="nav-item" role="presentation"><button class="nav-link" aria-selected="false" aria-controls="tab-syncjobs" role="tab" data-bs-toggle="tab" data-bs-target="#tab-syncjobs">{{ lang.mailbox.sync_jobs }}</button></li>
+ <li class="nav-item" role="presentation"><button class="nav-link" aria-selected="false" aria-controls="tab-filters" role="tab" data-bs-toggle="tab" data-bs-target="#tab-filters">{{ lang.mailbox.filters }}</button></li>
+ <li class="nav-item" role="presentation"><button class="nav-link" aria-selected="false" aria-controls="tab-bcc" role="tab" data-bs-toggle="tab" data-bs-target="#tab-bcc">{{ lang.mailbox.address_rewriting }}</button></li>
+ <li class="nav-item" role="presentation"{% if mailcow_cc_role != 'admin' %} class="d-none"{% endif %}><button class="nav-link" aria-selected="false" aria-controls="tab-tls-policy" role="tab" data-bs-toggle="tab" data-bs-target="#tab-tls-policy">{{ lang.mailbox.tls_policy_maps }}</button></li>
+ </ul>
-<div class="row">
- <div class="col-md-12">
- <div class="tab-content" style="padding-top:20px">
- {% include 'mailbox/tab-domains.twig' %}
- {% include 'mailbox/tab-mailbox-defaults.twig' %}
- {% include 'mailbox/tab-mailboxes.twig' %}
- {% include 'mailbox/tab-resources.twig' %}
- {% include 'mailbox/tab-domain-aliases.twig' %}
- {% include 'mailbox/tab-mbox-aliases.twig' %}
- {% include 'mailbox/tab-syncjobs.twig' %}
- {% include 'mailbox/tab-filters.twig' %}
- {% include 'mailbox/tab-bcc.twig' %}
- {% include 'mailbox/tab-tls-policy.twig' %}
- </div> <!-- /tab-content -->
- </div> <!-- /col-md-12 -->
-</div> <!-- /row -->
+ <div class="row">
+ <div class="col-md-12">
+ <div class="tab-content" style="padding-top:20px">
+ {% include 'mailbox/tab-domains.twig' %}
+ {% include 'mailbox/tab-templates-domains.twig' %}
+ {% include 'mailbox/tab-mailboxes.twig' %}
+ {% include 'mailbox/tab-templates-mbox.twig' %}
+ {% include 'mailbox/tab-resources.twig' %}
+ {% include 'mailbox/tab-domain-aliases.twig' %}
+ {% include 'mailbox/tab-mbox-aliases.twig' %}
+ {% include 'mailbox/tab-syncjobs.twig' %}
+ {% include 'mailbox/tab-filters.twig' %}
+ {% include 'mailbox/tab-bcc.twig' %}
+ {% include 'mailbox/tab-tls-policy.twig' %}
+ </div> <!-- /tab-content -->
+ </div> <!-- /col-md-12 -->
+ </div> <!-- /row -->
+</div>
{% include 'modals/mailbox.twig' %}
<script type='text/javascript'>
var acl = '{{ acl_json|raw }}';
var lang = {{ lang_mailbox|raw }};
+ var lang_rl = {{ lang_rl|raw }};
+ var lang_datatables = {{ lang_datatables|raw }};
var csrf_token = '{{ csrf_token }}';
var pagination_size = '{{ pagination_size }}';
var role = '{{ role }}';