From d3dca1ddc2b9fb2a756db20729c84e214817b4f7 Mon Sep 17 00:00:00 2001 From: FreddleSpl0it Date: Thu, 31 Mar 2022 12:57:33 +0200 Subject: [PATCH] [BS5] change bootstrap general --- .../templates/admin/tab-config-admins.twig | 11 +++-- .../templates/admin/tab-config-customize.twig | 12 ++--- data/web/templates/admin/tab-config-dkim.twig | 4 +- data/web/templates/admin/tab-config-f2b.twig | 7 +-- .../templates/admin/tab-config-fwdhosts.twig | 4 +- .../admin/tab-config-quarantine.twig | 1 + .../web/templates/admin/tab-config-quota.twig | 1 + .../templates/admin/tab-config-rsettings.twig | 5 +- data/web/templates/admin/tab-routing.twig | 10 ++-- data/web/templates/admin/tab-sys-mails.twig | 2 +- data/web/templates/debug.twig | 6 +-- data/web/templates/edit/alias.twig | 2 +- data/web/templates/edit/domain.twig | 2 +- data/web/templates/edit/domainadmin.twig | 2 +- data/web/templates/edit/mailbox.twig | 31 ++++++------ data/web/templates/edit/relayhost.twig | 2 +- data/web/templates/edit/syncjob.twig | 12 ++--- data/web/templates/index.twig | 4 +- data/web/templates/mailbox/tab-bcc.twig | 4 +- data/web/templates/mailbox/tab-filters.twig | 2 +- .../mailbox/tab-mailbox-defaults.twig | 2 +- .../templates/mailbox/tab-mbox-aliases.twig | 2 +- data/web/templates/mailbox/tab-resources.twig | 2 +- .../web/templates/mailbox/tab-tls-policy.twig | 2 +- data/web/templates/modals/admin.twig | 20 ++++---- data/web/templates/modals/footer.twig | 18 +++---- data/web/templates/modals/mailbox.twig | 48 +++++++++---------- data/web/templates/modals/quarantine.twig | 2 +- data/web/templates/modals/user.twig | 32 ++++++------- data/web/templates/qhandler.twig | 5 +- data/web/templates/quarantine.twig | 4 +- data/web/templates/user/Pushover.twig | 7 +-- data/web/templates/user/tab-user-auth.twig | 10 ++-- .../web/templates/user/tab-user-settings.twig | 14 +++--- 34 files changed, 152 insertions(+), 140 deletions(-) diff --git a/data/web/templates/admin/tab-config-admins.twig b/data/web/templates/admin/tab-config-admins.twig index 7cfcd8dc..735e89e3 100644 --- a/data/web/templates/admin/tab-config-admins.twig +++ b/data/web/templates/admin/tab-config-admins.twig @@ -26,6 +26,7 @@ {{ lang.tfa.tfa }} +
{{ lang.tfa.tfa }}:
@@ -49,7 +50,7 @@ {# FIDO2 #} - {{ lang.fido2.fido2_auth }} + {{ lang.fido2.fido2_auth }}
{{ lang.fido2.known_ids }}:
@@ -89,6 +90,7 @@ {{ lang.admin.guid_and_license }} +
@@ -100,7 +102,7 @@
-

+

{{ lang.admin.customer_id }}: {{ gal.c|default('?')|raw }} - {{ lang.admin.service_id }}: {{ gal.s|default('?')|raw }} - {{ lang.admin.sal_level }}: {{ gal.m|default('?')|raw }} @@ -109,7 +111,7 @@

-

{{ lang.admin.license_info|raw }}

+

{{ lang.admin.license_info|raw }}

@@ -121,10 +123,11 @@ API +
-

{{ lang.admin.api_info|raw }}

+

{{ lang.admin.api_info|raw }}

diff --git a/data/web/templates/admin/tab-config-customize.twig b/data/web/templates/admin/tab-config-customize.twig index e21d4c9b..431bed7b 100644 --- a/data/web/templates/admin/tab-config-customize.twig +++ b/data/web/templates/admin/tab-config-customize.twig @@ -2,8 +2,8 @@
{{ lang.admin.customize }}
- {{ lang.admin.change_logo }} -

{{ lang.admin.logo_info }}

+ {{ lang.admin.change_logo }}
+

{{ lang.admin.logo_info }}


@@ -28,8 +28,8 @@

{% endif %} - {{ lang.admin.app_links }} -

{{ lang.admin.merged_vars_hint|raw }}

+ {{ lang.admin.app_links }}
+

{{ lang.admin.merged_vars_hint|raw }}

@@ -60,7 +60,7 @@

- {{ lang.admin.ui_texts }} + {{ lang.admin.ui_texts }}
@@ -81,7 +81,7 @@
-

{{ lang.admin.ui_header_announcement_help }}

+

{{ lang.admin.ui_header_announcement_help }}

@@ -48,8 +48,9 @@ {{ lang.admin.f2b_filter }} +

-

{{ lang.admin.f2b_regex_info }}

+

{{ lang.admin.f2b_regex_info }}

@@ -73,7 +74,7 @@ -

{{ lang.admin.ban_list_info|raw }}

+

{{ lang.admin.ban_list_info|raw }}

{% if not f2b_data.active_bans and not f2b_data.perm_bans %} {{ lang.admin.no_active_bans }} {% endif %} diff --git a/data/web/templates/admin/tab-config-fwdhosts.twig b/data/web/templates/admin/tab-config-fwdhosts.twig index 056af64b..2acedd82 100644 --- a/data/web/templates/admin/tab-config-fwdhosts.twig +++ b/data/web/templates/admin/tab-config-fwdhosts.twig @@ -19,8 +19,8 @@
- {{ lang.admin.add_forwarding_host }} -

{{ lang.admin.forwarding_hosts_add_hint }}

+ {{ lang.admin.add_forwarding_host }}
+

{{ lang.admin.forwarding_hosts_add_hint }}

diff --git a/data/web/templates/admin/tab-config-quarantine.twig b/data/web/templates/admin/tab-config-quarantine.twig index 7b8e8b6f..9ce2b966 100644 --- a/data/web/templates/admin/tab-config-quarantine.twig +++ b/data/web/templates/admin/tab-config-quarantine.twig @@ -80,6 +80,7 @@ {{ lang.admin.quarantine_notification_html|raw }} +
diff --git a/data/web/templates/admin/tab-config-quota.twig b/data/web/templates/admin/tab-config-quota.twig index c1f74966..7d265e2f 100644 --- a/data/web/templates/admin/tab-config-quota.twig +++ b/data/web/templates/admin/tab-config-quota.twig @@ -23,6 +23,7 @@ {{ lang.admin.quarantine_notification_html|raw }} +
diff --git a/data/web/templates/admin/tab-config-rsettings.twig b/data/web/templates/admin/tab-config-rsettings.twig index 5523ff6c..44702f61 100644 --- a/data/web/templates/admin/tab-config-rsettings.twig +++ b/data/web/templates/admin/tab-config-rsettings.twig @@ -5,6 +5,7 @@ {{ lang.admin.active_rspamd_settings_map }} +
@@ -33,11 +34,11 @@
{% if not rsettings %}
-

{{ lang.admin.rsetting_none }}

+

{{ lang.admin.rsetting_none }}

{% else %}
-

{{ lang.admin.rsetting_no_selection }}

+

{{ lang.admin.rsetting_no_selection }}

{% for rsetting in rsettings %}
diff --git a/data/web/templates/admin/tab-routing.twig b/data/web/templates/admin/tab-routing.twig index 9e08d0dc..5a7622cb 100644 --- a/data/web/templates/admin/tab-routing.twig +++ b/data/web/templates/admin/tab-routing.twig @@ -19,8 +19,8 @@
- {{ lang.admin.add_relayhost }} -

{{ lang.admin.add_relayhost_hint|raw }}

+ {{ lang.admin.add_relayhost }}
+

{{ lang.admin.add_relayhost_hint|raw }}

@@ -63,8 +63,8 @@
- {{ lang.admin.add_transport }} -

{{ lang.admin.add_transports_hint|raw }}

+ {{ lang.admin.add_transport }}
+

{{ lang.admin.add_transports_hint|raw }}

@@ -94,7 +94,7 @@ {{ lang.admin.active }}
-

{{ lang.admin.credentials_transport_warning|raw }}

+

{{ lang.admin.credentials_transport_warning|raw }}

diff --git a/data/web/templates/admin/tab-sys-mails.twig b/data/web/templates/admin/tab-sys-mails.twig index c30e053b..cd9e9fa2 100644 --- a/data/web/templates/admin/tab-sys-mails.twig +++ b/data/web/templates/admin/tab-sys-mails.twig @@ -20,7 +20,7 @@ {% endfor %}
diff --git a/data/web/templates/debug.twig b/data/web/templates/debug.twig index 068552be..3c1a6818 100644 --- a/data/web/templates/debug.twig +++ b/data/web/templates/debug.twig @@ -218,11 +218,11 @@
- {{ lang.debug.chart_this_server }} + {{ lang.debug.chart_this_server }}
- {{ lang.debug.history_all_servers }} + {{ lang.debug.history_all_servers }}
@@ -308,7 +308,7 @@
-

{{ lang.admin.hash_remove_info }}

+

{{ lang.admin.hash_remove_info }}

diff --git a/data/web/templates/edit/alias.twig b/data/web/templates/edit/alias.twig index 7ed5d7c0..ed7c5c08 100644 --- a/data/web/templates/edit/alias.twig +++ b/data/web/templates/edit/alias.twig @@ -33,7 +33,7 @@
-

{{ lang.edit.sogo_visible_info }}

+

{{ lang.edit.sogo_visible_info }}

{% endif %}
diff --git a/data/web/templates/edit/domain.twig b/data/web/templates/edit/domain.twig index bb359625..61958d7f 100644 --- a/data/web/templates/edit/domain.twig +++ b/data/web/templates/edit/domain.twig @@ -92,7 +92,7 @@
- {{ lang.edit.gal_info|raw }} + {{ lang.edit.gal_info|raw }}
diff --git a/data/web/templates/edit/domainadmin.twig b/data/web/templates/edit/domainadmin.twig index b944ea5f..cf550556 100644 --- a/data/web/templates/edit/domainadmin.twig +++ b/data/web/templates/edit/domainadmin.twig @@ -61,7 +61,7 @@
-

ACL

+

ACL

diff --git a/data/web/templates/edit/mailbox.twig b/data/web/templates/edit/mailbox.twig index 5794d472..16932886 100644 --- a/data/web/templates/edit/mailbox.twig +++ b/data/web/templates/edit/mailbox.twig @@ -28,7 +28,7 @@
- 0 = ∞ + 0 = ∞
@@ -66,7 +66,7 @@ {% endfor %}
{{ lang.edit.sender_acl_disabled|raw }}
- {{ lang.edit.sender_acl_info|raw }} + {{ lang.edit.sender_acl_info|raw }}
@@ -86,7 +86,7 @@

 

- {{ lang.edit.mailbox_relayhost_info }} + {{ lang.edit.mailbox_relayhost_info }}
@@ -119,7 +119,7 @@ data-api-attr='{"quarantine_notification":"weekly"}'>{{ lang.user.weekly }}
-

{{ lang.user.quarantine_notification_info }}

+

{{ lang.user.quarantine_notification_info }}

@@ -146,7 +146,7 @@ data-api-attr='{"quarantine_category":"all"}'>{{ lang.user.q_all }}
-

{{ lang.user.quarantine_category_info }}

+

{{ lang.user.quarantine_category_info }}

@@ -188,7 +188,7 @@ {% set ext_sender_acl = sender_acl_handles.external_sender_aliases|join(', ') %} {% endif %} - {{ lang.edit.extended_sender_acl_info|raw }} + {{ lang.edit.extended_sender_acl_info|raw }}
@@ -206,7 +206,7 @@
- {{ lang.edit.allow_from_smtp_info }} + {{ lang.edit.allow_from_smtp_info }}
@@ -223,7 +223,7 @@
- {{ lang.edit.force_pw_update_info|format(ui_texts.main_name) }} + {{ lang.edit.force_pw_update_info|format(ui_texts.main_name) }}
@@ -232,7 +232,7 @@
- {{ lang.edit.sogo_access_info }} + {{ lang.edit.sogo_access_info }}
@@ -251,11 +251,11 @@
-

+

-

{{ lang.user.pushover_info|format(mailbox)|raw }}

-

{{ lang.edit.pushover_vars|raw }}: {SUBJECT}, {SENDER}

+

{{ lang.user.pushover_info|format(mailbox)|raw }}

+

{{ lang.edit.pushover_vars|raw }}: {SUBJECT}, {SENDER}

@@ -297,6 +297,7 @@ {{ lang.edit.advanced_settings }} +
@@ -328,7 +329,7 @@
-

ACL

+

ACL

@@ -349,7 +350,7 @@
-

{{ lang.acl.ratelimit }}

+

{{ lang.acl.ratelimit }}

@@ -363,7 +364,7 @@
-

{{ lang.edit.mbox_rl_info }}

+

{{ lang.edit.mbox_rl_info }}

diff --git a/data/web/templates/edit/relayhost.twig b/data/web/templates/edit/relayhost.twig index 9e3d67c1..ee1e930a 100644 --- a/data/web/templates/edit/relayhost.twig +++ b/data/web/templates/edit/relayhost.twig @@ -9,7 +9,7 @@
-

{{ lang.add.relayhost_wrapped_tls_info|raw }}

+

{{ lang.add.relayhost_wrapped_tls_info|raw }}

diff --git a/data/web/templates/edit/syncjob.twig b/data/web/templates/edit/syncjob.twig index 6af7e0a0..6af3bf0f 100644 --- a/data/web/templates/edit/syncjob.twig +++ b/data/web/templates/edit/syncjob.twig @@ -49,7 +49,7 @@
- 1-43800 + 1-43800
@@ -62,28 +62,28 @@
- 0-32000 + 0-32000
- 0-125000000 + 0-125000000
- 1-32000 + 1-32000
- 1-32000 + 1-32000
@@ -96,7 +96,7 @@
- {{ lang.add.custom_params_hint }} + {{ lang.add.custom_params_hint }}
diff --git a/data/web/templates/index.twig b/data/web/templates/index.twig index 3e082b3c..529fb1ba 100644 --- a/data/web/templates/index.twig +++ b/data/web/templates/index.twig @@ -12,7 +12,7 @@ {% if ui_texts.ui_announcement_text and ui_texts.ui_announcement_active %}
{{ ui_texts.ui_announcement_text|rot13 }}
{% endif %} - {% if oauth2_request %}{{ lang.oauth2.authorize_app }}{% else %}{{ ui_texts.main_name|raw }}{% endif %} + {% if oauth2_request %}{{ lang.oauth2.authorize_app }}{% else %}{{ ui_texts.main_name|raw }}{% endif %}
{% if is_mobileconfig %}
{{ lang.login.mobileconfig_info }}
{% endif %} @@ -63,7 +63,7 @@ {% endif %}
{% if not oauth2_request and (mailcow_apps or app_links) %} - {{ ui_texts.apps_name|raw }} + {{ ui_texts.apps_name|raw }}
{% for app in mailcow_apps %} {% if not skip_sogo or not is_uri('SOGo', app.link) %} diff --git a/data/web/templates/mailbox/tab-bcc.twig b/data/web/templates/mailbox/tab-bcc.twig index 6cab0f0a..5c0f40ba 100644 --- a/data/web/templates/mailbox/tab-bcc.twig +++ b/data/web/templates/mailbox/tab-bcc.twig @@ -13,7 +13,7 @@
-

{{ lang.mailbox.bcc_info|raw }}

+

{{ lang.mailbox.bcc_info|raw }}

{#
#}
@@ -50,7 +50,7 @@
-

{{ lang.mailbox.recipient_map_info }}

+

{{ lang.mailbox.recipient_map_info }}

{#
#}
diff --git a/data/web/templates/mailbox/tab-filters.twig b/data/web/templates/mailbox/tab-filters.twig index 45b12d38..add1158c 100644 --- a/data/web/templates/mailbox/tab-filters.twig +++ b/data/web/templates/mailbox/tab-filters.twig @@ -12,7 +12,7 @@
-

{{ lang.mailbox.sieve_info|raw }}


+

{{ lang.mailbox.sieve_info|raw }}


{#
#}
diff --git a/data/web/templates/mailbox/tab-mailbox-defaults.twig b/data/web/templates/mailbox/tab-mailbox-defaults.twig index ae023edb..f5fd98d5 100644 --- a/data/web/templates/mailbox/tab-mailbox-defaults.twig +++ b/data/web/templates/mailbox/tab-mailbox-defaults.twig @@ -3,7 +3,7 @@
{{ lang.mailbox.mailbox_defaults }}
-
+
{{ lang.mailbox.mailbox_defaults_info }}
diff --git a/data/web/templates/mailbox/tab-mbox-aliases.twig b/data/web/templates/mailbox/tab-mbox-aliases.twig index 2b73eff1..f8c7f329 100644 --- a/data/web/templates/mailbox/tab-mbox-aliases.twig +++ b/data/web/templates/mailbox/tab-mbox-aliases.twig @@ -11,7 +11,7 @@
-
+
{{ lang.mailbox.alias_domain_alias_hint|raw }}
diff --git a/data/web/templates/mailbox/tab-resources.twig b/data/web/templates/mailbox/tab-resources.twig index 6ace7f5f..d12b3e08 100644 --- a/data/web/templates/mailbox/tab-resources.twig +++ b/data/web/templates/mailbox/tab-resources.twig @@ -11,7 +11,7 @@
-
+

{{ lang.mailbox.booking_0_short }} - {{ lang.mailbox.booking_null }}

{{ lang.mailbox.booking_lt0_short }} - {{ lang.mailbox.booking_ltnull }}

{{ lang.mailbox.booking_custom_short }} - {{ lang.mailbox.booking_custom }}

diff --git a/data/web/templates/mailbox/tab-tls-policy.twig b/data/web/templates/mailbox/tab-tls-policy.twig index 57e94d7c..fe157160 100644 --- a/data/web/templates/mailbox/tab-tls-policy.twig +++ b/data/web/templates/mailbox/tab-tls-policy.twig @@ -11,7 +11,7 @@
-

{{ lang.mailbox.tls_policy_maps_info|raw }}

+

{{ lang.mailbox.tls_policy_maps_info|raw }}

{#
#}
diff --git a/data/web/templates/modals/admin.twig b/data/web/templates/modals/admin.twig index 81d386ae..6b10c335 100644 --- a/data/web/templates/modals/admin.twig +++ b/data/web/templates/modals/admin.twig @@ -3,8 +3,8 @@
-

{{ lang.admin.add_settings_rule }}

+
@@ -45,8 +45,8 @@
-

{{ lang.admin.add_domain_admin }}

+
@@ -101,9 +101,9 @@
-

{{ lang.fido2.set_fn }}

-

+

+
@@ -129,8 +129,8 @@
-

OAuth2

+
@@ -155,8 +155,8 @@
-

{{ lang.admin.add_admin }}

+
@@ -201,8 +201,8 @@
-

Transport

+
@@ -218,7 +218,7 @@
-

{{ lang.admin.transport_test_rcpt_info|raw }}

+

{{ lang.admin.transport_test_rcpt_info|raw }}

@@ -238,8 +238,8 @@
-

ID

+
@@ -252,8 +252,8 @@
-

Private key

+ 

diff --git a/data/web/templates/modals/footer.twig b/data/web/templates/modals/footer.twig
index dc8f2292..0e0ded2c 100644
--- a/data/web/templates/modals/footer.twig
+++ b/data/web/templates/modals/footer.twig
@@ -3,8 +3,8 @@
   

     

       

-        
         
{{ lang.tfa.yubi_otp }}

+        
       

       

         
@@ -12,7 +12,7 @@
             
           

           

-          
{{ lang.tfa.api_register|format(ui_texts.main_name)|raw }}

+          
{{ lang.tfa.api_register|format(ui_texts.main_name)|raw }}

           

             
           

@@ -41,8 +41,8 @@
   

     

       

-        
         
{{ lang.tfa.webauthn }}

+        
       

       

         
@@ -77,8 +77,8 @@
   

     

       

-        
         
{{ lang.tfa.totp }}

+        
       

       

         
@@ -95,7 +95,7 @@
             
  • 
               
    {{ lang.tfa.scan_qr_code }}
    
               
-              
    {{ lang.tfa.enter_qr_code }}:
    
+              
    {{ lang.tfa.enter_qr_code }}:
    
                 {{ totp_secret }}
               
    
             
    • 
@@ -115,8 +115,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.tfa.delete_tfa }}
    
+        
       
    
       
    
         
@@ -138,8 +138,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.tfa[pending_tfa_method] }}
    
+        
       
    
       
    
         {% if pending_tfa_method == 'yubi_otp' %}
@@ -209,8 +209,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.footer.restart_container }} ()
    
