4.58

app/templates/admin/email_search.html

@@ -21,13 +21,17 @@
     <tbody>
       <tr>
         <td>{{ user.id }}</td>
-            <td><a href="?email={{ user.email }}">{{ user.email }}</a></td>
+        <td>
+          <a href="?email={{ user.email }}">{{ user.email }}</a>
+        </td>
         {% if user.activated %}
+
           <td class="text-success">Activated</td>
         {% else %}
           <td class="text-warning">Pending</td>
         {% endif %}
         {% if user.disabled %}
+
           <td class="text-danger">Disabled</td>
         {% else %}
           <td class="text-success">Enabled</td>
@@ -39,7 +43,9 @@
         <td>{{ user.updated_at }}</td>
         {% if pu %}
 
-                <td><a href="?email={{ pu.partner_email }}">{{ pu.partner_email }}</a></td>
+          <td>
+            <a href="?email={{ pu.partner_email }}">{{ pu.partner_email }}</a>
+          </td>
         {% else %}
           <td>No</td>
         {% endif %}
@@ -63,14 +69,13 @@
     </thead>
     <tbody>
       {% for mailbox in mboxes %}
-
         <tr>
           <td>{{ mailbox.id }}</td>
-                <td><a href="?email={{ mailbox.email }}">{{ mailbox.email }}</a></td>
-                <td>{{ "Yes" if mailbox.verified else "No" }}</td>
           <td>
-                    {{ mailbox.created_at }}
+            <a href="?email={{ mailbox.email }}">{{ mailbox.email }}</a>
           </td>
+          <td>{{ "Yes" if mailbox.verified else "No" }}</td>
+          <td>{{ mailbox.created_at }}</td>
         </tr>
       {% endfor %}
     </tbody>
@@ -84,25 +89,20 @@
   <table class="table">
     <thead>
       <tr>
-            <th>
+        <th>Alias ID</th>
-                Alias ID
+        <th>Email</th>
-            </th>
+        <th>Enabled</th>
-            <th>
+        <th>Created At</th>
-                Email
-            </th>
-            <th>
-                Enabled
-            </th>
-            <th>
-                Created At
-            </th>
       </tr>
     </thead>
     <tbody>
       {% for alias in aliases %}
+
         <tr>
           <td>{{ alias.id }}</td>
-                <td><a href="?email={{ alias.email }}">{{ alias.email }}</a></td>
+          <td>
+            <a href="?email={{ alias.email }}">{{ alias.email }}</a>
+          </td>
           <td>{{ "Yes" if alias.enabled else "No" }}</td>
           <td>{{ alias.created_at }}</td>
         </tr>
@@ -176,10 +176,13 @@
     </thead>
     <tbody>
       {% for entry in alias_audit_log %}
+
         <tr>
           <td>{{ entry.user_id }}</td>
           <td>{{ entry.alias_id }}</td>
-                <td><a href="?email={{ entry.alias_email }}">{{ entry.alias_email }}</a></td>
+          <td>
+            <a href="?email={{ entry.alias_email }}">{{ entry.alias_email }}</a>
+          </td>
           <td>{{ entry.action }}</td>
           <td>{{ entry.message }}</td>
           <td>{{ entry.created_at }}</td>
@@ -201,8 +204,11 @@
     </thead>
     <tbody>
       {% for entry in user_audit_log %}
+
         <tr>
-                <td><a href="?email={{ entry.user_email }}">{{ entry.user_email }}</a></td>
+          <td>
+            <a href="?email={{ entry.user_email }}">{{ entry.user_email }}</a>
+          </td>
           <td>{{ entry.action }}</td>
           <td>{{ entry.message }}</td>
           <td>{{ entry.created_at }}</td>
@@ -226,11 +232,12 @@
     </form>
   </div>
   {% if data.no_match and email %}
+
     <div class="border border-dark border-2 mt-1 mb-2 p-3 alert alert-warning"
          role="alert">No user, alias or mailbox found for {{ email }}</div>
   {% endif %}
-
   {% if data.alias %}
+
     <div class="border border-dark border-2 mt-1 mb-2 p-3">
       <h3 class="mb-3">Found Alias {{ data.alias.email }}</h3>
       {{ list_alias(1,[data.alias]) }}
@@ -239,8 +246,8 @@
       {{ show_user(data.alias.user) }}
     </div>
   {% endif %}
-
   {% if data.user %}
