Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the Wagtail-preview aware cache tag #495

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use the Wagtail-preview aware cache tag #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions wagtailio/navigation/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ def save(self, **kwargs):
fragment_key_seeds = ["primarynav", "footernav"]
keys = [
# The fragment cache varies on:
# the current site pk, whether used in preview, or in the pattern library
make_template_fragment_key(key, vary_on=[self.site.pk, False, False])
RealOrangeOne marked this conversation as resolved.
Show resolved Hide resolved
# the current site pk, whether it is used in the pattern library
make_template_fragment_key(key, vary_on=[self.site.pk, False])
for key in fragment_key_seeds
]
cache.delete_many(keys)
64 changes: 32 additions & 32 deletions wagtailio/project_styleguide/templates/patterns/includes/menu_footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
{% load wagtailcore_tags cache %}
{% load wagtailcore_tags wagtail_cache %}
{% if footer_navigation %}
{% wagtail_site as current_site %}
{% cache 900 footernav current_site.pk request.is_preview is_pattern_library %}
<nav class="footer-menu" aria-label="Footer menu">
<div class="footer-menu__grid grid">
{% for section in footer_navigation.sections %}
{% with section.value as menu_section %}
<div class="footer-menu__column" data-footer-menu-column>
<div class="footer-menu__column-header">
<button class="footer-menu__toggle" aria-label="Open the {{ menu_section.heading }} menu" aria-expanded="false" aria-controls="{{ menu_section.heading|lower }}-menu" data-footer-menu-toggle>
<svg class="footer-menu__icon footer-menu__icon--open" aria-hidden="true" data-footer-menu-open-icon>
<use xlink:href="#plus-in-circle"></use>
</svg>
<svg class="footer-menu__icon footer-menu__icon--close" aria-hidden="true" data-footer-menu-close-icon>
<use xlink:href="#minus-in-circle"></use>
</svg>
{% wagtail_cache 900 footernav current_site.pk is_pattern_library %}
<nav class="footer-menu" aria-label="Footer menu">
<div class="footer-menu__grid grid">
{% for section in footer_navigation.sections %}
{% with section.value as menu_section %}
<div class="footer-menu__column" data-footer-menu-column>
<div class="footer-menu__column-header">
<button class="footer-menu__toggle" aria-label="Open the {{ menu_section.heading }} menu" aria-expanded="false" aria-controls="{{ menu_section.heading|lower }}-menu" data-footer-menu-toggle>
<svg class="footer-menu__icon footer-menu__icon--open" aria-hidden="true" data-footer-menu-open-icon>
<use xlink:href="#plus-in-circle"></use>
</svg>
<svg class="footer-menu__icon footer-menu__icon--close" aria-hidden="true" data-footer-menu-close-icon>
<use xlink:href="#minus-in-circle"></use>
</svg>

<span class="footer-menu__column-heading footer-menu__column-heading--collapsible">{{ menu_section.heading }}</span>
</button>
<span class="footer-menu__column-heading footer-menu__column-heading--collapsible">{{ menu_section.heading }}</span>
</button>

<p class="footer-menu__column-heading">{{ menu_section.heading }}</p>
</div>

<ul class="footer-menu__list" id="{{ menu_section.heading|lower }}-menu" data-footer-menu-list>
{% for menu_item in menu_section.links %}
<li class="footer-menu__item">
<a class="footer-menu__link" href="{% if menu_item.cta_url %}{{ menu_item.cta_url }}{% elif menu_item.cta_page %}{% pageurl menu_item.cta_page %}{% endif %}">{{ menu_item.text }}</a>
</li>
{% endfor %}
</ul>
<p class="footer-menu__column-heading">{{ menu_section.heading }}</p>
</div>
{% endwith %}
{% endfor %}
</div>
</nav>
{% endcache %}