+        
       
    
       
    
         
    {{ lang.footer.restart_container_info|raw }}
    
@@ -227,8 +227,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.footer.confirm_delete }}
    
+        
       
    
       
    
         
    {{ lang.footer.delete_these_items }}
    
diff --git a/data/web/templates/modals/mailbox.twig b/data/web/templates/modals/mailbox.twig
index 8cbdd0ad..75cd0607 100644
--- a/data/web/templates/modals/mailbox.twig
+++ b/data/web/templates/modals/mailbox.twig
@@ -3,8 +3,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.mailbox.add_mailbox }}
    
+        
       
    
       
    
         
@@ -36,7 +36,7 @@
             
             
    
               
-              0 = ∞
+              0 = ∞
               
             
    
           
    
@@ -77,8 +77,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.mailbox.add_domain }}
    
+        
       
    
       
    
         
@@ -129,7 +129,7 @@
             
    
               
    
                 
-                {{ lang.edit.gal_info|raw }}
+                {{ lang.edit.gal_info|raw }}
               
    
             
    
           
    
@@ -210,8 +210,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.mailbox.add_resource }}
    
+        
       
    
       
    
         
@@ -278,8 +278,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.mailbox.add_alias }}
    
+        
       
    
       
    
         
@@ -310,7 +310,7 @@
               
    
                 
               
    
