diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html index 8dffd631a6a8302b539a7d7ebd96f12fd38a8c19..584ec2975fdca09ff1557e1e3273a26ff2d3ea1e 100644 --- a/pinaxcon/templates/_footer.html +++ b/pinaxcon/templates/_footer.html @@ -14,8 +14,9 @@ Facebook | Twitter | Code of Conduct + | Terms and Conditions | Colophon - | Donate + | Donate

This site is free and open source software, powered by Symposion and Registrasion.

diff --git a/pinaxcon/templates/static_pages/about/petaluma.html b/pinaxcon/templates/static_pages/about/petaluma.html index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4ab735a5b850565ea30a2386a8ce7b9c0163beaa 100644 --- a/pinaxcon/templates/static_pages/about/petaluma.html +++ b/pinaxcon/templates/static_pages/about/petaluma.html @@ -0,0 +1,20 @@ +{% extends "page_with_title_and_lede.html" %} + +{% load i18n %} + +{% block head_title %}Petaluma{% endblock %} + +{% block heading %}Petaluma{% endblock %} + +{% block body_class %}about{% endblock %} + +{% block lede %} + Lede +{% endblock %} + + +{% block content %} + +Content + +{% endblock %} diff --git a/pinaxcon/templates/static_pages/attend/attend.html b/pinaxcon/templates/static_pages/attend/attend.html index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3a0590ba83ced89579c2d57c8665ab682d2b2555 100644 --- a/pinaxcon/templates/static_pages/attend/attend.html +++ b/pinaxcon/templates/static_pages/attend/attend.html @@ -0,0 +1,20 @@ +{% extends "page_with_title_and_lede.html" %} + +{% load i18n %} + +{% block head_title %}Attend{% endblock %} + +{% block heading %}Attend{% endblock %} + +{% block body_class %}attend{% endblock %} + +{% block lede %} + Lede +{% endblock %} + + +{% block content %} + +Content + +{% endblock %} diff --git a/pinaxcon/templates/static_pages/attend/business-case.html b/pinaxcon/templates/static_pages/attend/business-case.html index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..06e0fa4651b56eda12d8d4df98f1bef6cca8d118 100644 --- a/pinaxcon/templates/static_pages/attend/business-case.html +++ b/pinaxcon/templates/static_pages/attend/business-case.html @@ -0,0 +1,20 @@ +{% extends "page_with_title_and_lede.html" %} + +{% load i18n %} + +{% block head_title %}How to Pitch Your Manager{% endblock %} + +{% block heading %}How to Pitch Your Manager{% endblock %} + +{% block body_class %}attend{% endblock %} + +{% block lede %} + Lede +{% endblock %} + + +{% block content %} + +Content + +{% endblock %} diff --git a/pinaxcon/templates/static_pages/attend/hotels.html b/pinaxcon/templates/static_pages/attend/hotels.html index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3cd9fe0d04f4574df55424c05b9b06bf08704df8 100644 --- a/pinaxcon/templates/static_pages/attend/hotels.html +++ b/pinaxcon/templates/static_pages/attend/hotels.html @@ -0,0 +1,20 @@ +{% extends "page_with_title_and_lede.html" %} + +{% load i18n %} + +{% block head_title %}Where to Stay{% endblock %} + +{% block heading %}Where to Stay{% endblock %} + +{% block body_class %}attend{% endblock %} + +{% block lede %} + Lede +{% endblock %} + + +{% block content %} + +Content + +{% endblock %} diff --git a/pinaxcon/templates/static_pages/attend/travel.html b/pinaxcon/templates/static_pages/attend/travel.html index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..73811c5e30838635101ead906c70a56a9ca82845 100644 --- a/pinaxcon/templates/static_pages/attend/travel.html +++ b/pinaxcon/templates/static_pages/attend/travel.html @@ -0,0 +1,20 @@ +{% extends "page_with_title_and_lede.html" %} + +{% load i18n %} + +{% block head_title %}How to Get Here{% endblock %} + +{% block heading %}How to Get Here{% endblock %} + +{% block body_class %}attend{% endblock %} + +{% block lede %} + Lede +{% endblock %} + + +{% block content %} + +Content + +{% endblock %} diff --git a/pinaxcon/templates/static_pages/program/events.html b/pinaxcon/templates/static_pages/program/events.html index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8942f9ecb2f8b7b71bdaa4d292638a5f2864b3aa 100644 --- a/pinaxcon/templates/static_pages/program/events.html +++ b/pinaxcon/templates/static_pages/program/events.html @@ -0,0 +1,20 @@ +{% extends "page_with_title_and_lede.html" %} + +{% load i18n %} + +{% block head_title %}Events{% endblock %} + +{% block heading %}Events{% endblock %} + +{% block body_class %}program{% endblock %} + +{% block lede %} + Lede +{% endblock %} + + +{% block content %} + +Content + +{% endblock %} diff --git a/pinaxcon/templates/static_pages/about/donate.html b/pinaxcon/templates/static_pages/sponsors/donate.html similarity index 97% rename from pinaxcon/templates/static_pages/about/donate.html rename to pinaxcon/templates/static_pages/sponsors/donate.html index 2144ef666fe1dec43479f515c6c9fdfe8a5826a7..ee4de4909ccee6a9f103a3b1932404007639ce7e 100644 --- a/pinaxcon/templates/static_pages/about/donate.html +++ b/pinaxcon/templates/static_pages/sponsors/donate.html @@ -6,7 +6,7 @@ {% block heading %}Donate to North Bay Python{% endblock %} -{% block body_class %}about{% endblock %} +{% block body_class %}sponsors{% endblock %} {% block lede %} Donations to North Bay Python are processed by Software Freedom Conservancy, Inc. a 501(c)(3) organization incorporated in New York, and donations made to it are fully tax-deductible to the extent permitted by law. diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 342404659f6563a93dccd2a5ecafa85282d3fe18..2f18f6c2de2e60d4a748ef0752eb8640e7f3612f 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -20,8 +20,6 @@ urlpatterns = [ url(r"^about/petaluma$", TemplateView.as_view(template_name="static_pages/about/petaluma.html"), name="about/petaluma"), url(r"^about/team$", TemplateView.as_view(template_name="static_pages/about/team.html"), name="about/team"), url(r"^about/colophon$", TemplateView.as_view(template_name="static_pages/about/colophon.html"), name="about/colophon"), - url(r"^about/donate$", TemplateView.as_view(template_name="static_pages/about/donate.html"), name="about/donate"), - url(r"^donate$", RedirectView.as_view(url="about/donate")), # program url(r"^program/events$", TemplateView.as_view(template_name="static_pages/program/events.html"), name="program/events"), @@ -33,7 +31,6 @@ urlpatterns = [ # attend url(r"^attend$", TemplateView.as_view(template_name="static_pages/attend/attend.html"), name="attend/attend"), url(r"^tickets$", RedirectView.as_view(url="attend")), - url(r"^attend/business-case$", TemplateView.as_view(template_name="static_pages/attend/business-case.html"), name="attend/business-case"), url(r"^attend/travel$", TemplateView.as_view(template_name="static_pages/attend/travel.html"), name="attend/travel"), url(r"^attend/hotels$", TemplateView.as_view(template_name="static_pages/attend/hotels.html"), name="attend/hotels"), @@ -42,11 +39,15 @@ urlpatterns = [ url(r"^code-of-conduct/harassment-incidents$", TemplateView.as_view(template_name="static_pages/code_of_conduct/harassment_procedure_attendee.html"), name="code-of-conduct/harassment-incidents"), url(r"^code-of-conduct/harassment-staff-procedures$", TemplateView.as_view(template_name="static_pages/code_of_conduct/harassment_procedure_staff.html"), name="code-of-conduct/harassment-staff-procedures"), url(r"^terms-and-conditions$", TemplateView.as_view(template_name="static_pages/terms_and_conditions.html"), name="terms-and-conditions"), + url(r"^terms$", RedirectView.as_view(url="terms-and-conditions")), # sponsor url(r"^sponsors/prospectus$", RedirectView.as_view(url=_static("assets/northbaypython_prospectus.pdf")), name="sponsors/prospectus"), url(r"^northbaypython_prospectus.pdf$", RedirectView.as_view(url=_static("assets/northbaypython_prospectus.pdf")), name="northbaypython_prospectus.pdf"), url(r"^sponsors/become-a-sponsor$", TemplateView.as_view(template_name="static_pages/sponsors/become_a_sponsor.html"), name="sponsors/become-a-sponsor"), + url(r"^sponsors/donate$", TemplateView.as_view(template_name="static_pages/sponsors/donate.html"), name="sponsors/donate"), + url(r"^donate$", RedirectView.as_view(url="sponsors/donate")), + url(r"^about/donate$", RedirectView.as_view(url="sponsors/donate")), # news url(r"^news$", TemplateView.as_view(template_name="static_pages/news.html"), name="news"),