diff --git a/network-api/networkapi/templates/pages/campaign-opportunity-base.html b/network-api/networkapi/templates/pages/campaign-opportunity-base.html new file mode 100644 index 00000000000..f1e079d7efe --- /dev/null +++ b/network-api/networkapi/templates/pages/campaign-opportunity-base.html @@ -0,0 +1,55 @@ +{% extends "./base-compiled.html" %} + +{% block bodyID %}{{ suffix }}{% endblock %} + +{% block content %} +
+
+
+ {% if page.parent.title != parentTitle %} +

{{ page.parent.title }}

+ {% endif %} +

{% block h1 %}{% endblock %}

+
+
+
+
+
+
+
+
+
+
+
+
+ {% if page.parent.title != parentTitle %} +
+
+ {% load pages_tags %} + {% page_menu "pages/menus/side-menu-items.html" %} +
+
+ {% endif %} + + {% block subcontent %} +
+
+
{{ page.landingpage.content | safe }}
+
+
+ {% endblock %} +
+ + +
+
+ {% block signup %}{% endblock %} +
+
+

This is part of a broader movement for a healthy internet. See more.

+
+
+
+
+
+{% endblock %} diff --git a/network-api/networkapi/templates/pages/campaign.html b/network-api/networkapi/templates/pages/campaign.html index 8c53ad6b0d8..6d68346d293 100644 --- a/network-api/networkapi/templates/pages/campaign.html +++ b/network-api/networkapi/templates/pages/campaign.html @@ -1,64 +1,35 @@ -{% extends "./base-compiled.html" %} +{% extends "./campaign-opportunity-base.html" %} -{% block bodyID %}campaign{% endblock %} -{% block content %} -
+{% block bodyID %}{% with suffix="campaign" %}{{ block.super }}{% endwith %}{% endblock %} + +{% block content %}{% with parentTitle="Campaigns" %}{{ block.super }}{% endwith %}{% endblock %} + +{% block h1 %}{{ page.campaign.header }}{{ block.super }}{% endblock %} + +{% block subcontent %} +
0 %}col-12 col-md-9{% else %}col-12 col-lg-10 offset-lg-1{% endif %}">
-
0 %}col-12 col-md-8 offset-md-3{% else %}col-12 col-lg-10 offset-lg-1{% endif %}"> -

{{ page.campaign.header }}

+
0 %}col-12{% else %}col-md-6{% endif %}">{{ page.campaign.content | safe }}
+ {% if page.campaign.petition and page.parent.title != "Campaigns" or page.children.all.count > 0 %}
-
-
-
-
-
-
-
-
-
-
{% if page.parent.title != "Campaigns" or page.children.all.count > 0 %} -
-
- {% load pages_tags %} - {% page_menu "pages/menus/side-menu-items.html" %} -
-
{% endif %} -
0 %}col-12 col-md-9{% else %}col-12 col-lg-10 offset-lg-1{% endif %}"> -
-
0 %}col-12{% else %}col-md-6{% endif %}">{{ page.campaign.content | safe }}
- {% if page.campaign.petition and page.parent.title != "Campaigns" or page.children.all.count > 0 %} -
-
-
- {% else %} -
- {% endif %} - {% with page.campaign.petition as petition %}
{% endwith %} -
-
-
-
- -
-
-
-
-

This is part of a broader movement for a healthy internet. See more.

-
-
+
+ {% else %} +
+ {% endif %} + {% with page.campaign.petition as petition %}
{% endwith %}
diff --git a/network-api/networkapi/templates/pages/landingpage.html b/network-api/networkapi/templates/pages/landingpage.html index 11ee5aa78fc..c71df45f0f6 100644 --- a/network-api/networkapi/templates/pages/landingpage.html +++ b/network-api/networkapi/templates/pages/landingpage.html @@ -1,48 +1,13 @@ -{% extends "./base-compiled.html" %} +{% extends "./campaign-opportunity-base.html" %} -{% block bodyID %}opportunity{% endblock %} -{% block content %} -
-
-
0 %}col-12 col-md-8 offset-md-3{% else %}col-12 col-lg-8 offset-lg-2{% endif %}"> -

{{ page.landingpage.header }}

-
-
-
-
-
-
-
-
-
-
-
-
{% if page.parent.title != "Opportunity" or page.children.all.count > 0 %} -
-
- {% load pages_tags %} - {% page_menu "pages/menus/side-menu-items.html" %} -
-
{% endif %} -
0 %}col-12 col-md-9{% else %}col-12 col-lg-8 offset-lg-2{% endif %}"> -
-
{{ page.landingpage.content | safe }}
-
-
-
{% if page.landingpage.signup %} -
-
-
-
-
{% endif %} -
-
-
-
-

This is part of a broader movement for a healthy internet. See more.

-
-
-
-
-
+{% block bodyID %}{% with suffix="opportunity" %}{{ block.super }}{% endwith %}{% endblock %} + +{% block content %}{% with parentTitle="Opportunity" %}{{ block.super }}{% endwith %}{% endblock %} + +{% block h1 %}{{ page.landingpage.header }}{{ block.super }}{% endblock %} + +{% block signup %} +{% if page.landingpage.signup %} +
+{% endif %} {% endblock %} diff --git a/network-api/networkapi/templates/pages/menus/side-menu-items.html b/network-api/networkapi/templates/pages/menus/side-menu-items.html index 2490d54c6cd..590c0001d48 100644 --- a/network-api/networkapi/templates/pages/menus/side-menu-items.html +++ b/network-api/networkapi/templates/pages/menus/side-menu-items.html @@ -2,12 +2,10 @@ {% for page in page_branch %} {% if page.in_menu %} {% if page.is_current_or_ascendant or page.is_current_child or page.is_current_sibling and page.branch_level > 1 %} - {% if page.branch_level > 0 %} - {% if page.has_children or page.branch_level > 1 %} -
- {{ page.title }} -
- {% endif %} + {% if page.branch_level > 1 %} +
+ {{ page.title }} +
{% endif %} {% page_menu page %} {% endif %}