4.49.7

2024-09-03 12:00:06 +01:00
parent 63ac89e952
commit 14f4829fab
114 changed files with 2011 additions and 2308 deletions
--- a/app/templates/dashboard/domain_detail/auto-create.html
+++ b/app/templates/dashboard/domain_detail/auto-create.html
@ -13,7 +13,8 @@

    <div class="alert alert-warning mt-3">Rules are ineffective when catch-all is enabled.</div>
  {% endif %}
-  <div class="{% if custom_domain.catch_all %} disabled-content{% endif %}">
+  <div class="{% if custom_domain.catch_all %}
+     disabled-content{% endif %}">
    <div class="mt-3 mb-2">
      For a greater control than a simple catch-all, you can define a set of <b>rules</b> to auto create aliases.
      <br />
@ -60,8 +61,7 @@
        <div class="form-group">
          <label>Regex</label>
          {{ new_auto_create_rule_form.regex(class="form-control",
-          placeholder="prefix.*"
-          ) }}
+                    placeholder="prefix.*") }}
          {{ render_field_errors(new_auto_create_rule_form.regex) }}
          <div class="small-text">
            For example, if you want aliases that starts with <b>prefix</b> to be automatically created, you can set
@ -95,10 +95,7 @@
                    name="mailbox_ids">
              {% for mailbox in mailboxes %}

-                <option value="{{ mailbox.id }}"
-                        {% if mailbox.id == current_user.default_mailbox_id %} selected{% endif %}>
-                  {{ mailbox.email }}
-                </option>
+                <option value="{{ mailbox.id }}" {% if mailbox.id == current_user.default_mailbox_id %}selected{% endif %}>{{ mailbox.email }}</option>
              {% endfor %}
            </select>
          </div>
@ -128,9 +125,7 @@
      {% if auto_create_test_result %}

        <div class="alert {% if auto_create_test_passed %}
-           alert-success {% else %} alert-warning {% endif %}">
-          {{ auto_create_test_result }}
-        </div>
+           alert-success {% else %} alert-warning {% endif %}">{{ auto_create_test_result }}</div>
      {% endif %}
    </div>
  </div>
--- a/app/templates/dashboard/domain_detail/dns.html
+++ b/app/templates/dashboard/domain_detail/dns.html
@ -63,8 +63,8 @@
      {% endif %}
      <hr />
    {% endif %}
-    <div class="{% if not custom_domain.ownership_verified %} disabled-content{% endif %}"
-         id="dns-setup">
+    <div class="{% if not custom_domain.ownership_verified %}
+       disabled-content{% endif %}" id="dns-setup">
      {% if not custom_domain.ownership_verified %}

        <div class="alert alert-warning">A domain ownership must be verified first.</div>
@ -177,9 +177,7 @@
          <em data-toggle="tooltip"
              title="Click to copy"
              class="clipboard"
-              data-clipboard-text="{{ spf_record }}">
-            {{ spf_record }}
-          </em>
+              data-clipboard-text="{{ spf_record }}">{{ spf_record }}</em>
        </div>
        <form method="post" action="#spf-form">
          {{ csrf_form.csrf_token }}
@ -238,9 +236,7 @@
          Setting up DKIM is highly recommended to reduce the chance your emails ending up in the recipient's Spam
          folder.
        </div>
-        <div class="mb-2">
-          Add the following CNAME DNS records to your domain.
-        </div>
+        <div class="mb-2">Add the following CNAME DNS records to your domain.</div>
        {% for dkim_prefix, dkim_cname_value in dkim_records %}

          <div class="mb-2 p-3 dns-record">
@ -256,9 +252,7 @@
                title="Click to copy"
                class="clipboard"
                data-clipboard-text="{{ dkim_cname_value }}."
-                style="overflow-wrap: break-word">
-              {{ dkim_cname_value }}.
-            </em>
+                style="overflow-wrap: break-word">{{ dkim_cname_value }}.</em>
          </div>
        {% endfor %}
        <div class="alert alert-info">
@ -282,21 +276,15 @@
          <input type="hidden" name="form-name" value="check-dkim">
          {% if custom_domain.dkim_verified %}

-            <button type="submit" class="btn btn-outline-primary">
-              Re-verify
-            </button>
+            <button type="submit" class="btn btn-outline-primary">Re-verify</button>
          {% else %}
