diff --git a/bakerydemo/templates/blocks/captioned_image_block.html b/bakerydemo/templates/blocks/captioned_image_block.html index 092ddb662..c9318df8f 100644 --- a/bakerydemo/templates/blocks/captioned_image_block.html +++ b/bakerydemo/templates/blocks/captioned_image_block.html @@ -1,6 +1,7 @@ {% load wagtailimages_tags %}
- {% picture self.image format-{avif,webp,jpeg} fill-{400x220,600x338} sizes="(max-width: 768px) 200px, 900px" loading="lazy" %} + {% picture self.image format-{avif,webp,jpeg} fill-{400x220,600x338} sizes="(max-width: 768px) 200px, 900px" + loading="lazy" alt="{{ self.image.title }}" %}
{{ self.caption }} - {{ self.attribution }}
-
+ \ No newline at end of file diff --git a/bakerydemo/templates/blog/blog_page.html b/bakerydemo/templates/blog/blog_page.html index 0254ed7c9..8d2a35ea1 100644 --- a/bakerydemo/templates/blog/blog_page.html +++ b/bakerydemo/templates/blog/blog_page.html @@ -3,34 +3,35 @@ {% block content %} - {% include "base/include/header-blog.html" %} +{% include "base/include/header-blog.html" %} -
-
-
-
- {% if page.authors %} -
- {% for author in page.authors %} -
{% picture author.image format-{avif,webp,jpeg} fill-50x50-c100 class="blog__avatar" %} - {{ author.first_name }} {{ author.last_name }}
- {% endfor %} -
- {% endif %} +
+
+
+
+ {% if page.authors %} +
+ {% for author in page.authors %} +
{% picture author.image format-{avif,webp,jpeg} fill-50x50-c100 + class="blog__avatar" alt="{{ author.first_name }} {{ author.last_name }}" %} + {{ author.first_name }} {{ author.last_name }}
+ {% endfor %}
+ {% endif %} +
- {{ page.body }} + {{ page.body }} - {% if page.get_tags %} -

Find more blog posts with similar tags

-
- Filter blog posts by tag - {% for tag in page.get_tags %} - {{ tag }} - {% endfor %} -
- {% endif %} + {% if page.get_tags %} +

Find more blog posts with similar tags

+
+ Filter blog posts by tag + {% for tag in page.get_tags %} + {{ tag }} + {% endfor %}
+ {% endif %}
-{% endblock content %} +
+{% endblock content %} \ No newline at end of file diff --git a/bakerydemo/templates/breads/bread_page.html b/bakerydemo/templates/breads/bread_page.html index 2b44c4ea8..48fa93b0f 100644 --- a/bakerydemo/templates/breads/bread_page.html +++ b/bakerydemo/templates/breads/bread_page.html @@ -2,67 +2,67 @@ {% load wagtailimages_tags %} {% block content %} - {% include "base/include/header-hero.html" %} +{% include "base/include/header-hero.html" %} -
-
-
-
-
- {% if page.introduction %} -

- {{ page.introduction }} -

- {% endif %} +
+
+
+
+
+ {% if page.introduction %} +

+ {{ page.introduction }} +

+ {% endif %} -
- {{ page.body }} -
+
+ {{ page.body }}
+
-
-
-
- {% if page.origin %} -

Origin

-

{{ page.origin }}

- {% endif %} - {% if page.bread_type %} -

Type

-

{{ page.bread_type }}

- {% endif %} - {% with ingredients=page.ordered_ingredients %} - {% if ingredients %} -

Ingredients

