Remove content-header content-body blocks replace with content on all templates

bakerydemo/templates/404.html

@@ -4,8 +4,8 @@
 
 {% block body_class %}template-404{% endblock %}
 
-{% block content-header %}
+{% block content %}
     <h1>Page not found</h1>
 
     <h2>Sorry, this page could not be found.</h2>
-{% endblock content-header %}
+{% endblock content %}

bakerydemo/templates/about_page.html

@@ -1,15 +1,13 @@
 {% extends "base.html" %}
 {% load wagtailimages_tags %}
 
-{% block content-header %}
+{% block content %}
     {{ page.title }}
 
     <div class="image">
         {% image page.image width-500 as photo %}
               <img src="{{ photo.url }}" width="{{ photo.width }}" height="{{ photo.height }}" alt="{{ photo.alt }}" />
     </div>
-{% endblock content-header %}
 
-{% block content-body %}
     {{ page.body }}
-{% endblock content-body %}
+{% endblock content %}

bakerydemo/templates/base/about_page.html

@@ -1,15 +1,13 @@
 {% extends "base.html" %}
 {% load wagtailimages_tags %}
 
-{% block content-header %}
+{% block content %}
     {{ page.title }}
 
     <div class="image">
         {% image page.image width-500 as photo %}
               <img src="{{ photo.url }}" width="{{ photo.width }}" height="{{ photo.height }}" alt="{{ photo.alt }}" />
     </div>
-{% endblock content-header %}
 
-{% block content-body %}
     {{ page.body }}
-{% endblock content-body %}
+{% endblock content %}

bakerydemo/templates/base/form_page.html

@@ -1,15 +1,13 @@
 {% extends "base.html" %}
 {% load wagtailcore_tags %}
 
-{% block content-header %}
+{% block content %}
     {{ page.title }}
     {{ page.intro|richtext }}
-{% endblock content-header %}
 
-{% block content-body %}
     <form action="{% pageurl page %}" method="POST">
         {% csrf_token %}
         {{ form.as_p }}
         <input type="submit">
     </form>
-{% endblock content-body %}
+{% endblock content %}

bakerydemo/templates/base/form_page_landing.html

@@ -1,13 +1,8 @@
 {% extends "base.html" %}
 {% load wagtailcore_tags %}
 
-{% block content-header %}
+{% block content %}
     <h1>{{ page.title }}</h1>
-{% endblock content-header %}
 
-{% block breadcrumbs %}
-{% endblock breadcrumbs %}
-
-{% block content-body %}
     {{ page.thank_you_text|richtext }}
-{% endblock content-body %}
+{% endblock content %}

bakerydemo/templates/base/gallery_page.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load wagtailimages_tags gallery_tags %}
 
-{% block content-header %}
+{% block content %}
 {% image self.image fill-1920x600 as hero_img %}
 <div class="container-fluid hero" style="background-image:url('{{ hero_img.url }}')">
 <div class="hero-gradient-mask"></div>
@@ -14,9 +14,7 @@
         </div>
     </div>
 </div>
-{% endblock content-header %}
 
-{% block content-body %}
 <div class="container">
     <div class="row">
         <div class="col-xs-12">
@@ -25,4 +23,4 @@
         </div>
     </div>
 </div>
-{% endblock content-body %}
+{% endblock content %}

bakerydemo/templates/base/home_page.html

@@ -1,10 +1,7 @@
 {% extends "base.html" %}
 {% load wagtailimages_tags %}
 
-{% block content-header %}
-    {% include "base/include/header.html" %}
-{% endblock content-header %}
+{% block content %}
 
-{% block content-body %}
     {{ page.body }}
-{% endblock content-body %}
+{% endblock content %}

bakerydemo/templates/blog/blog_index_page.html

@@ -1,11 +1,9 @@
 {% extends "base.html" %}
 {% load wagtailimages_tags %}
 
-{% block content-header %}
+{% block content %}
     {% include "base/include/header.html" %}
-{% endblock content-header %}
 
-{% block content-body %}
     <div class="container">
         <div class="row">
             <div class="col-md-7 col-md-offset-2">
