Resolve merge and migration conflicts

bakerydemo/base/migrations/0003_auto_20170209_1651.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-09 16:51
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0002_gallerypage_choices'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='gallerypage',
+            name='choices',
+            field=models.CharField(choices=[(2, 'Something')], max_length=255),
+        ),
+    ]

bakerydemo/base/migrations/0003_homepage.py → bakerydemo/base/migrations/0004_homepage.py

@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('wagtailcore', '0032_add_bulk_delete_page_permission'),
         ('wagtailimages', '0018_remove_rendition_filter'),
-        ('base', '0002_gallerypage_choices'),
+        ('base', '0003_auto_20170209_1651'),
     ]
 
     operations = [

bakerydemo/base/migrations/0005_aboutlocationrelationship.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-09 17:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import modelcluster.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('locations', '0002_auto_20170209_1651'),
+        ('base', '0003_auto_20170209_1651'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AboutLocationRelationship',
+            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)),
+                ('locations', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='about_location_relationship', to='locations.LocationPage')),
+                ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='location_about_relationship', to='base.AboutPage')),
+            ],
+            options={
+                'ordering': ['sort_order'],
+                'abstract': False,
+            },
+        ),
+    ]

bakerydemo/base/migrations/0006_auto_20170209_1721.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-09 17:21
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0005_aboutlocationrelationship'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='gallerypage',
+            name='choices',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='wagtailcore.Collection'),
+        ),
+    ]

bakerydemo/base/migrations/0007_merge_20170210_0959.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-10 09:59
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0004_homepage'),
+        ('base', '0006_auto_20170209_1721'),
+    ]
+
+    operations = [
+    ]

bakerydemo/base/models.py

@@ -1,8 +1,10 @@
 from __future__ import unicode_literals
 
 from django.db import models
+from django.db.utils import OperationalError
 
 from modelcluster.fields import ParentalKey
+from modelcluster.models import ClusterableModel
 from wagtail.wagtailcore.models import Page, Orderable, Collection
 from wagtail.wagtailsearch import index
 from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
@@ -12,7 +14,8 @@ from wagtail.wagtailadmin.edit_handlers import (
         InlinePanel,
         FieldRowPanel,
         StreamFieldPanel,
-        MultiFieldPanel
+        MultiFieldPanel,
+        PageChooserPanel
         )
 from wagtail.wagtailsnippets.models import register_snippet
 from wagtail.wagtailsnippets.edit_handlers import SnippetChooserPanel
@@ -21,7 +24,7 @@ from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField
 
 
 @register_snippet
-class People(models.Model):
+class People(ClusterableModel):
     first_name = models.CharField("First name", max_length=254)
     last_name = models.CharField("Last name", max_length=254)
     job_title = models.CharField("Job title", max_length=254)
@@ -49,21 +52,21 @@ class People(models.Model):
         verbose_name_plural = 'People'
 
 
-# class AboutLocationRelationship(Orderable, models.Model):
-#     """
-#     This defines the relationship between the `LocationPage` within the `locations`
-#     app and the About page below allowing us to add locations to the about
-#     section.
-#     """
-#     about = ParentalKey(
-#         'About', related_name='location_about_relationship'
-#     )
-#     locations = models.ForeignKey(
-#         'locations.LocationPage', related_name='about_location_relationship'
-#     )
-#     panels = [
-#         PageChooserPanel('locations')
-#     ]
+class AboutLocationRelationship(Orderable, models.Model):
+    """
+    This defines the relationship between the `LocationPage` within the `locations`
+    app and the About page below allowing us to add locations to the about
+    section.
+    """
+    page = ParentalKey(
+        'AboutPage', related_name='location_about_relationship'
+    )
+    locations = models.ForeignKey(
+        'locations.LocationPage', related_name='about_location_relationship'
+    )
+    panels = [
+        PageChooserPanel('locations')
+    ]
 
 
 class AboutPage(Page):
@@ -90,11 +93,11 @@ class AboutPage(Page):
     content_panels = Page.content_panels + [
         ImageChooserPanel('image'),
         StreamFieldPanel('body'),
-        #    InlinePanel(
-        #        'about_location_relationship',
-        #        label='Locations',
-        #        min_num=None
-        #        ),
+        InlinePanel(
+           'location_about_relationship',
+           label='Locations',
+           min_num=None
+           ),
     ]
 
     # parent_page_types = [