-              
    {{ lang.edit.sogo_visible_info }}
    
+              
    {{ lang.edit.sogo_visible_info }}
    
               {% endif %}
             
    
           
    
@@ -336,8 +336,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.mailbox.add_domain_alias }}
    
+        
       
    
       
    
         
@@ -410,11 +410,11 @@
   
    
     
    
       
    
-        
         
    {{ lang.add.syncjob }}
    
+        
       
    
       
    
-        
    {{ lang.add.syncjob_hint }}
    
+        
    {{ lang.add.syncjob_hint }}
    
         
           
    
             
@@ -436,7 +436,7 @@
             
             
    
               
-              1-65535
+              1-65535
             
    
           
    
           
    
@@ -465,7 +465,7 @@
             
             
    
               
-              1-43800
+              1-43800
             
    
           
    
           
    
@@ -478,28 +478,28 @@
             
             
    
               
-              0-32000
+              0-32000
             
    
           
    
           
    
             
             
    
               
-              0-125000000
+              0-125000000
             
    
           
    
           
    
             
             
    
               
-              1-32000
+              1-32000
             
    
           
    
           
    
             
             
    
               
-              1-32000
+              1-32000
             
    
           
    
           
    
@@ -512,7 +512,7 @@
             
             
    
               
-              {{ lang.add.custom_params_hint }}
+              {{ lang.add.custom_params_hint }}
             
    
           
    
           
    
@@ -579,8 +579,8 @@
   
    
     
    
       
    
-        
         
    Filter
    
