[BS5] change bootstrap general

mailcow · Mar 31, 2022 · d3dca1d · d3dca1d
1 parent 9b80394
commit d3dca1d
Show file tree

Hide file tree

Showing 34 changed files with 152 additions and 140 deletions.
diff --git a/data/web/templates/admin/tab-config-admins.twig b/data/web/templates/admin/tab-config-admins.twig
@@ -26,6 +26,7 @@
         <legend style="margin-top:20px">
           {{ lang.tfa.tfa }}
         </legend>
+        <hr />
         <div class="row">
           <div class="col-sm-3 col-xs-5 text-right">{{ lang.tfa.tfa }}:</div>
           <div class="col-sm-9 col-xs-7">
@@ -49,7 +50,7 @@
         {# FIDO2 #}
         <legend style="margin-top:20px">
           <i class="bi bi-shield-fill-check"></i>
-          {{ lang.fido2.fido2_auth }}</legend>
+          {{ lang.fido2.fido2_auth }}</legend><hr />
         <div class="row">
           <div class="col-sm-3 col-xs-12 text-right text-xs-left space20">{{ lang.fido2.known_ids }}:</div>
           <div class="col-sm-9 col-xs-12">
@@ -89,6 +90,7 @@
         <legend style="cursor:pointer;margin-top:40px" data-bs-target="#license" unselectable="on" data-bs-toggle="collapse">
           <i style="font-size:10pt;" class="bi bi-plus-square"></i> {{ lang.admin.guid_and_license }}
         </legend>
+        <hr />
         <div id="license" class="collapse">
           <form class="form-horizontal" autocapitalize="none" autocorrect="off" role="form" method="post">
             <div class="form-group">
@@ -100,7 +102,7 @@
                   </span>
                   <input type="text" id="guid" class="form-control" value="{{ license_guid }}" readonly>
                 </div>
-                <p class="help-block">
+                <p class="text-muted">
                   {{ 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 @@
             </div>
             <div class="form-group">
               <div class="col-sm-offset-3 col-sm-9">
-                <p class="help-block">{{ lang.admin.license_info|raw }}</p>
+                <p class="text-muted">{{ lang.admin.license_info|raw }}</p>
                 <div class="btn-group">
                   <button class="btn btn-sm visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-success" name="license_validate_now" type="submit" href="#">{{ lang.admin.validate_license_now }}</button>
                 </div>
@@ -121,10 +123,11 @@
         <legend style="cursor:pointer;" data-bs-target="#admin_api" unselectable="on" data-bs-toggle="collapse">
           <i style="font-size:10pt;" class="bi bi-plus-square"></i> API
         </legend>
+        <hr />
         <div id="admin_api" class="collapse">
           <div class="row">
             <div class="col-lg-12">
-              <p class="help-block">{{ lang.admin.api_info|raw }}</p>
+              <p class="text-muted">{{ lang.admin.api_info|raw }}</p>
             </div>
             <div class="col-lg-6">
               <div class="card">

diff --git a/data/web/templates/admin/tab-config-customize.twig b/data/web/templates/admin/tab-config-customize.twig
@@ -2,8 +2,8 @@
   <div class="card">
     <div class="card-header">{{ lang.admin.customize }}</div>
     <div class="card-body">
-      <legend><i class="bi bi-file-image"></i> {{ lang.admin.change_logo }}</legend>
-      <p class="help-block">{{ lang.admin.logo_info }}</p>
+      <legend><i class="bi bi-file-image"></i> {{ lang.admin.change_logo }}</legend><hr />
+      <p class="text-muted">{{ lang.admin.logo_info }}</p>
       <form class="form-inline" role="form" method="post" enctype="multipart/form-data">
         <p>
           <input type="file" name="main_logo" accept="image/gif, image/jpeg, image/pjpeg, image/x-png, image/png, image/svg+xml"><br>
@@ -28,8 +28,8 @@
           </div>
         </div>
       {% endif %}
-      <legend>{{ lang.admin.app_links }}</legend>
-      <p class="help-block">{{ lang.admin.merged_vars_hint|raw }}</p>
+      <legend>{{ lang.admin.app_links }}</legend><hr />
+      <p class="text-muted">{{ lang.admin.merged_vars_hint|raw }}</p>
       <form class="form-inline" data-id="app_links" role="form" method="post">
         <table class="table table-condensed" style="white-space: nowrap;" id="app_link_table">
           <tr>
@@ -60,7 +60,7 @@
           <div class="clearfix visible-xs"></div>
         </div></p>
       </form>
-      <legend data-bs-target="#ui_texts" style="padding-top:20px" unselectable="on">{{ lang.admin.ui_texts }}</legend>
+      <legend data-bs-target="#ui_texts" style="padding-top:20px" unselectable="on">{{ lang.admin.ui_texts }}</legend><hr />
       <div id="ui_texts">
         <form class="form" data-id="uitexts" role="form" method="post">
           <div class="form-group">
@@ -81,7 +81,7 @@
           </div>
           <hr>
           <div class="form-group">
-            <p class="help-block">{{ lang.admin.ui_header_announcement_help }}</p>
+            <p class="text-muted">{{ lang.admin.ui_header_announcement_help }}</p>
             <label for="ui_announcement_type">{{ lang.admin.ui_header_announcement }}:</label>
             <p><select multiple data-width="100%" id="ui_announcement_type" name="ui_announcement_type" class="selectpicker show-tick" data-max-options="1" title="{{ lang.admin.ui_header_announcement_select }}">
                 <option {% if ui_texts.ui_announcement_type == 'info' %}selected{% endif %} value="info">{{ lang.admin.ui_header_announcement_type_info }}</option>

diff --git a/data/web/templates/admin/tab-config-dkim.twig b/data/web/templates/admin/tab-config-dkim.twig
@@ -90,7 +90,7 @@
         </div>
       </div>
 
-      <legend style="margin-top:40px">{{ lang.admin.dkim_add_key }}</legend>
+      <legend style="margin-top:40px">{{ lang.admin.dkim_add_key }}</legend><hr />
       <form class="form" data-id="dkim" role="form" method="post">
         <div class="form-group">
           <label for="dkim_add_domains">{{ lang.admin.domain_s }}</label>
@@ -113,6 +113,7 @@
       <legend data-bs-target="#import_dkim" style="margin-top:40px;cursor:pointer" unselectable="on" data-bs-toggle="collapse">
         <i style="font-size:10pt;" class="bi bi-plus-square"></i> {{ lang.admin.import_private_key }}
       </legend>
+      <hr />
       <div id="import_dkim" class="collapse">
         <form class="form" data-id="dkim_import" role="form" method="post">
           <div class="form-group">
@@ -139,6 +140,7 @@
       <legend data-bs-target="#duplicate_dkim" style="margin-top:40px;cursor:pointer" unselectable="on" data-bs-toggle="collapse">
         <i style="font-size:10pt;" class="bi bi-plus-square"></i> {{ lang.admin.duplicate_dkim }}
       </legend>
+      <hr />
       <div id="duplicate_dkim" class="collapse">
         <form class="form-horizontal" data-id="dkim_duplicate" role="form" method="post">
           <div class="form-group">

diff --git a/data/web/templates/admin/tab-config-f2b.twig b/data/web/templates/admin/tab-config-f2b.twig
@@ -30,7 +30,7 @@
           </div>
         </div>
         <hr>
-        <p class="help-block">{{ lang.admin.f2b_list_info|raw }}</p>
+        <p class="text-muted">{{ lang.admin.f2b_list_info|raw }}</p>
         <div class="form-group">
           <label for="f2b_whitelist">{{ lang.admin.f2b_whitelist }}:</label>
           <textarea class="form-control" id="f2b_whitelist" name="whitelist" rows="5">{{ f2b_data.whitelist }}</textarea>
@@ -48,8 +48,9 @@
       <legend data-bs-target="#f2b_regex_filters" style="margin-top:40px;cursor:pointer" unselectable="on" data-bs-toggle="collapse">
         <i style="font-size:10pt;" class="bi bi-plus-square"></i> {{ lang.admin.f2b_filter }}
       </legend>
+      <hr />
       <div id="f2b_regex_filters" class="collapse">
-        <p class="help-block">{{ lang.admin.f2b_regex_info }}</p>
+        <p class="text-muted">{{ lang.admin.f2b_regex_info }}</p>
         <form class="form-inline" data-id="f2b_regex" role="form" method="post">
           <table class="table table-condensed" id="f2b_regex_table">
             <tr>
@@ -73,7 +74,7 @@
         </form>
       </div>
 
-      <p class="help-block">{{ lang.admin.ban_list_info|raw }}</p>
+      <p class="text-muted">{{ lang.admin.ban_list_info|raw }}</p>
       {% if not f2b_data.active_bans and not f2b_data.perm_bans %}
         <i>{{ lang.admin.no_active_bans }}</i>
       {% endif %}

diff --git a/data/web/templates/admin/tab-config-fwdhosts.twig b/data/web/templates/admin/tab-config-fwdhosts.twig
@@ -19,8 +19,8 @@
           <div class="clearfix visible-xs"></div>
         </div>
       </div>
-      <legend>{{ lang.admin.add_forwarding_host }}</legend>
-      <p class="help-block">{{ lang.admin.forwarding_hosts_add_hint }}</p>
+      <legend>{{ lang.admin.add_forwarding_host }}</legend><hr />
+      <p class="text-muted">{{ lang.admin.forwarding_hosts_add_hint }}</p>
       <form class="form" data-id="fwdhost" role="form" method="post">
         <div class="form-group">
           <label for="fwdhost_hostname">{{ lang.admin.host }}</label>

diff --git a/data/web/templates/admin/tab-config-quarantine.twig b/data/web/templates/admin/tab-config-quarantine.twig
@@ -80,6 +80,7 @@
         <legend data-bs-target="#quarantine_template" style="cursor:pointer" unselectable="on" data-bs-toggle="collapse">
           <i style="font-size:10pt;" class="bi bi-plus-square"></i> {{ lang.admin.quarantine_notification_html|raw }}
         </legend>
+        <hr />
         <div id="quarantine_template" class="collapse" >
           <textarea autocorrect="off" spellcheck="false" autocapitalize="none" class="form-control textarea-code" rows="40" name="html_tmpl">{{ q_data.html_tmpl|raw }}</textarea>
         </div>

diff --git a/data/web/templates/admin/tab-config-quota.twig b/data/web/templates/admin/tab-config-quota.twig
@@ -23,6 +23,7 @@
             <legend data-bs-target="#quota_template" style="cursor:pointer" unselectable="on" data-bs-toggle="collapse">
               <i style="font-size:10pt;" class="bi bi-plus-square"></i> {{ lang.admin.quarantine_notification_html|raw }}
             </legend>
+            <hr />
             <div id="quota_template" class="collapse">
               <!-- <small>{{ lang.admin.quota_notifications_vars }}</small><br><br>-->
               <textarea autocorrect="off" spellcheck="false" autocapitalize="none" class="form-control textarea-code collapse in" rows="20" name="html_tmpl">{{ qn_data.html_tmpl|raw }}</textarea>

diff --git a/data/web/templates/admin/tab-config-rsettings.twig b/data/web/templates/admin/tab-config-rsettings.twig
@@ -5,6 +5,7 @@
       <legend data-bs-target="#active_settings_map" style="cursor:pointer" unselectable="on" data-bs-toggle="collapse">
         <i style="font-size:10pt;" class="bi bi-plus-square"></i> {{ lang.admin.active_rspamd_settings_map }}
       </legend>
+      <hr />
       <div id="active_settings_map" class="collapse" >
         <textarea autocorrect="off" spellcheck="false" autocapitalize="none" class="form-control textarea-code" rows="20" name="settings_map" readonly>{{ rsettings_map }}</textarea>
       </div>
@@ -33,11 +34,11 @@
             <div class="tab-content">
               {% if not rsettings %}
                 <div id="none" class="tab-pane active">
-                  <p class="help-block">{{ lang.admin.rsetting_none }}</p>
+                  <p class="text-muted">{{ lang.admin.rsetting_none }}</p>
                 </div>
               {% else %}
                 <div id="none" class="tab-pane active">
-                  <p class="help-block">{{ lang.admin.rsetting_no_selection }}</p>
+                  <p class="text-muted">{{ lang.admin.rsetting_no_selection }}</p>
                 </div>
                 {% for rsetting in rsettings %}
                   <div id="{{ rsetting.details.id }}" class="tab-pane">

diff --git a/data/web/templates/admin/tab-routing.twig b/data/web/templates/admin/tab-routing.twig
@@ -19,8 +19,8 @@
           <div class="clearfix visible-xs"></div>
         </div>
       </div>
-      <legend>{{ lang.admin.add_relayhost }}</legend>
-      <p class="help-block">{{ lang.admin.add_relayhost_hint|raw }}</p>
+      <legend>{{ lang.admin.add_relayhost }}</legend><hr />
+      <p class="text-muted">{{ lang.admin.add_relayhost_hint|raw }}</p>
       <div class="row">
         <div class="col-md-8">
           <form class="form" data-id="rlyhost" role="form" method="post">
@@ -63,8 +63,8 @@
           <div class="clearfix visible-xs"></div>
         </div>
       </div>
-      <legend>{{ lang.admin.add_transport }}</legend>
-      <p class="help-block">{{ lang.admin.add_transports_hint|raw }}</p>
+      <legend>{{ lang.admin.add_transport }}</legend><hr />
+      <p class="text-muted">{{ lang.admin.add_transports_hint|raw }}</p>
       <div class="row">
         <div class="col-md-8">
           <form class="form" data-id="transport" role="form" method="post">
@@ -94,7 +94,7 @@
                 <input type="checkbox" name="active" value="1"> {{ lang.admin.active }}
               </label>
             </div>
-            <p class="help-block">{{ lang.admin.credentials_transport_warning|raw }}</p>
+            <p class="text-muted">{{ lang.admin.credentials_transport_warning|raw }}</p>
             <button class="btn btn-sm visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-success" data-action="add_item" data-id="transport" data-api-url='add/transport' data-api-attr='{}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.admin.add }}</button>
           </form>
         </div>

diff --git a/data/web/templates/admin/tab-sys-mails.twig b/data/web/templates/admin/tab-sys-mails.twig
@@ -20,7 +20,7 @@
         {% endfor %}
         <div class="form-group">
           <label class="control-label col-sm-2" for="mass_subject">{{ lang.admin.include_exclude }}:
-            <p class="help-block">{{ lang.admin.include_exclude_info|raw }}</p>
+            <p class="text-muted">{{ lang.admin.include_exclude_info|raw }}</p>
           </label>
           <div class="col-sm-5">
             <label class="control-label" for="mass_exclude">{{ lang.admin.excludes }}:</label>

diff --git a/data/web/templates/debug.twig b/data/web/templates/debug.twig
@@ -218,11 +218,11 @@
             </div>
           </div>
           <div class="card-body">
-            <legend>{{ lang.debug.chart_this_server }}</legend>
+            <legend>{{ lang.debug.chart_this_server }}</legend><hr />
             <div id="chart-container">
               <canvas id="rspamd_donut" style="width:100%;height:400px"></canvas>
             </div>
-            <legend>{{ lang.debug.history_all_servers }}</legend>
+            <legend>{{ lang.debug.history_all_servers }}</legend><hr />
             <div class="table-responsive">
               <table class="table table-striped table-condensed log-table" id="rspamd_history"></table>
             </div>
@@ -308,7 +308,7 @@
             </div>
           </div>
           <div class="card-body">
-            <p class="help-block">{{ lang.admin.hash_remove_info }}</p>
+            <p class="text-muted">{{ lang.admin.hash_remove_info }}</p>
             <div class="table-responsive">
               <table class="table table-striped table-condensed" id="rl_log"></table>
             </div>

diff --git a/data/web/templates/edit/alias.twig b/data/web/templates/edit/alias.twig
@@ -33,7 +33,7 @@
       <div class="checkbox">
         <label><input type="checkbox" value="1" name="sogo_visible"{% if result.sogo_visible == '1' %} checked{% endif %}> {{ lang.edit.sogo_visible }}</label>
       </div>
-      <p class="help-block">{{ lang.edit.sogo_visible_info }}</p>
+      <p class="text-muted">{{ lang.edit.sogo_visible_info }}</p>
       {% endif %}
     </div>
   </div>

diff --git a/data/web/templates/edit/domain.twig b/data/web/templates/edit/domain.twig
@@ -92,7 +92,7 @@
         <div class="col-sm-offset-2 col-sm-10">
           <div class="checkbox">
             <label><input type="checkbox" value="1" name="gal"{% if result.gal == '1' %} checked{% endif %}> {{ lang.edit.gal }}</label>
-            <small class="help-block">{{ lang.edit.gal_info|raw }}</small>
+            <small class="text-muted">{{ lang.edit.gal_info|raw }}</small>
           </div>
         </div>
       </div>

diff --git a/data/web/templates/edit/domainadmin.twig b/data/web/templates/edit/domainadmin.twig
@@ -61,7 +61,7 @@
 <form data-id="daacl" class="form-inline well" method="post">
   <div class="row">
     <div class="col-sm-1">
-      <p class="help-block">ACL</p>
+      <p class="text-muted">ACL</p>
     </div>
     <div class="col-sm-10">
       <div class="form-group">