@@ -119,7 +122,7 @@ def getImageCollections():
             )]
         return collection_images
     except:
-        return [('','')]
+        return [('', '')]
 
     def __str__(self):
         return self.title
@@ -155,17 +158,13 @@ class GalleryPage(Page):
     """
     This is a page to list all the locations on the site
     """
-    # try:
-    CHOICES_LIST = getImageCollections()
-    # except:
-    #     CHOICES_LIST = [("", "")]
-    # To return our collection choices for the editor to access we need to
-    # make the choices list a variable rather than a function
-
-    choices = models.CharField(
-        max_length=255, choices=CHOICES_LIST
-        )
-
+    choices = models.ForeignKey(
+        Collection,
+        limit_choices_to=~models.Q(name__in=['Root']),
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+    )
     image = models.ForeignKey(
         'wagtailimages.Image',
         null=True,

bakerydemo/base/templatetags/navigation_tags.py

@@ -0,0 +1,89 @@
+from django import template
+from django.template import Template
+from django.utils.http import urlencode
+from wagtail.wagtailcore.models import Page
+
+register = template.Library()
+# https://docs.djangoproject.com/en/1.9/howto/custom-template-tags/
+
+
+@register.assignment_tag(takes_context=True)
+def get_site_root(context):
+    # This returns a core.Page. The main menu needs to have the site.root_page
+    # defined else will return an object attribute error ('str' object has no
+    # attribute 'get_children')
+    return context['request'].site.root_page
+
+
+def has_menu_children(page):
+    # This is used by the top_menu property
+    # get_children is a Treebeard API thing
+    # https://tabo.pe/projects/django-treebeard/docs/4.0.1/api.html
+    return page.get_children().live().in_menu().exists()
+
+
+def has_children(page):
+    # Generically allow index pages to list their children
+    return page.get_children().live().exists()
+
+
+def is_active(page, current_page):
+    # To give us active state on main navigation
+    return (current_page.url.startswith(page.url) if current_page else False)
+
+
+# Retrieves the top menu items - the immediate children of the parent page
+# The has_menu_children method is necessary because the Foundation menu requires
+# a dropdown class to be applied to a parent
+@register.inclusion_tag('tags/top_menu.html', takes_context=True)
+def top_menu(context, parent, calling_page=None):
+    menuitems = parent.get_children().live().in_menu()
+    for menuitem in menuitems:
+        menuitem.show_dropdown = has_menu_children(menuitem)
+        # We don't directly check if calling_page is None since the template
+        # engine can pass an empty string to calling_page
+        # if the variable passed as calling_page does not exist.
+        menuitem.active = (calling_page.url.startswith(menuitem.url)
+                           if calling_page else False)
+    return {
+        'calling_page': calling_page,
+        'menuitems': menuitems,
+        # required by the pageurl tag that we want to use within this template
+        'request': context['request'],
+    }
+
+
+# Retrieves the children of the top menu items for the drop downs
+@register.inclusion_tag('tags/top_menu_children.html', takes_context=True)
+def top_menu_children(context, parent, calling_page=None):
+    menuitems_children = parent.get_children()
+    menuitems_children = menuitems_children.live().in_menu()
+    for menuitem in menuitems_children:
+        menuitem.has_dropdown = has_menu_children(menuitem)
+        # We don't directly check if calling_page is None since the template
+        # engine can pass an empty string to calling_page
+        # if the variable passed as calling_page does not exist.
+        menuitem.active = (calling_page.url.startswith(menuitem.url)
+                           if calling_page else False)
+        menuitem.children = menuitem.get_children().live().in_menu()
+    return {
+        'parent': parent,
+        'menuitems_children': menuitems_children,
+        # required by the pageurl tag that we want to use within this template
+        'request': context['request'],
+    }
+
+
+@register.inclusion_tag('tags/breadcrumbs.html', takes_context=True)
+def breadcrumbs(context):
+    self = context.get('self')
+    if self is None or self.depth <= 2:
+        # When on the home page, displaying breadcrumbs is irrelevant.
+        ancestors = ()
+    else:
+        ancestors = Page.objects.ancestor_of(
+            self, inclusive=True).filter(depth__gt=1)
+    return {
+        'ancestors': ancestors,
+        'request': context['request'],
+    }

bakerydemo/blog/migrations/0001_initial.py

@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-09 16:51
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import modelcluster.contrib.taggit
+import modelcluster.fields
+import wagtail.wagtailcore.blocks
+import wagtail.wagtailcore.fields
+import wagtail.wagtailembeds.blocks
+import wagtail.wagtailimages.blocks
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('wagtailcore', '0032_add_bulk_delete_page_permission'),
+        ('wagtailimages', '0017_reduce_focal_point_key_max_length'),
+        ('taggit', '0002_auto_20150616_2121'),
+        ('base', '0003_auto_20170209_1651'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='BlogIndexPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
+                ('introduction', models.TextField(blank=True, help_text='Text to describe the index page')),
+                ('image', models.ForeignKey(blank=True, help_text='Location listing image', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page',),
+        ),
+        migrations.CreateModel(
+            name='BlogPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
+                ('date_published', models.DateField(blank=True, null=True, verbose_name='Date article published')),
+                ('body', wagtail.wagtailcore.fields.StreamField((('heading_block', wagtail.wagtailcore.blocks.StructBlock((('heading_text', wagtail.wagtailcore.blocks.CharBlock(classname='title', required=True)), ('size', wagtail.wagtailcore.blocks.ChoiceBlock(blank=True, choices=[('', 'Select a header size'), ('h2', 'H2'), ('h3', 'H3'), ('h4', 'H4')], required=False))))), ('paragraph_block', wagtail.wagtailcore.blocks.RichTextBlock(icon='fa-paragraph', template='blocks/paragraph_block.html')), ('image_block', wagtail.wagtailcore.blocks.StructBlock((('image', wagtail.wagtailimages.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.wagtailcore.blocks.CharBlock(required=False)), ('attribution', wagtail.wagtailcore.blocks.CharBlock(required=False))))), ('block_quote', wagtail.wagtailcore.blocks.StructBlock((('attribute_name', wagtail.wagtailcore.blocks.CharBlock(blank=True, label='e.g. Guy Picciotto', required=False)),))), ('embed_block', wagtail.wagtailembeds.blocks.EmbedBlock(help_text='Insert an embed URL e.g https://www.youtube.com/embed/SGJFWirQ3ks', icon='fa-s15', template='blocks/embed_block.html'))), blank=True, verbose_name='About page detail')),
+                ('image', models.ForeignKey(blank=True, help_text='Location image', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page',),
+        ),
+        migrations.CreateModel(
+            name='BlogPageTag',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content_object', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='tagged_items', to='blog.BlogPage')),
+                ('tag', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='blog_blogpagetag_items', to='taggit.Tag')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='BlogPeopleRelationship',
+            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)),
+                ('blogpage', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='blog_person_relationship', to='blog.BlogPage')),
+                ('people', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='person_blog_relationship', to='base.People')),
+            ],
+            options={
+                'abstract': False,
+                'ordering': ['sort_order'],
+            },
+        ),
+        migrations.AddField(
+            model_name='blogpage',
+            name='tags',
+            field=modelcluster.contrib.taggit.ClusterTaggableManager(blank=True, help_text='A comma-separated list of tags.', through='blog.BlogPageTag', to='taggit.Tag', verbose_name='Tags'),
+        ),
+    ]

