Add products to product list page (#14407)

* Add products to product list page - add MDN Plus, Fakespot, and Thunderbird - add corresponding strings and remove obsolete ones - move MDN Plus logo from privacy folder to generic folder * (fix) remove old images * (fix) use existing thunderbird logo, line up logos * (fix) revert changes to relay logo * (fix) remove logo component css * (fix) use universal import for picto * Update l10n/en/firefox/products.ftl (fix) match fakespot punctuation to pocket Co-authored-by: Jan Brasna <1784648+janbrasna@users.noreply.github.com> * (fix) referrals and string fallback * (fix) button icon * (fix) add download icon to thunderbird CTA * (fix) svgs * (fix) dl icon to dl button --------- Co-authored-by: Jan Brasna <1784648+janbrasna@users.noreply.github.com>
mozilla · May 1, 2024 · 0670fac · 0670fac
1 parent c9999ed
commit 0670fac
Show file tree

Hide file tree

Showing 26 changed files with 276 additions and 602 deletions.
diff --git a/bedrock/firefox/templates/firefox/privacy/products.html b/bedrock/firefox/templates/firefox/privacy/products.html
@@ -148,27 +148,19 @@ <h3 class="privacy-products-hero-sub-title">
       image=resp_img('img/firefox/privacy/products/monitor.svg', optional_attributes={ 'class': 'mzp-c-split-media-asset'}),
       media_class='mzp-l-split-h-center'
     ) %}
-      {% set mozilla_monitor = switch('mozilla-monitor-brand-name') %}
-      <div class="mzp-c-wordmark mzp-t-wordmark-md {% if mozilla_monitor %}t-product-mozilla-monitor{% else %}mzp-t-product-monitor{% endif %}">
+
+      <div class="mzp-c-wordmark mzp-t-wordmark-md t-product-mozilla-monitor">
         <h2>
-          {% if mozilla_monitor %}
-            {{ ftl('firefox-privacy-hub-mozilla-monitor', fallback='firefox-privacy-hub-firefox-monitor') }}
-          {% else %}
-            {{ ftl('firefox-privacy-hub-firefox-monitor') }}
-          {% endif %}
+          {{ ftl('firefox-privacy-hub-mozilla-monitor') }}
         </h2>
       </div>
       <p>
-        {% if mozilla_monitor %}
           {% if LANG == 'en-US' %}
             When you enter your email address in Mozilla Monitor, we forget it immediately after we’ve checked to see where your
             personal details have been exposed — unless you authorize us to continue monitoring your info for future exposures.
           {% else %}
-            {{ ftl('firefox-privacy-hub-when-you-enter-your-email-v2', fallback='firefox-privacy-hub-when-you-enter-your-email') }}
+            {{ ftl('firefox-privacy-hub-when-you-enter-your-email-v2') }}
           {% endif %}
-        {% else %}
-          {{ ftl('firefox-privacy-hub-when-you-enter-your-email') }}
-        {% endif %}
       </p>
       <p>
         <a class="mzp-c-cta-link" href="https://monitor.mozilla.org/?utm_source={{ _entrypoint }}&utm_medium=referral&utm_campaign={{ _utm_campaign }}&entrypoint={{ _entrypoint }}" data-cta-type="fxa-monitor" data-cta-text="Check for breaches" data-cta-position="secondary">

diff --git a/bedrock/firefox/templates/firefox/welcome/page1.html b/bedrock/firefox/templates/firefox/welcome/page1.html
@@ -8,14 +8,8 @@
 
 {% extends "firefox/welcome/base.html" %}
 
-{% set mozilla_monitor = switch('mozilla-monitor-brand-name') %}
-
 {%- block page_title -%}
-  {%- if mozilla_monitor -%}
-    {{ ftl('welcome-page1-more-than-a-browser-mozilla', fallback='welcome-page1-more-than-a-browser-firefox') }}
-  {%- else -%}
-    {{ ftl('welcome-page1-more-than-a-browser-firefox') }}
-  {%- endif -%}
+    {{ ftl('welcome-page1-more-than-a-browser-mozilla') }}
 {%- endblock -%}
 
 {% block page_desc %}{{ ftl('welcome-page1-take-the-next-step-to-protect') }}{% endblock %}
@@ -33,7 +27,7 @@
 {% set _utm_campaign = 'welcome-1-monitor' %}
 {% set _cta_type = 'lifecycle-monitor' %}
 
-{% set hero_title = ftl('welcome-page1-stay-ahead-of-hackers-check-v2', fallback='welcome-page1-stay-ahead-of-hackers-check') if mozilla_monitor else ftl('welcome-page1-stay-ahead-of-hackers-check') %}
+{% set hero_title = ftl('welcome-page1-stay-ahead-of-hackers-check-v2')%}
 
 {% set _utm_content = 'stay-ahead-hackers' %}
 