-
    - {% for ingredient in ingredients %} -
  • - {% if ingredient.live %} - {# If it's live, show as-is #} - {{ ingredient.name }} - {% else %} - {# EXAMPLE: we can show a placeholder element for instances that are not live #} - - Draft ingredient - - (draft) - {% endif %} -
  • - {% endfor %} -
+
+
+
+ {% if page.origin %} +

Origin

+

{{ page.origin }}

+ {% endif %} + {% if page.bread_type %} +

Type

+

{{ page.bread_type }}

+ {% endif %} + {% with ingredients=page.ordered_ingredients %} + {% if ingredients %} +

Ingredients

+
    + {% for ingredient in ingredients %} +
  • + {% if ingredient.live %} + {# If it's live, show as-is #} + {{ ingredient.name }} + {% else %} + {# EXAMPLE: we can show a placeholder element for instances that are not live #} + + Draft ingredient + + (draft) {% endif %} - {% endwith %} -
+ + {% endfor %} + + {% endif %} + {% endwith %}
+
-
-
- {{ page.body }} -
+
+
+ {{ page.body }}
-{% endblock content %} +
+{% endblock content %} \ No newline at end of file diff --git a/bakerydemo/templates/includes/card/blog-listing-card.html b/bakerydemo/templates/includes/card/blog-listing-card.html index 04eb7da40..0f935584e 100644 --- a/bakerydemo/templates/includes/card/blog-listing-card.html +++ b/bakerydemo/templates/includes/card/blog-listing-card.html @@ -3,26 +3,23 @@ - - - +
\ No newline at end of file diff --git a/bakerydemo/templates/includes/card/listing-card.html b/bakerydemo/templates/includes/card/listing-card.html index 36de3de15..c36ef2be5 100644 --- a/bakerydemo/templates/includes/card/listing-card.html +++ b/bakerydemo/templates/includes/card/listing-card.html @@ -3,32 +3,32 @@ +
\ No newline at end of file diff --git a/bakerydemo/templates/includes/card/picture-card.html b/bakerydemo/templates/includes/card/picture-card.html index c77f39445..54f0a6840 100644 --- a/bakerydemo/templates/includes/card/picture-card.html +++ b/bakerydemo/templates/includes/card/picture-card.html @@ -4,17 +4,19 @@
{% if portrait %} - {% picture page.image format-{avif,webp,jpeg} fill-{250x320-c100,433x487-c100} sizes="(max-width: 768px)125px,400px" loading="lazy" %} + {% picture page.image format-{avif,webp,jpeg} fill-{250x320-c100,433x487-c100} sizes="(max-width: + 768px)125px,400px" loading="lazy" alt="" %} {% else %} - {% picture page.image format-{avif,webp,jpeg} fill-{300x200-c75,645x480-c75} sizes="(max-width: 768px)150px,30vw" loading="lazy" %} + {% picture page.image format-{avif,webp,jpeg} fill-{300x200-c75,645x480-c75} sizes="(max-width: + 768px)150px,30vw" loading="lazy" alt="" %} {% endif %}
{% if portrait %} -

{{ page.title }}

+

{{ page.title }}

{% else %} -

{{ page.title }}

+

{{ page.title }}

{% endif %}
-
+
\ No newline at end of file diff --git a/bakerydemo/templates/includes/header.html b/bakerydemo/templates/includes/header.html index 8c547bcf2..89d635f26 100644 --- a/bakerydemo/templates/includes/header.html +++ b/bakerydemo/templates/includes/header.html @@ -6,34 +6,22 @@
- + \ No newline at end of file diff --git a/bakerydemo/templates/includes/search_form.html b/bakerydemo/templates/includes/search_form.html new file mode 100644 index 000000000..80419a84a --- /dev/null +++ b/bakerydemo/templates/includes/search_form.html @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/bakerydemo/templates/includes/search_icon_svg.html b/bakerydemo/templates/includes/search_icon_svg.html new file mode 100644 index 000000000..9c79e2eec --- /dev/null +++ b/bakerydemo/templates/includes/search_icon_svg.html @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/bakerydemo/templates/search/search_results.html b/bakerydemo/templates/search/search_results.html index c285ab95e..427a2b0e4 100644 --- a/bakerydemo/templates/search/search_results.html +++ b/bakerydemo/templates/search/search_results.html @@ -1,103 +1,111 @@ {% extends "base.html" %} {% load wagtailcore_tags wagtailimages_tags wagtailsearchpromotions_tags %} -{% block title %}Search{% if search_results %} results{% endif %}{% if search_query %} for “{{ search_query }}”{% endif %}{% endblock %} +{% block title %}Search{% if search_results %} results{% endif %}{% if search_query %} for “{{ search_query }}”{% endif +%}{% endblock %} -{% block search_description %}Search{% if search_results %} results{% endif %}{% if search_query %} for “{{ search_query }}”{% endif %}{% endblock %} +{% block search_description %}Search{% if search_results %} results{% endif %}{% if search_query %} for “{{ search_query +}}”{% endif %}{% endblock %} {% block body_class %}template-search-results{% endblock %} {% block content %} -
-
-
-

Search results

- {% if search_results %} -

You searched{% if search_query %} for “{{ search_query }}”{% endif %}, {{ search_results|length }} result{{ search_results|length|pluralize }} found.

- - {% elif search_query %} - {% get_search_promotions search_query as search_promotions %} - {% if search_promotions %} -

You searched for “{{ search_query }}”, {{ search_promotions|length }} result{{ search_promotions|length|pluralize }} found.

- +
+
+
+

Search results

+ {% if search_results %} +

You searched{% if search_query %} for “{{ search_query }}”{% endif %}, {{ + search_results|length }} result{{ search_results|length|pluralize }} found.

+ + {% elif search_query %} + {% get_search_promotions search_query as search_promotions %} + {% if search_promotions %} +

You searched for “{{ search_query }}”, {{ search_promotions|length }} + result{{ search_promotions|length|pluralize }} found.

+
+ + {% endfor %} + + {% else %} +

No results found for “{{ search_query }}”.

+ {% endif %} + {% else %} +

You didn't search for anything!

+ {% endif %}
-{% endblock content %} +
+{% endblock content %} \ No newline at end of file diff --git a/bakerydemo/templates/tags/gallery.html b/bakerydemo/templates/tags/gallery.html index d66cf601a..b2eb5e92f 100644 --- a/bakerydemo/templates/tags/gallery.html +++ b/bakerydemo/templates/tags/gallery.html @@ -3,7 +3,7 @@ {% for img in images %}
- {% picture img format-{avif,webp,jpeg} fill-{300x200-c75,645x480-c75} sizes="(max-width: 768px)150px,30vw" loading="lazy" %} + {% picture img format-{avif,webp,jpeg} fill-{300x200-c75,645x480-c75} sizes="(max-width: 768px)150px,30vw" loading="lazy" alt="{{ img.title }}" %}

{{ img.title }}