+
     <div class="border border-dark border-2 mt-1 mb-2 p-3">
       <h3 class="mb-3">Found User {{ data.user.email }}</h3>
       {{ show_user(data.user) }}
@@ -249,12 +256,14 @@
     </div>
   {% endif %}
   {% if data.user_audit_log %}
+
     <div class="border border-dark border-2 mt-1 mb-2 p-3">
       <h3 class="mb-3">Audit log entries for user {{ data.query }}</h3>
       {{ list_user_audit_log(data.user_audit_log) }}
     </div>
   {% endif %}
   {% if data.mailbox_count > 10 %}
+
     <h3>Found more than 10 mailboxes for {{ email }}. Showing the last 10</h3>
   {% elif data.mailbox_count > 0 %}
     <h3>Found {{ data.mailbox_count }} mailbox(es) for {{ email }}</h3>

app/templates/dashboard/billing.html

@@ -43,7 +43,7 @@
           You can change the plan at any moment.
           <br />
           Please note that the new billing cycle starts instantly
-          i.e. you will be charged <b>immediately</b> the annual fee ($30) when switching from monthly plan or vice-versa
+          i.e. you will be charged <b>immediately</b> the annual fee ($36) when switching from monthly plan or vice-versa
           <b>without pro rata computation </b>.
           <br />
           To change the plan you can also cancel the current one and subscribe a new one <b>by the end</b> of this plan.

app/templates/dashboard/custom_domain.html

@@ -94,4 +94,3 @@
     </div>
   </div>
 {% endblock %}
-

app/templates/dashboard/domain_detail/dns.html

@@ -91,7 +91,6 @@
           <br />
           Some domain registrars (Namecheap, CloudFlare, etc) might also use <em>@</em> for the root domain.
         </div>
-
         {% for record in expected_mx_records %}
 
           <div class="mb-3 p-3 dns-record">
@@ -108,7 +107,6 @@
      data-clipboard-text="{{ record.domain }}">{{ record.domain }}</em>
           </div>
         {% endfor %}
-
         <form method="post" action="#mx-form">
           {{ csrf_form.csrf_token }}
           <input type="hidden" name="form-name" value="check-mx">

app/templates/dashboard/enter_sudo.html

@@ -22,7 +22,8 @@
           <p>Alternatively you can use your Proton credentials to ensure it's you.</p>
         </div>
         <a class="btn btn-primary btn-block mt-2 proton-button"
-           href="{{ url_for('auth.proton_login', next=next) }}" style="max-width: 400px">
+           href="{{ url_for('auth.proton_login', next=next) }}"
+           style="max-width: 400px">
           <img class="mr-2" src="/static/images/proton.svg" />
           Authenticate with Proton
         </a>

app/templates/dashboard/extend_subscription.html

@@ -11,7 +11,7 @@
       <div>
         <a class="buy-with-crypto"
            data-custom="{{ current_user.id }}"
-           href="{{ coinbase_url }}">Extend for 1 year - $30</a>
+           href="{{ coinbase_url }}">Extend for 1 year - $36</a>
         <script src="https://commerce.coinbase.com/v1/checkout.js?version=201807"></script>
       </div>
       <div class="mt-2">

app/templates/dashboard/pricing.html

@@ -77,6 +77,11 @@
     <div class="text-center mx-md-auto mb-8 mt-6">
       <h1>Upgrade to unlock premium features</h1>
     </div>
+    <div class="alert alert-info">
+      <span class="badge badge-success">new</span> SimpleLogin Premium now includes Proton Pass premium features.
+      <a href="https://simplelogin.io/blog/sl-premium-including-pass-plus/"
+         target="_blank">Learn more ↗</a>
+    </div>
     {% if manual_sub %}
 
       <div class="alert alert-info mt-0 mb-6">
@@ -306,7 +311,7 @@
               <div class="card-body">
                 <div class="text-center">
                   <div class="h3">SimpleLogin Premium</div>
-                  <div class="h3 my-3">$30 / year</div>
+                  <div class="h3 my-3">$36 / year</div>
                   <div class="text-center mt-4 mb-6">
                     <button class="btn btn-primary btn-lg w-100"
                             onclick="upgradePaddle({{ PADDLE_YEARLY_PRODUCT_ID }})">Upgrade to Premium</button>
@@ -471,7 +476,7 @@
                    rel="noopener noreferrer">
                   Upgrade to Premium - cryptocurrency
                   <br />
-                  $30 / year
+                  $36 / year
                   <i class="fe fe-external-link"></i>
                 </a>
               </div>