+
+
+ {% include "./mini_site_header.html" %}
+ {% mini_site_horizontal_nav page %}
+ {% block html_content %}
+ {% for block in page.body %}
+ {% if block.block_type == 'heading' %}
+
{{ block.value }}
+ {% else %}
+ {% include_block block %}
+ {% endif %}
+ {% endfor %}
+ {% endblock %}
-
-
- {% cta page %}
+
+ {% if page.cta != None %}
+
-
-
- {% endif %}
+ {% endif %}
+
{% endblock %}
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/h1-heading.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/h1-heading.html
deleted file mode 100644
index 9e05e26b7e..0000000000
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/h1-heading.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/mini_site_header.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/mini_site_header.html
new file mode 100644
index 0000000000..d3116338df
--- /dev/null
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/mini_site_header.html
@@ -0,0 +1,10 @@
+{% if uses_menu %}
+
{{ mini_site_title }}
+{% endif %}
+
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/mini_site_name_space.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/mini_site_name_space.html
index 3bccd54ef6..02e2a4a4f2 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/mini_site_name_space.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/mini_site_name_space.html
@@ -16,43 +16,7 @@
{% endblock %}
-{% block heading_classes %}
- py-5
- {% if page.specific.narrowed_page_content and uses_menu %}
- col-md-7
- {% elif page.specific.narrowed_page_content %}
- offset-md-2
- col-md-8
- {% elif uses_menu %}
- col-md-9
- {% else %}
- col-md-12
- {% endif %}
-{% endblock %}
-
-
-{% block mini_site_title %}
- {% if uses_menu %}
-
{{ mini_site_title }}
- {% endif %}
-{% endblock %}
-
-
{% block html_content_classes %}{% if singleton_page %}col-12 col-lg-10 offset-lg-1{% else %}col-12 col-md-9{% endif %}{% endblock %}
-{% block subcontent %}
-
- {% include "./h1-heading.html" %}
- {% for block in page.body %}
- {% if block.block_type == 'heading' %}
-
{{ block.value }}
- {% else %}
- {% include_block block %}
- {% endif %}
- {% endfor %}
-
-{% endblock %}
-
-
{% block pre_footer_classes %}{% if singleton_page %}col-12 col-lg-10 offset-lg-1{% else %}col-md-12{% endif %}{% endblock %}
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/modular_page.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/modular_page.html
index 5a3cba8936..9dc52b71b3 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/modular_page.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/modular_page.html
@@ -28,13 +28,7 @@
- {% mini_site_sidebar page %}
-
-
- {% block mini_site_title %}{% endblock %}
-
- {% block subcontent %}{% endblock %}
-
+ {% block subcontent %}{% endblock %}
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/opportunity_page.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/opportunity_page.html
index bd78203a92..83e0df2be9 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/opportunity_page.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/opportunity_page.html
@@ -3,6 +3,34 @@
{% block signup %}
{% if page.cta %}
- {% cta page %}
+ {% cta page %}
{% endif %}
{% endblock %}
+
+{% block subcontent %}
+ {% mini_site_sidebar page %}
+
+
+ {% include "./mini_site_header.html" %}
+
+ {% for block in page.body %}
+ {% if block.block_type == 'heading' %}
+
{{ block.value }}
+ {% else %}
+ {% include_block block %}
+ {% endif %}
+ {% endfor %}
+
+
+{% endblock %}
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/mini_site_horizontal_nav.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/mini_site_horizontal_nav.html
new file mode 100644
index 0000000000..7692ef022a
--- /dev/null
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/mini_site_horizontal_nav.html
@@ -0,0 +1,12 @@
+{% load wagtailcore_tags %}
+
+{% if menu_pages %}
+
+{% endif %}
diff --git a/network-api/networkapi/wagtailpages/templatetags/mini_site_tags.py b/network-api/networkapi/wagtailpages/templatetags/mini_site_tags.py
index 48debcb80c..b1c78bc9a9 100644
--- a/network-api/networkapi/wagtailpages/templatetags/mini_site_tags.py
+++ b/network-api/networkapi/wagtailpages/templatetags/mini_site_tags.py
@@ -22,6 +22,24 @@ def mini_site_sidebar(context, page):
}
+# Instantiate a mini-site horizontal nav based on the current page's relation to other pages
+@register.inclusion_tag('wagtailpages/tags/mini_site_horizontal_nav.html', takes_context=True)
+def mini_site_horizontal_nav(context, page):
+ menu_pages = get_menu_pages(context['root'])
+
+ # We need at least 2 pages, or a nav menu is meaningless.
+ if len(menu_pages) < 2:
+ menu_pages = False
+
+ # Return the list of values we need to have our template
+ # generate the appropriate sidebar HTML.
+ return {
+ 'singleton_page': context['singleton_page'],
+ 'current': page,
+ 'menu_pages': menu_pages,
+ }
+
+
# Render a page's CTA (petition, signup, etc.)
@register.inclusion_tag('wagtailpages/tags/cta.html', takes_context=True)
def cta(context, page):
diff --git a/source/sass/type.scss b/source/sass/type.scss
index 46802f38fd..e0acebc6e1 100644
--- a/source/sass/type.scss
+++ b/source/sass/type.scss
@@ -60,6 +60,13 @@ a {
text-decoration: none;
box-shadow: 0 5px $yellow;
}
+
+ &.colourless-link {
+ &:hover,
+ {$active-class-name} {
+ box-shadow: 0 5px $black;
+ }
+ }
}
h1,