-
Notifications
You must be signed in to change notification settings - Fork 153
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into issue-11795-hero-gap
- Loading branch information
Showing
21 changed files
with
549 additions
and
300 deletions.
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
network-api/networkapi/templates/fragments/buyersguide/pni_category_nav.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
network-api/networkapi/templates/fragments/buyersguide/submit_a_product.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
{% load i18n %} | ||
|
||
<a href="https://mozillafoundation.typeform.com/to/oWfci8Ee" target="_blank" class="tw-font-sans tw-text-blue-80 tw-underline tw-decoration-blue-80">{% trans "Submit a product here." %}</a> | ||
<a href="https://mozillafoundation.tfaforms.net/34" target="_blank" class="tw-font-sans tw-text-blue-80 tw-underline tw-decoration-blue-80">{% trans "Submit a product here." %}</a> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
network-api/networkapi/templates/previews/buyersguide/category_nav.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "pages/buyersguide/catalog.html" %} | ||
{% load wagtailcore_tags %} | ||
|
||
{% block body_id %}home{% endblock body_id %} | ||
|
||
{% block category_nav %} | ||
{% include "fragments/buyersguide/pni_category_nav.html" with show_all_reviews_as_active_category=True current_category=current_category %} | ||
{% endblock category_nav %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
network-api/networkapi/wagtailpages/migrations/0124_buyersguidecategorynav_and_more.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
# Generated by Django 4.2.9 on 2024-02-09 20:24 | ||
|
||
import django.db.models.deletion | ||
import modelcluster.fields | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
("wagtailpages", "0123_alter_petition_show_comment_field_and_more"), | ||
] | ||
|
||
operations = [ | ||
migrations.CreateModel( | ||
name="BuyersGuideCategoryNav", | ||
fields=[ | ||
("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), | ||
], | ||
options={ | ||
"verbose_name": "*PNI categories navbar", | ||
"verbose_name_plural": "*PNI categories navbar", | ||
}, | ||
), | ||
migrations.AlterModelOptions( | ||
name="buyersguideproductcategory", | ||
options={ | ||
"ordering": [models.OrderBy(models.F("parent__name"), nulls_first=True), "name"], | ||
"verbose_name": "Buyers Guide Product Category", | ||
"verbose_name_plural": "Buyers Guide Product Categories", | ||
}, | ||
), | ||
migrations.RemoveField( | ||
model_name="buyersguideproductcategory", | ||
name="sort_order", | ||
), | ||
migrations.CreateModel( | ||
name="BuyersGuideCategoryNavRelation", | ||
fields=[ | ||
("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), | ||
("sort_order", models.IntegerField(blank=True, editable=False, null=True)), | ||
( | ||
"category", | ||
models.ForeignKey( | ||
on_delete=django.db.models.deletion.CASCADE, | ||
related_name="nav_relations", | ||
to="wagtailpages.buyersguideproductcategory", | ||
), | ||
), | ||
( | ||
"nav", | ||
modelcluster.fields.ParentalKey( | ||
on_delete=django.db.models.deletion.CASCADE, | ||
related_name="category_relations", | ||
to="wagtailpages.buyersguidecategorynav", | ||
), | ||
), | ||
], | ||
options={ | ||
"verbose_name": "Category Navigation Relation", | ||
"verbose_name_plural": "Category Navigation Relations", | ||
"ordering": ["sort_order"], | ||
"unique_together": {("nav", "category")}, | ||
}, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.