+        
       
    
       
    
         
@@ -617,7 +617,7 @@
           
    
           
    
             
    
-              
    {{ lang.add.activate_filter_warn }}
    
+              
    {{ lang.add.activate_filter_warn }}
    
               
    
                 
               
    
@@ -642,8 +642,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.mailbox.bcc_maps }}
    
+        
       
    
       
    
         
@@ -693,8 +693,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.mailbox.recipient_maps }}
    
+        
       
    
       
    
         
@@ -734,8 +734,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.mailbox.tls_policy_maps }}
    
+        
       
    
       
    
         
@@ -790,8 +790,8 @@
   
    
     
    
       
    
-        
         
    Log
    
+        
       
    
       
    
         
@@ -804,8 +804,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.diagnostics.dns_records }}
    
+        
       
    
       
    
         
    {{ lang.diagnostics.dns_records_24hours }}
    
diff --git a/data/web/templates/modals/quarantine.twig b/data/web/templates/modals/quarantine.twig
index de8f8716..8d4b75d3 100644
--- a/data/web/templates/modals/quarantine.twig
+++ b/data/web/templates/modals/quarantine.twig
@@ -2,8 +2,8 @@
   
    
     
    
       
    
-        
         
     {{ lang.quarantine.qitem }}
    
+        
       
    
       
    
         