bakerydemo/blog/migrations/0002_auto_20170209_1659.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-09 16:59
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='blogpeoplerelationship',
+            old_name='blogpage',
+            new_name='page',
+        ),
+    ]

bakerydemo/blog/models.py

@@ -0,0 +1,136 @@
+from __future__ import unicode_literals
+
+from django.db import models
+
+from modelcluster.fields import ParentalKey
+from modelcluster.contrib.taggit import ClusterTaggableManager
+from taggit.models import TaggedItemBase
+from wagtail.wagtailcore.models import Page, Orderable, Collection
+from wagtail.wagtailsearch import index
+from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+from wagtail.wagtailcore.fields import StreamField, RichTextField
+from wagtail.wagtailadmin.edit_handlers import (
+        FieldPanel,
+        InlinePanel,
+        FieldRowPanel,
+        StreamFieldPanel,
+        MultiFieldPanel
+        )
+from wagtail.wagtailsnippets.edit_handlers import SnippetChooserPanel
+from bakerydemo.base.blocks import BaseStreamBlock
+
+
+class BlogPeopleRelationship(Orderable, models.Model):
+    """
+    This defines the relationship between the `LocationPage` within the `locations`
+    app and the About page below allowing us to add locations to the about
+    section.
+    """
+    page = ParentalKey(
+        'BlogPage', related_name='blog_person_relationship'
+    )
+    people = models.ForeignKey(
+        'base.People', related_name='person_blog_relationship'
+    )
+    panels = [
+        SnippetChooserPanel('people')
+    ]
+
+
+class BlogPageTag(TaggedItemBase):
+    content_object = ParentalKey('BlogPage', related_name='tagged_items')
+
+
+class BlogPage(Page):
+    """
+    The About Page
+    """
+    image = models.ForeignKey(
+        'wagtailimages.Image',
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name='+',
+        help_text='Location image'
+    )
+
+    tags = ClusterTaggableManager(through=BlogPageTag, blank=True)
+
+    date_published = models.DateField("Date article published", blank=True, null=True)
+
+    body = StreamField(
+        BaseStreamBlock(), verbose_name="About page detail", blank=True
+        )
+
+    content_panels = Page.content_panels + [
+        ImageChooserPanel('image'),
+        StreamFieldPanel('body'),
+        FieldPanel('date_published'),
+        InlinePanel(
+            'blog_person_relationship', label="Author(s)",
+            panels=None, min_num=1),
+        FieldPanel('tags'),
+    ]
+
+    def authors(self):
+        authors = [
+             n.people for n in self.blog_person_relationship.all()
+        ]
+
+        return authors
+
+    # def tags(self):
+    #     tags = self.tags.all()
+    #     return tags
+
+    parent_page_types = [
+       'BlogIndexPage'
+    ]
+
+    # Defining what content type can sit under the parent
+    # The empty array means that no children can be placed under the
+    # LocationPage page model
+    subpage_types = []
+
+    # api_fields = ['image', 'body']
+
+
+class BlogIndexPage(Page):
+    """
+    """
+
+    image = models.ForeignKey(
+        'wagtailimages.Image',
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name='+',
+        help_text='Location listing image'
+    )
+
+    introduction = models.TextField(
+        help_text='Text to describe the index page',
+        blank=True)
+
+    content_panels = Page.content_panels + [
+        ImageChooserPanel('image'),
+        FieldPanel('introduction')
+    ]
+
+    # parent_page_types = [
+    #     'home.HomePage'
+    # ]
+
+    # Defining what content type can sit under the parent. Since it's a blank
+    # array no subpage can be added
+    subpage_types = [
+        'BlogPage'
+    ]
+
+    def get_context(self, request):
+        context = super(BlogIndexPage, self).get_context(request)
+        context['posts'] = BlogPage.objects.descendant_of(
+            self).live().order_by(
+            '-first_published_at')
+        return context
+    # api_fields = ['introduction']