-            <button type="submit" class="btn btn-primary">
-              Verify
-            </button>
+            <button type="submit" class="btn btn-primary">Verify</button>
          {% endif %}
        </form>
        {% if not dkim_ok %}

          <div class="text-danger mt-4">
-            <p>
-              Your DNS is not correctly set.
-            </p>
+            <p>Your DNS is not correctly set.</p>
            <ul>
              {% for custom_record, retrieved_cname in dkim_errors.items() %}

@ -312,10 +300,8 @@
          </div>
          {% if custom_domain.dkim_verified %}

-            <div class="text-danger mt-4">
-              DKIM is still enabled. Please update your DKIM settings with all CNAME records
-            </div>
-          {%  endif %}
+            <div class="text-danger mt-4">DKIM is still enabled. Please update your DKIM settings with all CNAME records</div>
+          {% endif %}
        {% endif %}
      </div>
      <hr />
@ -330,24 +316,20 @@
          {% else %}
            <span class="cursor"
                  data-toggle="tooltip"
-                  data-original-title="DMARC Not Verified">🚫 </span>
+                  data-original-title="DMARC Not Verified">🚫</span>
          {% endif %}
        </div>
        <div>
          DMARC
          <a href="https://en.wikipedia.org/wiki/DMARC"
             target="_blank"
-             rel="noopener noreferrer">
-            (Wikipedia↗)
-          </a>
+             rel="noopener noreferrer">(Wikipedia↗)</a>
          is designed to protect the domain from unauthorized use, commonly known as email spoofing.
          <br />
          Built around SPF and DKIM, a DMARC policy tells the receiving mail server what to do if
          neither of those authentication methods passes.
        </div>
-        <div class="mb-2">
-          Add the following TXT DNS record to your domain.
-        </div>
+        <div class="mb-2">Add the following TXT DNS record to your domain.</div>
        <div class="mb-2 p-3 dns-record">
          Record: TXT
          <br />
@ -360,9 +342,7 @@
          <em data-toggle="tooltip"
              title="Click to copy"
              class="clipboard"
-              data-clipboard-text="{{ dmarc_record }}">
-            {{ dmarc_record }}
-          </em>
+              data-clipboard-text="{{ dmarc_record }}">{{ dmarc_record }}</em>
        </div>
        <div class="alert alert-info">
          Some DNS registrar might require a full record path, in this case please use
@ -377,13 +357,9 @@
          <input type="hidden" name="form-name" value="check-dmarc">
          {% if custom_domain.dmarc_verified %}

-            <button type="submit" class="btn btn-outline-primary">
-              Re-verify
-            </button>
+            <button type="submit" class="btn btn-outline-primary">Re-verify</button>
          {% else %}
-            <button type="submit" class="btn btn-primary">
-              Verify
-            </button>
+            <button type="submit" class="btn btn-primary">Verify</button>
          {% endif %}
        </form>
        {% if not dmarc_ok %}
--- a/app/templates/dashboard/domain_detail/info.html
+++ b/app/templates/dashboard/domain_detail/info.html
@ -34,13 +34,14 @@
      .
    </div>
  </div>
-  <div class="{% if not custom_domain.catch_all %} disabled-content{% endif %}">
+  <div class="{% if not custom_domain.catch_all %}
+     disabled-content{% endif %}">
    <div>
      Auto-created aliases are automatically owned by the following mailboxes
      <i class="fe fe-corner-right-down"></i>
      .
    </div>
-    {% set domain_mailboxes=custom_domain.mailboxes %}
+    {% set domain_mailboxes = custom_domain.mailboxes %}
    <form method="post" class="mt-2">
      {{ csrf_form.csrf_token }}
      <input type="hidden" name="form-name" value="update">
@ -54,10 +55,7 @@
                  name="mailbox_ids">
            {% for mailbox in mailboxes %}

-              <option value="{{ mailbox.id }}"
-                      {% if mailbox in domain_mailboxes %} selected{% endif %}>
-                {{ mailbox.email }}
-              </option>
+              <option value="{{ mailbox.id }}" {% if mailbox in domain_mailboxes %}selected{% endif %}>{{ mailbox.email }}</option>
            {% endfor %}
          </select>
        </div>