Merge 212a41a into 71a92e9

reemhamz · Jun 24, 2024 · 1200354 · 1200354
2 parents 71a92e9 + 212a41a
commit 1200354
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 69 deletions.
diff --git a/bedrock/products/templates/products/vpn/base.html b/bedrock/products/templates/products/vpn/base.html
@@ -14,7 +14,7 @@
 {% block page_ios_icon %}{{ static('img/favicons/vpn/favicon.png') }}{% endblock %}
 
 {% block sub_navigation %}
-  {% include 'products/vpn/includes/subnav.html' %}
+  {% include 'products/vpn/includes/subnav-refresh.html' %}
 {% endblock %}
 
 {% block site_css %}

diff --git a/bedrock/products/templates/products/vpn/features.html b/bedrock/products/templates/products/vpn/features.html
@@ -32,10 +32,6 @@
   {% endwith %}
 {% endblock %}
 
-{% block sub_navigation %}
-  {% include 'products/vpn/includes/subnav-refresh.html' %}
-{% endblock %}
-
 {% block content %}
 <main>
   <header class="c-features-main-header mzp-l-content mzp-t-content-xl">

diff --git a/bedrock/products/templates/products/vpn/includes/subnav.html b/bedrock/products/templates/products/vpn/includes/subnav.html
diff --git a/bedrock/products/templates/products/vpn/landing-refresh.html b/bedrock/products/templates/products/vpn/landing-refresh.html
@@ -51,10 +51,6 @@
   {% endwith %}
 {% endblock %}
 
-{% block sub_navigation %}
-  {% include 'products/vpn/includes/subnav-refresh.html' %}
-{% endblock %}
-
 {% if LANG == "de" %}
   {% set headline_exp_v2_sub = 'Schalte den Rundumschutz für Webaktivitäten und Standort vor Hackern und Trackern ein.' %}
   {% set headline_exp_v3_sub = 'Schütze deine Online-Aktivitäten und deinen Standort mit nur einem Klick.' %}

diff --git a/bedrock/products/templates/products/vpn/landing.html b/bedrock/products/templates/products/vpn/landing.html
@@ -51,10 +51,6 @@
   {% endwith %}
 {% endblock %}
 
-{% block sub_navigation %}
-  {% include 'products/vpn/includes/subnav.html' %}
-{% endblock %}
-
 {% block content %}
 <main {% if show_relay_promo_block %}class="has-relay-promo"{% endif %}>
   {% block hero %}

diff --git a/bedrock/products/templates/products/vpn/pricing-refresh.html b/bedrock/products/templates/products/vpn/pricing-refresh.html
@@ -37,10 +37,6 @@
   {% endwith %}
 {% endblock %}
 
-{% block sub_navigation %}
-  {% include 'products/vpn/includes/subnav-refresh.html' %}
-{% endblock %}
-
 {% block content %}
 <main>
   <section class="mzp-l-content mzp-t-content-xl">

diff --git a/bedrock/products/templates/products/vpn/pricing.html b/bedrock/products/templates/products/vpn/pricing.html
@@ -36,10 +36,6 @@
   {% endwith %}
 {% endblock %}
 
-{% block sub_navigation %}
-  {% include 'products/vpn/includes/subnav.html' %}
-{% endblock %}
-
 {% block content %}
 <main>
   <div class="mzp-l-content mzp-t-content-xl">

diff --git a/bedrock/products/templates/products/vpn/resource-center/landing.html b/bedrock/products/templates/products/vpn/resource-center/landing.html
@@ -43,23 +43,6 @@
     desc=ftl('vpn-resource-center-discover-how-they'),
     class='resource-center-page-header resource-center-hero'
   )}}
-    {# Category component is currently of the scope of this issue, but still stubbed out for use later #}
-
-    {# {% if category_list|length > 1 %}
-    {# <div class="mzp-c-category-list"> #}
-      {# <h2 class="mzp-c-category-list-title"> #}
-        {# <a href="{{ url('products.vpn.resource-center.landing') }}">{{ ftl('vpn-resource-center-view-all') }}</a>
-      </h2>
-      <ul class="mzp-c-category-list-list">
-        {% for category in category_list  %}
-        <li class="mzp-c-category-list-item">
-          {# TODO? if selected_category == category.name, add selected state #}
-          {# <a href="{{category.url}}">{{category.name}}</a> #}
-        {# </li> #}
-        {# {% endfor %} #}
-      {# </ul> #}
-    {# </div> #}
-    {# {% endif %} #}
 
   <div class="mzp-l-card-third resource-center-articles">
     {% for article in first_article_group %}