bakerydemo/breads/migrations/0002_auto_20170209_1713.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-09 17:13
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('breads', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='BreadsLandingPage',
+            new_name='BreadsIndexPage',
+        ),
+    ]

bakerydemo/breads/models.py

@@ -1,7 +1,5 @@
-
 from django.db import models
 
-
 from wagtail.wagtailcore.models import Page
 from wagtail.wagtailcore.fields import StreamField
 from wagtail.wagtailadmin.edit_handlers import FieldPanel, StreamFieldPanel
@@ -28,15 +26,6 @@ class Country(models.Model):
         verbose_name_plural = "Countries of Origin"
 
 
-class BreadsLandingPage(Page):
-    '''
-    Home page for breads. Nothing needed in the model here - we'll just
-    create an instance, then pull its children into the template.
-    '''
-
-    pass
-
-
 @register_snippet
 class BreadType(models.Model):
     '''
@@ -99,3 +88,24 @@ class BreadPage(Page):
         index.SearchField('title'),
         index.SearchField('description'),
     ]
+
+    parent_page_types = [
+       'BreadsIndexPage'
+    ]
+
+
+class BreadsIndexPage(Page):
+    '''
+    Index page for breads. We don't have any fields within our model but we need
+    to alter the page models context to return the child page objects - the
+    BreadPage - so that it works as an index page
+    '''
+
+    subpage_types = ['BreadPage']
+
+    def get_context(self, request):
+        context = super(BreadsIndexPage, self).get_context(request)
+        context['breads'] = BreadPage.objects.descendant_of(
+            self).live().order_by(
+            '-first_published_at')
+        return context

bakerydemo/locations/migrations/0002_auto_20170209_1651.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-09 16:51
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('locations', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='locationpage',
+            name='lat_long',
+            field=models.CharField(help_text="Comma separated lat/long. (Ex. 64.144367, -21.939182)                    Right click Google Maps and click 'What's Here'", max_length=36),
+        ),
+    ]

bakerydemo/locations/migrations/0003_auto_20170209_1711.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-09 17:11
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('locations', '0002_auto_20170209_1651'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='LocationsLandingPage',
+            new_name='LocationsIndexPage',
+        ),
+    ]

bakerydemo/locations/models.py

@@ -61,12 +61,19 @@ class LocationOperatingHours(Orderable, OperatingHours):
     )
 
 
-class LocationsLandingPage(Page):
+class LocationsIndexPage(Page):
     '''