diff --git a/data/web/templates/modals/user.twig b/data/web/templates/modals/user.twig
index 6bbadd8b..8ded2a56 100644
--- a/data/web/templates/modals/user.twig
+++ b/data/web/templates/modals/user.twig
@@ -3,9 +3,9 @@
   
    
     
    
       
    
-        
         
    {{ lang.fido2.set_fn }}
    
-        
    
+        
    
+        
       
    
       
    
         
@@ -31,8 +31,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.add.syncjob }}
    
+        
       
    
       
    
         
    {{ lang.add.syncjob_hint }}
    
@@ -47,7 +47,7 @@
             
             
    
               
-              1-65535
+              1-65535
             
    
           
    
           
    
@@ -76,7 +76,7 @@
             
             
    
               
-              1-43800
+              1-43800
             
    
           
    
           
    
@@ -89,28 +89,28 @@
             
             
    
               
-              0-32000
+              0-32000
             
    
           
    
           
    
             
             
    
               
-              0-125000000
+              0-125000000
             
    
           
    
           
    
             
             
    
               
-              1-32000
+              1-32000
             
    
           
    
           
    
             
             
    
               
-              1-32000
+              1-32000
             
    
           
    
           
    
@@ -189,8 +189,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.add.app_password }}
    
+        
       
    
       
    
         
