Fix various minor issues (#11960)

* enlarged nav dropdown's vertical gap to 16px * adjusted PNI category dropdown button font size * capitalized all instances of lowercase *PNI * Made spacer available on ArticlePage * forgot to add migration file * fix migrations * fixed migrations & updated PNI ding images * updated english version of PNI ding
MozillaFoundation · Mar 9, 2024 · 18baf92 · 18baf92
1 parent e5343c2
commit 18baf92
Show file tree

Hide file tree

Showing 25 changed files with 861 additions and 33 deletions.
diff --git a/network-api/networkapi/templates/fragments/buyersguide/category_dropdown.html b/network-api/networkapi/templates/fragments/buyersguide/category_dropdown.html
@@ -10,7 +10,7 @@
                tw-mr-auto
                tw-font-sans
                tw-font-bold
-               tw-text-sm
+               tw-text-[15px]
                tw-group
                hover:tw-text-black
                tw-text-gray-40

diff --git a/network-api/networkapi/templates/fragments/buyersguide/item.html b/network-api/networkapi/templates/fragments/buyersguide/item.html
@@ -18,8 +18,8 @@
         {% if product.privacy_ding %}
             <img
                 src="{% static "_images/buyers-guide/icon-privacy-ding-mini.svg" %}"
-                title="{% trans "*privacy not included with this product" %}"
-                alt="{% trans "*privacy not included with this product" %}"
+                title="{% trans "*Privacy Not Included with this product" %}"
+                alt="{% trans "*Privacy Not Included with this product" %}"
                 width="24"
             >
         {% endif %}

diff --git a/network-api/networkapi/templates/fragments/buyersguide/pni_newsletter_box.html b/network-api/networkapi/templates/fragments/buyersguide/pni_newsletter_box.html
@@ -4,8 +4,8 @@
     <img
         class="tw-absolute tw-right-0 tw-top-0 tw-hidden large:tw-block"
         src="{% static "_images/buyers-guide/asterisk.svg" %}"
-        title="{% trans "*privacy not included" %}"
-        alt="{% trans "*privacy not included" %}"
+        title="{% trans "*Privacy Not Included" %}"
+        alt="{% trans "*Privacy Not Included" %}"
     >
     <div class="newsletter-signup-module"
          data-module-type="default"

diff --git a/network-api/networkapi/templates/fragments/buyersguide/privacy_ding.html b/network-api/networkapi/templates/fragments/buyersguide/privacy_ding.html
@@ -4,7 +4,7 @@
     <img
         class="privacy-ding"
         src="{% static "_images/buyers-guide/icon-privacy-ding-mini.svg" %}"
-        title="{% trans "*privacy not included" %}"
-        alt="{% trans "*privacy not included" %}"
+        title="{% trans "*Privacy Not Included" %}"
+        alt="{% trans "*Privacy Not Included" %}"
     >
 {% endif %}
diff --git a/network-api/networkapi/templates/pages/buyersguide/about/press.html b/network-api/networkapi/templates/pages/buyersguide/about/press.html
@@ -181,7 +181,7 @@ <h3>
         <div class="feature-quote my-4 py-2">
             <h3>
                 {% blocktrans trimmed %}
-                    Here’s a warning that should be on some of the items on your holiday shopping list—privacy not included. That’s the
+                    Here’s a warning that should be on some of the items on your holiday shopping list—*Privacy Not Included. That’s the
                     point of a shopping guide put out by the Mozilla Foundation.
                 {% endblocktrans %}
             </h3>

diff --git a/network-api/networkapi/templates/pages/buyersguide/base.html b/network-api/networkapi/templates/pages/buyersguide/base.html
@@ -7,7 +7,7 @@
 {% block page_title %}
     {% environment_prefix %}
     {% if pageTitle %}{{ pageTitle }}
-    {% else %}{% blocktrans context "“*privacy not included” can be localized. This is a reference to the “*batteries not included” mention on toys." %}*privacy not included | Shop smart and safe{% endblocktrans %} | Mozilla Foundation{% endif %}
+    {% else %}{% blocktrans context "“*Privacy Not Included” can be localized. This is a reference to the “*batteries not included” mention on toys." %}*Privacy Not Included | Shop smart and safe{% endblocktrans %} | Mozilla Foundation{% endif %}
 {% endblock %}
 
 {# TODO: consider using a different ga_identifier? #}
@@ -23,7 +23,7 @@
 
 {% block wagtail_metadata %}
     {% meta_tags %}
-    <meta name="pni-home-title" content="{% blocktrans context "“*privacy not included” can be localized. This is a reference to the “*batteries not included” mention on toys." %}*privacy not included | Shop smart and safe | Mozilla Foundation{% endblocktrans %}">
+    <meta name="pni-home-title" content="{% blocktrans context "“*Privacy Not Included” can be localized. This is a reference to the “*batteries not included” mention on toys." %}*Privacy Not Included | Shop smart and safe | Mozilla Foundation{% endblocktrans %}">
     <meta name="pni-category-title" content="{% trans "Privacy & Security Guide | Mozilla Foundation" %}">
 {% endblock %}
 

diff --git a/network-api/networkapi/templates/pages/buyersguide/catalog.html b/network-api/networkapi/templates/pages/buyersguide/catalog.html
@@ -92,7 +92,7 @@
                         <span id="product-filter-pni" class="tw-flex tw-cursor-pointer tw-text-gray-60 border tw-border-gray-20 tw-px-4 tw-py-2 tw-font-sans tw-rounded-3xl tw-font-normal tw-text-[12px] tw-leading-[1.3] tw-bg-white hover:tw-border-blue-10 hover:tw-bg-blue-10">
                             <input type="checkbox" id="product-filter-pni-toggle">
                             <span class="pni-icon tw-mr-2">&nbsp;</span>
-                            <label for="product-filter-pni-toggle" class="tw-flex tw-m-0 tw-w-max" title="{% trans '*privacy not included with this product' %}">{% trans "privacy not included" %} </label>
+                            <label for="product-filter-pni-toggle" class="tw-flex tw-m-0 tw-w-max" title="{% trans '*Privacy Not Included with this product' %}">{% trans "*Privacy Not Included" %} </label>
                         </span>
 
                         {% for cat in categories %}

diff --git a/network-api/networkapi/templates/pages/buyersguide/contest.html b/network-api/networkapi/templates/pages/buyersguide/contest.html
@@ -55,7 +55,7 @@ <h1 class="tw-h2-heading mt-5">Contest Rules</h1>
                         </li>
                         <li>
                             Tweet your song with the hashtag #PrivacyNotIncluded and mention @mozilla (the <strong>“Tweet”</strong>), or reply
-                            with the song to the Instagram post marked “*privacy not included competition" (the <strong>“Instagram Post”</strong>)
+                            with the song to the Instagram post marked “*Privacy Not Included competition" (the <strong>“Instagram Post”</strong>)
                         </li>
                         <li>
                             Prizes will be awarded for most creepy, least creepy, and funniest entries. See prize details in point 6 below.
@@ -66,7 +66,7 @@ <h1 class="tw-h2-heading mt-5">Contest Rules</h1>
                     </p>
                     <p>
                         Your Tweet with the song hashtag #PrivacyNotIncluded and mention of @mozilla, or your song posted in reply to our Instagram post marked
-                        “*privacy not included competition" will constitute your entry into this Contest (the <strong>“Entry”</strong>).
+                        “*Privacy Not Included competition" will constitute your entry into this Contest (the <strong>“Entry”</strong>).
                     </p>
                     <p>
                         If you do not have a Twitter or Instagram account, you can visit <a href="https://twitter.com" target="_blank" rel="noopener noreferrer" aria-label="https://twitter.com (opens in a new tab)">https://twitter.com</a> or

diff --git a/network-api/networkapi/templates/pages/buyersguide/product_page.html b/network-api/networkapi/templates/pages/buyersguide/product_page.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block head_extra %}
-    <meta property="og:title" content="{% blocktrans context "This can be localized. This is a reference to the “*batteries not included” mention on toys." %}privacy not included - {{ product.title }}{% endblocktrans %}" />
+    <meta property="og:title" content="{% blocktrans context "This can be localized. This is a reference to the “*batteries not included” mention on toys." %}*Privacy Not Included - {{ product.title }}{% endblocktrans %}" />
 {% endblock %}
 
 {% block social_image %}
@@ -51,7 +51,7 @@
 
                 {% if product.privacy_ding %}
                     <div class="privacy-ding-band tw-px-8 medium:tw-px-16 ">
-                        <p class="pni-product-smaller-body mb-0 py-2">{% blocktrans %}<strong>Warning</strong>: *privacy not included with this product{% endblocktrans %}</p>
+                        <p class="pni-product-smaller-body mb-0 py-2">{% blocktrans %}<strong>Warning</strong>: *Privacy Not Included with this product{% endblocktrans %}</p>
                     </div>
                 {% endif %}
 

diff --git a/network-api/networkapi/wagtailpages/migrations/0128_capitalize_privacy_not_included.py b/network-api/networkapi/wagtailpages/migrations/0128_capitalize_privacy_not_included.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-03-07 19:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("wagtailpages", "0127_remove_old_url_fields_from_linkblock"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="productpage",
+            name="privacy_ding",
+            field=models.BooleanField(default=False, verbose_name="*Privacy Not Included ding"),
+        ),
+    ]