-    Home page for locations
+    Index page for locations
     '''
 
-    pass
+    subpage_types = ['LocationPage']
+
+    def get_context(self, request):
+        context = super(LocationsIndexPage, self).get_context(request)
+        context['locations'] = LocationPage.objects.descendant_of(
+            self).live().order_by(
+            '-first_published_at')
+        return context
 
 
 class LocationPage(Page):
@@ -91,13 +98,11 @@ class LocationPage(Page):
     )
 
     # Search index configuration
-
     search_fields = Page.search_fields + [
         index.SearchField('address'),
     ]
 
     # Editor panels configuration
-
     content_panels = Page.content_panels + [
         FieldPanel('address', classname="full"),
         FieldPanel('lat_long'),
@@ -107,3 +112,11 @@ class LocationPage(Page):
 
     def __str__(self):
         return self.name
+
+    def opening_hours(self):
+        hours = self.hours_of_operation.all()
+        return hours
+
+    parent_page_types = [
+       'LocationsIndexPage'
+    ]

bakerydemo/settings/base.py

@@ -82,7 +82,7 @@ ROOT_URLCONF = 'bakerydemo.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(BASE_DIR, 'templates'), ],
+        'DIRS': ['bakerydemo/templates', ],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -142,7 +142,6 @@ USE_L10N = True
 USE_TZ = True
 
 
-
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
 

bakerydemo/templates/base.html

@@ -1,38 +1,48 @@
-{% load static wagtailuserbar %}
+{% load navigation_tags static wagtailuserbar %}
 
 <!DOCTYPE html>
-<html lang="en">
-
-<head>
-
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <title>{% block title %}{% if self.seo_title %}{{ self.seo_title }}{% else %}{{ self.title }}{% endif %}{% endblock %}{% block title_suffix %}{% endblock %}</title>
-
-    <!-- Bootstrap Core CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-
-    <!-- Theme CSS -->
-    {# <link href="css/clean-blog.min.css" rel="stylesheet">#}
-    <link rel="stylesheet" type="text/x-scss" href="{% static 'css/clean-blog.min.css' %}">
-
-
-    <!-- Custom Fonts -->
-    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-
-    <link href='https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
-
-    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-        <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-        <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
+<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>
+            {% block title %}
+                {% block title_prefix %}
+                    Wagtail demo bakery
+                {% endblock %}
+                {% if self.seo_title %}
+                    {{ self.seo_title }}
+                {% else %}
+                    {{ self.title }}
+                {% endif %}
+            {% endblock %}
+        </title>
+        <meta name="description" content="">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Bootstrap Core CSS -->
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
+        <!-- Theme CSS -->
+        {# <link href="css/clean-blog.min.css" rel="stylesheet">#}
+        <link rel="stylesheet" type="text/x-scss" href="{% static 'css/clean-blog.min.css' %}">
+
+
+        <!-- Custom Fonts -->
+        <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+
+        <link href='https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
+        <link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
+
+        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+        <!--[if lt IE 9]>
+            <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+            <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+        <![endif]-->
 
 </head>
 
@@ -90,16 +100,20 @@
         </div>
     </header>
 
-    <!-- Main Content -->
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
-                {% block content %}{% endblock %}
 
-            </div>
+    {% block main_navigation %}
+    {% get_site_root as site_root %}
+    {% top_menu parent=site_root calling_page=self %}
+    {# main_menu is defined in base/templatetags/navigation_tags.py #}
+    {% endblock %}
 
-        </div>
-    </div>
+    {% block breadcrumbs %}
+    {% breadcrumbs %}
+    {# breadcrumbs is defined in base/templatetags/navigation_tags.py #}
+    {% endblock %}
+
+    {% block content %}
+    {% endblock %}
 
     <hr>
 

bakerydemo/templates/base/form_page.html

@@ -0,0 +1,15 @@
+{% load wagtailcore_tags %}
+<html>
+    <head>
+        <title>{{ page.title }}</title>
+    </head>
+    <body>
+        <h1>{{ page.title }}</h1>
+        {{ page.intro|richtext }}
+        <form action="{% pageurl page %}" method="POST">
+            {% csrf_token %}
+            {{ form.as_p }}
+            <input type="submit">
+        </form>
+    </body>
+</html>

bakerydemo/templates/base/form_page_landing.html

@@ -0,0 +1,9 @@
+<html>
+    <head>
+        <title>{{ page.title }}</title>
+    </head>
+    <body>
+        <h1>{{ page.title }}</h1>
+        <h2>Thanks for your submission!</h2>
+    </body>
+</html>

bakerydemo/templates/blog/blog_index_page.html

@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% load wagtailimages_tags %}
+
+{% block content %}
+    {{ page.title }}
+
+    {% for post in posts %}
+        <div><a href="{{ post.slug }}">{{ post.title }}</a></div>
+    {% endfor %}
+{% endblock content %}

bakerydemo/templates/blog/blog_page.html

@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% load wagtailimages_tags %}
+
+{% block content %}
+    <h1>{{ page.title }}</h1>
+    <figure>
+      {% image self.image fill-600x600 %}
+    </figure>
+
+    {% for tag in page.tags.all  %}
+        {{ tag }}
+    {% endfor %}
+
+    <date>{{ page.date_published }}</date>
+    
+    {% for author in page.authors %}
+        <li>{{ author }}</li>
+    {% endfor %}
+
+    {{ page.body }}
+{% endblock content %}

bakerydemo/templates/breads/bread_page.html

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

bakerydemo/templates/breads/breads_index_page.html

@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% load wagtailimages_tags %}
+
+{% block content %}
+    {{ page.title }}
+
+    {% for bread in breads %}
+        <div><a href="{{ bread.slug }}">{{ bread.title }}</a></div>
+    {% endfor %}
+{% endblock content %}

bakerydemo/templates/locations/location_page.html

@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+{% load wagtailimages_tags %}
+
+{% block content %}
+    <h1>{{ page.title }}</h1>
+    <figure>
+      {% image self.image fill-600x600 %}
+    </figure>
+    <p>{{ page.address }}</p>
+    <p>{{ page.lat_long }}</p>
+    
+    {% for hours in page.opening_hours %}
+        <li>{{ hours }}</li>
+    {% endfor %}
+{% endblock content %}

bakerydemo/templates/locations/locations_index_page.html

@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% load wagtailimages_tags %}
+
+{% block content %}
+    {{ page.title }}
+
+    {% for location in locations %}
+        <div><a href="{{ location.slug }}">{{ location.title }}</a></div>
+    {% endfor %}
+{% endblock content %}

bakerydemo/templates/tags/breadcrumbs.html

@@ -0,0 +1,17 @@
+{% load wagtailcore_tags %}
+
+{% if ancestors %}
+  <nav class="breadcrumbs" aria-label="You are here:" role="navigation">
+    <ul>
+      {% for ancestor in ancestors %}
+        {% if forloop.last %}
+          <li>
+            <span class="show-for-sr">Current: </span> {{ ancestor }}
+          </li>
+        {% else %}
+          <li><a href="{% pageurl ancestor %}">{{ ancestor }}</a></li>
+        {% endif %}
+      {% endfor %}
+    </ul>
+  </nav>
+{% endif %}

bakerydemo/templates/tags/sidebar_menu.html

@@ -0,0 +1,36 @@
+{% load navigation_tags wagtailcore_tags %}
+{% get_site_root as site_root %}
+
+{% if calling_page|has_protocol_parent and calling_page.content_type.model == 'standardpage' %}
+
+  <div class="off-canvas position-left reveal-for-large bla" id="offCanvasLeft" data-off-canvas>
+    {% protocol_menu calling_page=calling_page %}
+  </div>
+
+{% elif ancestor.has_children %}
+
+  <div class="off-canvas position-left reveal-for-large" id="offCanvasLeft" data-off-canvas>
+    <nav class="sidebar-nav">
+      <h3>In this section</h3>
+      <ul class="vertical menu">
+        {% for menuitem in ancestor.children %}
+          <li class="{% if menuitem.is_active %}is-active{% endif %}">
+            <a href="{% pageurl menuitem %}">{{ menuitem.title }}</a>
+
+            {% if menuitem.is_active and menuitem.has_children %}
+              <ul class="nested vertical menu is-active">
+                {% for child in menuitem.children %}
+                  <li>
+                    <a href="{% pageurl child %}">{{ child.title }}</a>
+                  </li>
+
+                {% endfor %}
+              </ul>
+            {% endif %}
+          </li>
+        {% endfor %}
+      </ul>
+    </nav>
+  </div>
+
+{% endif %}

bakerydemo/templates/tags/table_of_contents_menu.html

@@ -0,0 +1,35 @@
+{% if section_pages %}
+  <nav class="sidebar-nav section-nav">
+    <h3>In this section</h3>
+    <ul class="vertical menu">
+      {% for section_page in section_pages %}
+        <li class="{% if section_page.is_active %}is-active{% endif %}">
+          <a href="{{section_page.url}}">{{ section_page.title }}</a>
+        </li>
+      {% endfor %}
+    </ul>
+  </nav>
+{% endif %}
+{% if article_headings %}
+  <div data-sticky-container>
+    <div class="sticky" data-sticky data-sticky-on="large" data-margin-top="3" data-top-anchor="on-this-page:top" data-btm-anchor="main-end:bottom">
+      <nav class="sidebar-nav article-nav">
+        <h3 id="on-this-page">On this page</h3>
+        <ul class="vertical menu" data-magellan data-bar-offset="60">
+          {% for heading in article_headings %}
+            <li>
+              <a href="#{{heading.value|slugify}}">{{heading.value}}</a>
+              {% if heading.children %}
+                <ul>
+                  {% for subheading in heading.children %}
+                    <li><a href="#{{subheading|slugify}}">{{subheading}}</a>
+                  {% endfor %}
+                </ul>
+              {% endif %}
+            </li>
+          {% endfor %}
+        </ul>
+      </nav>
+    </div>
+  </div>
+{% endif %}

bakerydemo/templates/tags/top_menu.html

@@ -0,0 +1,15 @@
+{% load navigation_tags wagtailcore_tags %}
+{% get_site_root as site_root %}
+
+
+<div class="navigation-bar">
+    <ul id="main-menu">
+      {% for menuitem in menuitems %}
+        <li class="{% if menuitem.show_dropdown %}has-submenu{% endif %} {% if menuitem.active %}current{% endif %}">
+        <a href="{% pageurl menuitem %}">{{ menuitem.title }}</a>
+        {% top_menu_children parent=menuitem %}
+        </li>
+      {% endfor %}
+    </ul>
+  </div>
+</div>

bakerydemo/templates/tags/top_menu_children.html

@@ -0,0 +1,6 @@
+{% load navigation_tags wagtailcore_tags %}
+<ul class="submenu">
+  {% for child in menuitems_children %}
+    <li><a href="{% pageurl child %}">{{ child.title }}</a></li>
+  {% endfor %}
+</ul>