@@ -210,7 +210,7 @@
             
             
    
               
-              
    {{ lang.user.new_password_description }}
    
+              
    {{ lang.user.new_password_description }}
    
             
    
           
    
           
    
@@ -248,8 +248,8 @@
   
    
     
    
       
    
-        
         
    Log
    
+        
       
    
       
    
         
@@ -262,11 +262,11 @@
   
    
     
    
       
    
-        
         
    {{ lang.user.change_password }}
    
         {% if number_of_app_passwords > 0 %}
         
    {{ lang.user.change_password_hint_app_passwords | replace({'{{number_of_app_passwords}}': number_of_app_passwords}) }}
    
         {% endif %}
+        
       
    
       
    
         
@@ -280,7 +280,7 @@
             
             
    
               
-              
    {{ lang.user.new_password_description }}
    
+              
    {{ lang.user.new_password_description }}
    
             
    
           
    
           
    
@@ -316,7 +316,7 @@
             
             
    
               
-              
    {{ lang.user.new_password_description }}
    
+              
    {{ lang.user.new_password_description }}
    
             
    
           
    
           
    
@@ -341,8 +341,8 @@
   
    
     
    
       
    
-        
         
    {{ lang.user.active_sieve }}
    
+        
       
    
       
    
         
    
diff --git a/data/web/templates/qhandler.twig b/data/web/templates/qhandler.twig
index c5524189..e5ece1c8 100644
--- a/data/web/templates/qhandler.twig
+++ b/data/web/templates/qhandler.twig
@@ -14,6 +14,7 @@
             {{ lang.quarantine.remove }}
           {% endif %}
         