<ul class="footer-menu__list" id="{{ menu_section.heading|lower }}-menu" data-footer-menu-list>
{% for menu_item in menu_section.links %}
<li class="footer-menu__item">
<a class="footer-menu__link" href="{% if menu_item.cta_url %}{{ menu_item.cta_url }}{% elif menu_item.cta_page %}{% pageurl menu_item.cta_page %}{% endif %}">{{ menu_item.text }}</a>
</li>
{% endfor %}
</ul>
</div>
{% endwith %}
{% endfor %}
</div>
</nav>
{% endcache %}
{% endif %}
86 changes: 43 additions & 43 deletions wagtailio/project_styleguide/templates/patterns/includes/menu_main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
{% load wagtailcore_tags cache %}
{% load wagtailcore_tags wagtail_cache %}
{% wagtail_site as current_site %}
{% cache 900 primarynav current_site.pk request.is_preview is_pattern_library %}
<nav class="primary-nav" aria-label="Primary">
<ul class="primary-nav__container" data-primary-nav>
{% for menu_section in menus %}
<li class="primary-nav__item primary-nav__item--is-parent" data-has-subnav>
<button class="primary-nav__item-container" data-open-subnav aria-expanded="false">
<span class="primary-nav__label">{{ menu_section.name }}</span>
<svg class="primary-nav__icon" aria-hidden="true">
<use xlink:href="#chevron" />
</svg>
</button>
<ul class="sub-nav" data-subnav>
<li class="sub-nav__item sub-nav__item--back">
<button class="sub-nav__item-link sub-nav__item-link--back" data-subnav-back>&lsaquo; Back</button>
</li>
<li class="sub-nav__links">
<h2 class="sub-nav__heading">{{ menu_section.name }}</h2>
<ul class="sub-nav__links-container">
{% for nav_item in menu_section.nav_items %}
<li class="sub-nav__item">
<a class="sub-nav__item-link" href="{% if nav_item.cta_url %}{{ nav_item.cta_url }}{% elif nav_item.cta_page %}{% pageurl nav_item.cta_page %}{% endif %}">
{% include "patterns/components/icon/icon.html" with icon=nav_item.icon classes="icon-link__svg sub-nav__item-icon icon--relative" %}
<div class="sub-nav__item-content">
<h3 class="sub-nav__item-heading">{{ nav_item.text }}</h3>
<span class="u-sr-only">-</span>
<p class="sub-nav__item-description">{{ nav_item.short_description }}</p>
</div>
</a>
</li>
{% endfor %}
</ul>
</li>
<li class="sub-nav__item sub-nav__item--cta">
{% with menu_section.call_to_action as cta %}
{% include "patterns/components/nav-cta/nav-cta.html" %}
{% endwith %}
</li>
</ul>
</li>
{% endfor %}
</ul>
</nav>
{% wagtailcache 900 primarynav current_site.pk is_pattern_library %}
<nav class="primary-nav" aria-label="Primary">
<ul class="primary-nav__container" data-primary-nav>
{% for menu_section in menus %}
<li class="primary-nav__item primary-nav__item--is-parent" data-has-subnav>
<button class="primary-nav__item-container" data-open-subnav aria-expanded="false">
<span class="primary-nav__label">{{ menu_section.name }}</span>
<svg class="primary-nav__icon" aria-hidden="true">
<use xlink:href="#chevron" />
</svg>
</button>
<ul class="sub-nav" data-subnav>
<li class="sub-nav__item sub-nav__item--back">
<button class="sub-nav__item-link sub-nav__item-link--back" data-subnav-back>&lsaquo; Back</button>
</li>
<li class="sub-nav__links">
<h2 class="sub-nav__heading">{{ menu_section.name }}</h2>
<ul class="sub-nav__links-container">
{% for nav_item in menu_section.nav_items %}
<li class="sub-nav__item">
<a class="sub-nav__item-link" href="{% if nav_item.cta_url %}{{ nav_item.cta_url }}{% elif nav_item.cta_page %}{% pageurl nav_item.cta_page %}{% endif %}">
{% include "patterns/components/icon/icon.html" with icon=nav_item.icon classes="icon-link__svg sub-nav__item-icon icon--relative" %}
<div class="sub-nav__item-content">
<h3 class="sub-nav__item-heading">{{ nav_item.text }}</h3>
<span class="u-sr-only">-</span>
<p class="sub-nav__item-description">{{ nav_item.short_description }}</p>
</div>
</a>
</li>
{% endfor %}
</ul>
</li>
<li class="sub-nav__item sub-nav__item--cta">
{% with menu_section.call_to_action as cta %}
{% include "patterns/components/nav-cta/nav-cta.html" %}
{% endwith %}
</li>
</ul>
</li>
{% endfor %}
</ul>
</nav>
{% endcache %}