From cb4943a7d045f826c8a55e095dd3cc519f89a9b0 2017-06-08 00:51:13 From: Christopher Neugebauer Date: 2017-06-08 00:51:13 Subject: [PATCH] Adds some bare pages for things that aren’t the homepage. --- diff --git a/fixtures/sitetree.json b/fixtures/sitetree.json index 44273d6461f7e2fe7c815b8373d8456bf78b3933..d344ec0deccf0acb0f24143e035dfccf903de89a 100644 --- a/fixtures/sitetree.json +++ b/fixtures/sitetree.json @@ -17,7 +17,7 @@ "description": "", "insitetree": true, "hint": "", - "url": "pages_page \"about/\"", + "url": "page_about", "inbreadcrumbs": true, "title": "About", "tree": 1, @@ -40,7 +40,7 @@ "description": "", "insitetree": true, "hint": "", - "url": "pages_page \"venue/\"", + "url": "page_venue", "inbreadcrumbs": true, "title": "Venue", "tree": 1, @@ -109,9 +109,9 @@ "description": "", "insitetree": true, "hint": "", - "url": "sponsor_apply", + "url": "page_sponsor_info", "inbreadcrumbs": true, - "title": "Apply to be a Sponsor", + "title": "Prospectus", "tree": 1, "access_perm_type": 1, "alias": null, diff --git a/pinaxcon/templates/homepage.html b/pinaxcon/templates/homepage.html index dba73ad62495329b6d956cd456ea8a7fc09e33de..25cd86850491aa60e91f2d1bac62624900e5ef40 100644 --- a/pinaxcon/templates/homepage.html +++ b/pinaxcon/templates/homepage.html @@ -1,12 +1,10 @@ {% extends "site_base.html" %} {% load i18n %} -{% load pinax_boxes_tags %} - -{% block head_title %}{% trans "Welcome" %}{% endblock %} {% block body_class %}home{% endblock %} {% block body %} - {% box "homepage" %} +

{{ SITE_NAME }}

+

Welcome to the demo site.

{% endblock %} diff --git a/pinaxcon/templates/page_with_title_and_lede.html b/pinaxcon/templates/page_with_title_and_lede.html new file mode 100644 index 0000000000000000000000000000000000000000..2e3a68765f72dbb6bca2d9cdd9c500426a7f8d07 --- /dev/null +++ b/pinaxcon/templates/page_with_title_and_lede.html @@ -0,0 +1,18 @@ +{% extends "site_base.html" %} + +{% block head_title %}{% block title %}{% endblock %}{% endblock %} + +{% block body %} + + {% block heading_base %} +

{% block heading %}{% endblock %}

+ {% endblock %} + + {% block lede_base %} +

{% block lede %}{% endblock %}

+ {% endblock %} + + {% block content %} + {% endblock %} + +{% endblock %} diff --git a/pinaxcon/templates/pages/about.html b/pinaxcon/templates/pages/about.html new file mode 100644 index 0000000000000000000000000000000000000000..48fe0c86bac21022723154b515cac6f30e38b2f8 --- /dev/null +++ b/pinaxcon/templates/pages/about.html @@ -0,0 +1,9 @@ +{% extends "page_with_title_and_lede.html" %} + +{% block title %}About {{ SITE_NAME }}{% endblock %} +{% block heading %}About {{ SITE_NAME }}{% endblock %} +{% block lede %}{{ SITE_NAME }} is the premier demo conference site for Symposion and Registrasion{% endblock %} + +{% block content %} +

I am the body content

+{% endblock %} diff --git a/pinaxcon/templates/pages/sponsors/info.html b/pinaxcon/templates/pages/sponsors/info.html new file mode 100644 index 0000000000000000000000000000000000000000..a213eb1c5e1bfd3af30790447c703a018d18a3b6 --- /dev/null +++ b/pinaxcon/templates/pages/sponsors/info.html @@ -0,0 +1,9 @@ +{% extends "page_with_title_and_lede.html" %} + +{% block title %}Sponsorship Prospectus{% endblock %} +{% block heading %}Sponsorship Prospectus{% endblock %} +{% block lede %}{{ SITE_NAME }} wants sponsors.{% endblock %} + +{% block content %} +

I am the body content

+{% endblock %} diff --git a/pinaxcon/templates/pages/venue.html b/pinaxcon/templates/pages/venue.html new file mode 100644 index 0000000000000000000000000000000000000000..ee3ea28ca958718d95623e78987c234b702d680f --- /dev/null +++ b/pinaxcon/templates/pages/venue.html @@ -0,0 +1,9 @@ +{% extends "page_with_title_and_lede.html" %} + +{% block title %}Venue{% endblock %} +{% block heading %}Venue{% endblock %} +{% block lede %}{{ SITE_NAME }} is being held on a Django Hosting facility, somewhere.{% endblock %} + +{% block content %} +

I am the body content

+{% endblock %} diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index 91e94fd5db844a5d6c3346c422a82e86067a7c6f..74e2fd51d377b6dc5bd6802773263c649fe81fde 100644 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -5,12 +5,10 @@ {% load i18n %} {% load sitetree %} - {% block styles %} {% include "_styles.html" %} {% endblock %} - {% block extra_head_base %} {% block extra_head %}{% endblock %} {% endblock %} diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 0c2901e94e761f9fbfe8f25cfae07f9c10cb53d6..5f09a259b0969c8f041b3a1e3b44e9c12dd8c85c 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -10,6 +10,15 @@ import symposion.views urlpatterns = [ url(r"^$", TemplateView.as_view(template_name="homepage.html"), name="home"), + + url(r"^about$", TemplateView.as_view(template_name="pages/about.html"), name="page_about"), + url(r"^venue$", TemplateView.as_view(template_name="pages/venue.html"), name="page_venue"), + url( + r"^sponsors/info$", + TemplateView.as_view(template_name="pages/sponsors/info.html"), + name="page_sponsor_info", + ), + url(r"^admin/", include(admin.site.urls)), url(r"^account/", include("account.urls")),