+        
    
         
    {{ lang.quarantine.qhandler_success }}
    
       
    
     
    
@@ -25,10 +26,10 @@
       
     {{ lang.header.quarantine }}
    
       
    
         {% if action == 'release' %}
-        {{ lang.quarantine.release }}
+        {{ lang.quarantine.release }}
    
         {% endif %}
         {% if action == 'delete' %}
-        {{ lang.quarantine.remove }}
+        {{ lang.quarantine.remove }}
    
         {% endif %}
         
         
    
diff --git a/data/web/templates/quarantine.twig b/data/web/templates/quarantine.twig
index 766bfd9c..d7d94ca5 100644
--- a/data/web/templates/quarantine.twig
+++ b/data/web/templates/quarantine.twig
@@ -19,12 +19,12 @@
           
         
    
       
    
-      
    {{ lang.quarantine.qinfo|raw }}
    
+      
    {{ lang.quarantine.qinfo|raw }}
    
       
    
         {% if not quarantine_settings.retention_size or not quarantine_settings.max_size %}
         
    {{ lang.quarantine.disabled_by_config }}
    
         {% else %}
-        
    
+        
    
           {{ lang.quarantine.settings_info|format(quarantine_settings.retention_size, quarantine_settings.max_size)|raw }}
         
    
         {% endif %}
diff --git a/data/web/templates/user/Pushover.twig b/data/web/templates/user/Pushover.twig
index 6efdf6bd..8b2dcd48 100644
--- a/data/web/templates/user/Pushover.twig
+++ b/data/web/templates/user/Pushover.twig
@@ -5,11 +5,11 @@
     
     
    
       
    
-        
    
+        
    
       
    
       
    
-        
    {{ lang.user.pushover_info|format(mailcow_cc_username)|raw }}
    
-        
    {{ lang.user.pushover_vars|raw }}: {SUBJECT}, {SENDER}
    
+        
    {{ lang.user.pushover_info|format(mailcow_cc_username)|raw }}
    
+        
    {{ lang.user.pushover_vars|raw }}: {SUBJECT}, {SENDER}
    
         
    
           
    
             
    
@@ -51,6 +51,7 @@
               
                  {{ lang.user.advanced_settings }}
               
+              
    
             
    
             
    
               
    
diff --git a/data/web/templates/user/tab-user-auth.twig b/data/web/templates/user/tab-user-auth.twig
index 90e85c2b..e355d8da 100644
--- a/data/web/templates/user/tab-user-auth.twig
+++ b/data/web/templates/user/tab-user-auth.twig
@@ -21,7 +21,7 @@
       
    
         
         
    
-          
    {{ lang.user.direct_protocol_access|raw }}
    
