Remove legacy header, remaining aliases count, move action button to …

…the filter bar
mozilla · Jul 6, 2021 · ddab70c · ddab70c
1 parent 45affdb
commit ddab70c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 73 deletions.
diff --git a/privaterelay/locales/en-US/app.ftl b/privaterelay/locales/en-US/app.ftl
@@ -135,7 +135,6 @@ faq-question-7-answer = We now support attachment forwarding. However, there is
 # Variables:
 #   $email (string) - User email address
 profile-label-welcome-html = <span>Welcome,</span> { $email }!
-profile-headline-manage-relay = Manage your { -brand-name-relay } aliases
 profile-headline-manage-domain = Manage your domain aliases
 profile-supports-email-forwarding = { -brand-name-firefox-relay } supports email forwarding (including attachments) of email up to { email-size-limit } in size
 profile-promo-upgrade-headline = Upgrade for even more features.
@@ -212,17 +211,6 @@ banner-choose-subdomain-label = Your domain is:
 # $subdomain (url) - User-set subdomain
 banner-choose-subdomain-label = You can make up any address @{ $subdomain }
 
-
-remaining-aliases-promo-label = { $number -> 
-    [one] { $number } remaining alias
-   *[other] { $number } remaining aliases
-}
-
-remaining-aliases-promo-label-unlimited = { $number -> 
-    [one] { $number } alias. You can make unlimited!
-   *[other] { $number } aliases. You can make unlimited!
-}
-
 remaining-aliases-cta = Buy unlimited aliases
 onboarding-headline = Three ways to create an alias
 onboarding-tip-1 = Right here - just select the button in the upper right corner

diff --git a/privaterelay/templates/includes/dashboard-filter.html b/privaterelay/templates/includes/dashboard-filter.html
@@ -24,5 +24,36 @@
     </div>
     <div class="c-filter-action">
         <!-- Button -->
+        <form action="/emails/" class="dash-create" method="POST">
+            <input type="hidden" name="api_token" value="{{ user_profile.api_token }}">
+            {% if user_profile.at_max_free_aliases and not user_profile.has_unlimited %}
+            <a
+                href="{{ settings.FXA_SUBSCRIPTIONS_URL }}/products/{{ settings.PREMIUM_PROD_ID }}?plan={{ settings.PREMIUM_PRICE_ID }}"
+                target="_blank"
+                rel="noopener noreferrer""
+                class="btn btn-blue--ghost"
+                data-event-label="Upgrade"
+            >
+              <span class="generate-new-alias-text">
+                {% ftlmsg 'profile-label-upgrade' %}
+              </span>
+            </a>
+
+            {% else %}
+            <button
+                class="blue-btn-states dash-create-new-relay flx al-cntr jst-cntr"
+                title="Generate new alias"
+                type="submit"
+                value="Generate new alias"
+                data-event-label="Create New Relay Alias"
+            >
+              <span class="generate-new-relay-icon"></span>
+              <span class="generate-new-alias-text">
+              {% ftlmsg 'profile-label-generate-new-alias' %}</span>
+            </button>
+            {% endif %}
+
+
+          </form>
     </div>
 </div>
diff --git a/privaterelay/templates/includes/remaining-aliases.html b/privaterelay/templates/includes/remaining-aliases.html
diff --git a/privaterelay/templates/profile.html b/privaterelay/templates/profile.html
@@ -67,48 +67,6 @@
         </div>
         {% endif %}
         {% include "includes/banners.html" %}
-        <div class="flx flx-row dashboard-header inset">
-          <h2 class="section-headline dashboard-headline">{% ftlmsg 'profile-headline-manage-relay' %}</h2>
-          <div class="remaining-aliases-wrapper flx al-cntr jst-cntr hide-750">
-            {% include "includes/remaining-aliases.html" %}
-          </div>
-        </div>
-        <div class="flx flx-row flx-end inset wrap-col-600">
-          <div class="show-750 flx al-cntr">
-            {% include "includes/remaining-aliases.html" %}
-          </div>
-          <form action="/emails/" class="dash-create" method="POST">
-            <input type="hidden" name="api_token" value="{{ user_profile.api_token }}">
-            {% if user_profile.at_max_free_aliases and not user_profile.has_unlimited %}
-            <a
-                href="{{ settings.FXA_SUBSCRIPTIONS_URL }}/products/{{ settings.PREMIUM_PROD_ID }}?plan={{ settings.PREMIUM_PRICE_ID }}"
-                target="_blank"
-                rel="noopener noreferrer""
-                class="btn btn-blue--ghost"
-                data-event-label="Upgrade"
-            >
-              <span class="generate-new-alias-text">
-                {% ftlmsg 'profile-label-upgrade' %}
-              </span>
-            </a>
-
-            {% else %}
-            <button
-                class="blue-btn-states dash-create-new-relay flx al-cntr jst-cntr"
-                title="Generate new alias"
-                type="submit"
-                value="Generate new alias"
-                data-event-label="Create New Relay Alias"
-            >
-              <span class="generate-new-relay-icon"></span>
-              <span class="generate-new-alias-text">
-              {% ftlmsg 'profile-label-generate-new-alias' %}</span>
-            </button>
-            {% endif %}
-
-
-          </form>
-        </div>
 
         {% if relay_addresses|length == 0 %}
           {% include "includes/dashboard_onboarding.html" %}

diff --git a/static/scss/partials/main.scss b/static/scss/partials/main.scss
@@ -1174,8 +1174,6 @@ input.input-has-error {
 
 .relay-email {
   --emailCardPadding: 16px;
-
-  margin-top: 48px;
 }
 
 .card-top-row {