@@ -62,20 +56,12 @@
 {% block content_primary %}
 <div class="body-primary">
   <h2 class="body-primary-title">
-    {% if mozilla_monitor %}
-      <img src="{{ static('img/logos/mozilla/monitor/wordmark.svg') }}" width="256" height="" alt="{{ ftl('welcome-page1-mozilla-monitor') }}">
-    {% else %}
-      <img src="{{ static('protocol/img/logos/firefox/monitor/logo-word-hor.svg') }}" width="256" height="" alt="{{ ftl('welcome-page1-firefox-monitor') }}">
-    {% endif %}
+    <img src="{{ static('img/logos/mozilla/monitor/wordmark.svg') }}" width="256" height="" alt="{{ ftl('welcome-page1-mozilla-monitor') }}">
   </h2>
 
   <div class="body-primary-body">
     <p>
-      {% if mozilla_monitor %}
-        {{ ftl('welcome-page1-mozilla-monitor-shows-you', fallback='welcome-page1-firefox-monitor-shows-you') }}
-      {% else %}
-        {{ ftl('welcome-page1-firefox-monitor-shows-you') }}
-      {% endif %}
+      {{ ftl('welcome-page1-mozilla-monitor-shows-you') }}
     </p>
   </div>
 </div>

diff --git a/bedrock/firefox/templates/firefox/welcome/page7.html b/bedrock/firefox/templates/firefox/welcome/page7.html
@@ -116,29 +116,20 @@ <h3 class="c-picto-block-title">
         {% endif %}
       </h3>
       <div class="c-picto-block-body">
-        {% set mozilla_monitor = switch('mozilla-monitor-brand-name') %}
         <p>
-          {% if mozilla_monitor %}
             {% if LANG == "en-US" %}
               Mozilla Monitor lets you see if you’ve been part of a data breach. And if you have, it automatically gets your private info back for you and continually monitors your identity for new leaks.
             {% else %}
-              {{ ftl('page7-firefox-monitor-lets-you-find-v2', fallback='page7-firefox-monitor-lets-you-find') }}
+              {{ ftl('page7-firefox-monitor-lets-you-find-v2')}}
             {% endif %}
-          {% else %}
-            {{ ftl('page7-firefox-monitor-lets-you-find') }}
-          {% endif %}
         </p>
         <a href="https://monitor.mozilla.org/?utm_source={{ _entrypoint }}&utm_medium=referral&utm_campaign={{ _utm_campaign }}&entrypoint={{ _entrypoint }}">
           <strong>
-            {% if mozilla_monitor %}
               {% if LANG == "en-US" %}
                 Check for breaches now
               {% else %}
-                {{ ftl('page7-get-mozilla-monitor', fallback='page7-get-firefox-monitor') }}
+                {{ ftl('page7-get-mozilla-monitor') }}
               {% endif %}
-            {% else %}
-              {{ ftl('page7-get-firefox-monitor') }}
-            {% endif %}
           </strong>
         </a>
       </div>

diff --git a/bedrock/firefox/templates/firefox/welcome/page8.html b/bedrock/firefox/templates/firefox/welcome/page8.html
@@ -57,13 +57,9 @@ <h3 class="c-picto-block-title">{{ ftl('welcome-page8-enhanced-tracking-protecti
       <div class="c-picto-block-image">
         <img src="{{ static('protocol/img/logos/firefox/monitor/logo.svg') }}" width="48px" alt="">
       </div>
-      {% set mozilla_monitor = switch('mozilla-monitor-brand-name') %}
+
       <h3 class="c-picto-block-title">
-        {% if mozilla_monitor %}
-          {{ ftl('welcome-page8-mozilla-monitor', fallback='welcome-page8-firefox-monitor') }}
-        {% else %}
-          {{ ftl('welcome-page8-firefox-monitor') }}
-        {% endif %}
+          {{ ftl('welcome-page8-mozilla-monitor')}}
       </h3>
       <div class="c-picto-block-body">
       {% if LANG == "en-US" %}

diff --git a/bedrock/privacy/templates/privacy/notices/mdn-plus.html b/bedrock/privacy/templates/privacy/notices/mdn-plus.html
@@ -7,4 +7,4 @@
 {% extends "privacy/notices/base-notice-headings.html" %}
 
 {% set body_id = "mdn-plus" %}
-{% block article_header_logo %}{{ static('img/privacy/icon-mdn-plus.svg') }}{% endblock %}
+{% block article_header_logo %}{{ static('img/logos/mdn/mdn-plus-logo.svg') }}{% endblock %}