+          
    {{ lang.user.direct_protocol_access|raw }}
    
           {% if mailboxdata.attributes.imap_access == 1 %}
    IMAP 
    {% else %}
    IMAP 
    {% endif %}
           {% if mailboxdata.attributes.smtp_access == 1 %}
    SMTP 
    {% else %}
    SMTP 
    {% endif %}
           {% if mailboxdata.attributes.sieve_access == 1 %}
    Sieve 
    {% else %}
    Sieve 
    {% endif %}
@@ -92,10 +92,10 @@
         
     {{ lang.user.apple_connection_profile }}:
    
         
    
           
     {{ lang.user.email }} IMAP, SMTP
    
-          
    {{ lang.user.apple_connection_profile_mailonly }}
    
+          
    {{ lang.user.apple_connection_profile_mailonly }}
    
           {% if not skip_sogo %}
           
     {{ lang.user.email_and_dav }} IMAP, SMTP, Cal/CardDAV
    
-          
    {{ lang.user.apple_connection_profile_complete }}
    
+          
    {{ lang.user.apple_connection_profile_complete }}
    
           {% endif %}
         
    
       
    
@@ -103,10 +103,10 @@
         
     {{ lang.user.apple_connection_profile }}
    {{ lang.user.with_app_password }}:
    
         
    
           
     {{ lang.user.email }} IMAP, SMTP
    
-          
    {{ lang.user.apple_connection_profile_mailonly }} {{ lang.user.apple_connection_profile_with_app_password }}
    
+          
    {{ lang.user.apple_connection_profile_mailonly }} {{ lang.user.apple_connection_profile_with_app_password }}
    
           {% if not skip_sogo %}
           
     {{ lang.user.email_and_dav }} IMAP, SMTP, Cal/CardDAV
    
-          
    {{ lang.user.apple_connection_profile_complete }} {{ lang.user.apple_connection_profile_with_app_password }}
    
+          
    {{ lang.user.apple_connection_profile_complete }} {{ lang.user.apple_connection_profile_with_app_password }}
    
           {% endif %}
         
    
       
    
diff --git a/data/web/templates/user/tab-user-settings.twig b/data/web/templates/user/tab-user-settings.twig
index e72a75a7..522e5f4b 100644
--- a/data/web/templates/user/tab-user-settings.twig
+++ b/data/web/templates/user/tab-user-settings.twig
@@ -27,8 +27,8 @@
             data-api-attr='{"tagged_mail_handler":"none"}'>{{ lang.user.tag_in_none }}
             
    
           
    
-          
    {{ lang.user.tag_help_explain|raw }}
    
-          
    {{ lang.user.tag_help_example|raw }}
    
+          
    {{ lang.user.tag_help_explain|raw }}
    
+          
    {{ lang.user.tag_help_example|raw }}
    
         
    
       
    
       {# Show TLS policy options #}
@@ -50,7 +50,7 @@
             data-api-attr='{"tls_enforce_out": {% if get_tls_policy.tls_enforce_out == '1' %}0{% else %}1{% endif %} }'>{{ lang.user.tls_enforce_out }}
             
    
           
    
-          
    {{ lang.user.tls_policy_warning|raw }}
    
+          
    {{ lang.user.tls_policy_warning|raw }}
    
         
    
       
    
       {# Show quarantine_notification options #}
@@ -84,7 +84,7 @@
             data-api-attr='{"quarantine_notification":"weekly"}'>{{ lang.user.weekly }}
             
    
           
    
-          
    {{ lang.user.quarantine_notification_info }}
    
+          
    {{ lang.user.quarantine_notification_info }}
    
         
    
       
    
       
    
@@ -111,7 +111,7 @@
             data-api-attr='{"quarantine_category":"all"}'>{{ lang.user.q_all }}
             
    
           
    
-          
    {{ lang.user.quarantine_category_info }}
    
+          
    {{ lang.user.quarantine_category_info }}
    
         
    
       
    
       {% if not skip_sogo %}
@@ -120,14 +120,14 @@
         
    {{ lang.user.eas_reset }}:
    
         
    
           
-          
    {{ lang.user.eas_reset_help|raw }}
    
+          
    {{ lang.user.eas_reset_help|raw }}
    
         
    
       
    
       
    
         
    {{ lang.user.sogo_profile_reset }}:
    
         
    
           
-          
    {{ lang.user.sogo_profile_reset_help|raw }}
    
+          
    {{ lang.user.sogo_profile_reset_help|raw }}
    
         
    
       
    
       {% endif %}