@@ -21,4 +19,4 @@
             </div>
         </div>
     </div>
-{% endblock content-body %}
+{% endblock content %}

bakerydemo/templates/blog/blog_page.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load navigation_tags wagtailimages_tags %}
 
-{% block content-header %}
+{% block content %}
 {% image self.image fill-1920x600 as hero_img %}
 <div class="container-fluid hero" style="background-image:url('{{ hero_img.url }}')">
 <div class="hero-gradient-mask"></div>
@@ -14,9 +14,7 @@
         </div>
     </div>
 </div>
-{% endblock content-header %}
 
-{% block content-body %}
 <div class="container">
     <div class="row">
         <div class="col-md-7 col-md-offset-2">
@@ -35,4 +33,4 @@
         </div>
     </div>
 </div>
-{% endblock content-body %}
+{% endblock content %}

bakerydemo/templates/breads/bread_page.html

@@ -1,15 +1,13 @@
 {% extends "base.html" %}
 {% load wagtailimages_tags %}
 
-{% block content-header %}
+{% block content %}
     <h1>{{ page.title }}</h1>
     <figure>
       {% image self.image fill-600x600 %}
     </figure>
-{% endblock content-header %}
 
-{% block content-body %}
     <p>{{ page.origin }}</p>
     <p>{{ page.bread_type }}</p>
     {{ page.description }}
-{% endblock content-body %}
+{% endblock content %}

bakerydemo/templates/breads/breads_index_page.html

@@ -1,12 +1,7 @@
 {% extends "base.html" %}
 {% load wagtailimages_tags %}
 
-{% block content-header %}
-    {% include "base/include/header.html" %}
-{% endblock content-header %}
-
-{% block content-body %}
-
+{% block content %}
     <p>{{ page.introduction}}</p>
 
     {% for bread in resources %}
@@ -42,4 +37,4 @@
 	  </div>
 	</div>
 	{% endif %}
-{% endblock content-body %}
+{% endblock content %}

bakerydemo/templates/locations/location_page.html

@@ -18,14 +18,12 @@
   </style>
 {% endblock head-extra %}
 
-{% block content-header %}
+{% block content %}
     <h1>{{ page.title }}</h1>
     <figure>
       {% image self.image fill-600x600 %}
     </figure>
-{% endblock content-header %}
 
-{% block content-body %}
     <p>{{ page.address|linebreaks }}</p>
     <div id="map" class="maps embed-container"></div>
 
@@ -55,4 +53,4 @@
     </script>
     <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyD31CT9P9KxvNUJOwDq2kcFEIG8ADgaFgw&callback=initMap" async defer></script>
 
-{% endblock content-body %}
+{% endblock content %}

bakerydemo/templates/locations/locations_index_page.html

@@ -1,12 +1,7 @@
-{% extends "base.html" %}
-{% load wagtailcore_tags %}
-{% load wagtailimages_tags %}
+{% extends "base.html" %}{% load wagtailimages_tags wagtailcore_tags %}
 
-{% block content-header %}
-    {% include "base/include/header.html" %}
-{% endblock content-header %}
-
-{% block content-body %}
+{% block content %}
+    {{ page.title }}
     {{ page.introduction }}
 
     {% for location in locations %}
@@ -15,4 +10,4 @@
             {% image location.image width-150 %}
         </div>
     {% endfor %}
-{% endblock content-body %}
+{% endblock content %}

bakerydemo/templates/search/search_results.html

@@ -3,13 +3,11 @@
 
 {% block title %}Search{% if search_results %} results{% endif %}{% endblock %}
 
-{% block content-header %}
+{% block content %}
     <h1>
         Search results
     </h1>
-{% endblock content-header %}
 
-{% block content-body %}
     {% if search_results %}
     You searched <p>{% if request.GET.query %} for “{{ request.GET.query }}”{% endif %}</p>
         <ul>
@@ -34,4 +32,4 @@
     {% else %}
         You didn’t search for anything!
     {% endif %}
-{% endblock content-body %}
+{% endblock content %}