rejigger url scheme, organize static pages, and stub out last two pages needed for launch

pinaxcon/templates/_footer.html

@@ -1,6 +1,6 @@
 <div class="pull-left">
     North Bay Python is a member project of the <a href="https://sfconservancy.org">Software Freedom Conservancy</a>, a 501(c)(3) charity.<br/>
-    <a href="/code-of-conduct">Code of Conduct</a> | <a href="/colophon">Colophon</a> | <a href="/terms-conditions">Terms and Conditions</a>
+    <a href="/code-of-conduct">Code of Conduct</a> | <a href="/terms-and-conditions">Terms and Conditions</a> | <a href="/about/colophon">Colophon</a>
 </div>
 
 <div class="pull-right">

pinaxcon/templates/static_pages/about/colophon.html

@@ -6,7 +6,7 @@
 
 {% block heading %}Colophon{% endblock %}
 
-{% block body_class %}colophon{% endblock %}
+{% block body_class %}about{% endblock %}
 
 {% block content %}
 

pinaxcon/templates/static_pages/about/team.html

@@ -0,0 +1,13 @@
+{% extends "page_with_title_and_lede.html" %}
+
+{% load i18n %}
+
+{% block head_title %}About the Team{% endblock %}
+
+{% block heading %}About the Team{% endblock %}
+
+{% block body_class %}about{% endblock %}
+
+{% block content %}
+
+{% endblock %}

pinaxcon/templates/static_pages/code-of-conduct/code-of-conduct.html

@@ -12,7 +12,7 @@
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/code-of-conduct.md" %}
+{% include "static_pages/code-of-conduct/code-of-conduct.md" %}
 
   {% endmarkdown %}
 {% endblock %}

pinaxcon/templates/static_pages/code-of-conduct/code-of-conduct.md

@@ -33,7 +33,7 @@ If a participant engages in behavior that violates this code of conduct, the con
 Contact Information
 -------------------
 
-If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff. Conference staff will be wearing t-shirts and/or badges that clearly identify them as staff. You may also contact venue staff and ask to be put in touch with the conference chair — Chris Neugebauer.
+If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff. Conference staff will be wearing t-shirts and/or badges that clearly identify them as staff. You may also contact venue staff and ask to be put in touch with the conference chair — Christopher Neugebauer.
 
 If the matter is especially urgent, please call our Code of Conduct and safety incident hotline at XXX-YYY-ZZZZ. This number will automatically route to a member of the conference staff who can render assistance.
 

pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-attendee.html

@@ -12,7 +12,7 @@
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/harassment-procedure-attendee.md" %}
+{% include "static_pages/code-of-conduct/harassment-procedure-attendee.md" %}
 
   {% endmarkdown %}
 {% endblock %}

pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-attendee.md

@@ -20,4 +20,4 @@ The staff is well informed on how to deal with the incident and how to further p
 
 **Note**: Incidents that violate the Code of Conduct are extremely damaging to the community, and they will not be tolerated. The silver lining is that, in many cases, these incidents present a chance for the offenders, and the community at large, to grow, learn, and become better. North Bay Python staff requests that they be your first resource when reporting a North Bay Python-related incident, so that they may enforce the Code of Conduct and take quick action toward a resolution.
 
-A listing of [North Bay Python staff is located here](/about/staff), including contact phone numbers. If at all possible, all reports should be made directly to Bleep and Bloop.
+A listing of [North Bay Python staff is located here](/about/team), including contact phone numbers. If at all possible, all reports should be made directly to Bleep and Bloop.

pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-staff.html

@@ -12,7 +12,7 @@
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/harassment-procedure-staff.md" %}
+{% include "static_pages/code-of-conduct/harassment-procedure-staff.md" %}
 
   {% endmarkdown %}
 {% endblock %}

pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-staff.md

@@ -62,4 +62,4 @@ Depending on the incident, the conference chair, or designate, may decide to mak
 
 If some attendees were angered by the incident, it is best to apologize to them that the incident occurred to begin with.  If there are residual hard feelings, suggest to them to write an email to the conference chair or to the event coordinator. It will be dealt with accordingly.
 
-A listing of [North Bay Python staff is located here](/about/staff), including contact phone numbers. If at all possible, all reports should be made directly to Bleep and Bloop.
+A listing of [North Bay Python staff is located here](/about/team), including contact phone numbers. If at all possible, all reports should be made directly to Bleep and Bloop.

pinaxcon/templates/static_pages/program/call-for-proposals.html

@@ -7,12 +7,12 @@
 
 {% block heading %}Call for Proposals{% endblock %}
 
-{% block body_class %}proposals{% endblock %}
+{% block body_class %}program{% endblock %}
 
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/proposals.md" %}
+{% include "static_pages/program/call-for-proposals.md" %}
 
   {% endmarkdown %}
 {% endblock %}

pinaxcon/templates/static_pages/program/call-for-proposals.md

@@ -6,7 +6,7 @@ North Bay Python is seeking speakers of all experience levels, especially first-
 
 If you've never presented at a conference before and think you might like to try it, we want to hear from you! The program committee is *very* much interested in encouraging and supporting new speakers, and we will be able to provide detailed feedback and work with you to develop your proposal and talk content so you can give the best talk possible.
 
-In the interest of transparency, we have documented our [Selection Process](./selection-process).
+In the interest of transparency, we have documented our [Selection Process](/program/selection-process).
 
 ## Dates
 
@@ -20,7 +20,7 @@ In the interest of transparency, we have documented our [Selection Process](./se
 
 North Bay Python is dedicated to featuring a diverse and inclusive speaker lineup.
 
-**All speakers will be expected to have read and adhere to the conference [Code of Conduct](./code-of-conduct). In particular for speakers: slide contents and spoken material should be appropriate for a professional audience including people of many different backgrounds. Sexual language and imagery is not appropriate, and neither are language or imagery that denigrate or demean people based on race, gender, religion, sexual orientation, physical appearance, disability, or body size.**
+**All speakers will be expected to have read and adhere to the conference [Code of Conduct](/code-of-conduct). In particular for speakers: slide contents and spoken material should be appropriate for a professional audience including people of many different backgrounds. Sexual language and imagery is not appropriate, and neither are language or imagery that denigrate or demean people based on race, gender, religion, sexual orientation, physical appearance, disability, or body size.**
 
 We will make every effort to provide accommodations for speakers and attendees of all abilities — all we ask is that you let us know so we can prepare accordingly.
 

pinaxcon/templates/static_pages/program/selection-process.html

@@ -7,12 +7,12 @@
 
 {% block heading %}Selection Process{% endblock %}
 
-{% block body_class %}selection-process{% endblock %}
+{% block body_class %}program{% endblock %}
 
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/selection-process.md" %}
+{% include "static_pages/program/selection-process.md" %}
 
   {% endmarkdown %}
 {% endblock %}

pinaxcon/templates/static_pages/sponsors/become-a-sponsor.html

@@ -2,9 +2,9 @@
 
 {% load i18n %}
 
-{% block head_title %}Call for Sponsors{% endblock %}
+{% block head_title %}Become a Sponsors{% endblock %}
 
-{% block heading %}Call for Sponsors{% endblock %}
+{% block heading %}Become a Sponsors{% endblock %}
 
 {% block body_class %}sponsors{% endblock %}
 

pinaxcon/templates/static_pages/terms-and-conditions.html

@@ -0,0 +1,13 @@
+{% extends "page_with_title_and_lede.html" %}
+
+{% load i18n %}
+
+{% block head_title %}Terms and Conditions{% endblock %}
+
+{% block heading %}Terms and Conditions{% endblock %}
+
+{% block body_class %}terms-and-conditions{% endblock %}
+
+{% block content %}
+
+{% endblock %}

pinaxcon/urls.py

@@ -10,17 +10,44 @@ import symposion.views
 
 urlpatterns = [
     url(r"^$", TemplateView.as_view(template_name="static_pages/homepage.html"), name="home"),
-    url(r"^about$", TemplateView.as_view(template_name="static_pages/about.html"), name="about"),
+
+    # about
+    # TODO add /about
+    url(r"^about/north-bay-python$", TemplateView.as_view(template_name="static_pages/about/north-bay-python.html"), name="about/north-bay-python"),
+    # TODO add /about/the-mystic
+    # TODO add /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"),
+
+    # program
+    # TODO add /program
+    # TODO add /program/sessions
+    # TODO add /program/events
+    url(r"^program/call-for-proposals$", TemplateView.as_view(template_name="static_pages/program/call-for-proposals.html"), name="program/call-for-proposals"),
+    url(r"^program/selection-process$", TemplateView.as_view(template_name="static_pages/program/selection-process.html"), name="program/selection-process"),
+
+    # attend
+    # TODO add /attend
+    # TODO add /attend/buy-a-ticket
+    # TODO add /attend/volunteer
+    # TODO add /attend/financial-assistance
+    # TODO add /attend/how-to-pitch-your-manager
+    # TODO add /attend/how-to-get-here
+    # TODO add /attend/where-to-stay
+    url(r"^code-of-conduct$", TemplateView.as_view(template_name="static_pages/code-of-conduct/code-of-conduct.html"), name="code-of-conduct"),
+    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"),
+
+    # sponsor
+    # TODO add /sponsors
+    url(r"^sponsors/become-a-sponsor$", TemplateView.as_view(template_name="static_pages/sponsors/become-a-sponsor.html"), name="sponsors/become-a-sponsor"),
+
+    # news
     url(r"^news$", TemplateView.as_view(template_name="static_pages/news.html"), name="news"),
-    url(r"^sponsors$", TemplateView.as_view(template_name="static_pages/sponsors.html"), name="sponsors"),
-    url(r"^colophon$", TemplateView.as_view(template_name="static_pages/colophon.html"), name="colophon"),
 
-    url(r"^proposals$", TemplateView.as_view(template_name="static_pages/proposals.html"), name="proposals"),
+    # Django, Symposion, and Registrasion URLs
-    url(r"^selection-process$", TemplateView.as_view(template_name="static_pages/selection-process.html"), name="selection-process"),
 
-    url(r"^code-of-conduct$", TemplateView.as_view(template_name="static_pages/code-of-conduct.html"), name="code-of-conduct"),
-    url(r"^code-of-conduct/harassment-incidents$", TemplateView.as_view(template_name="static_pages/harassment-procedure-attendee.html"), name="harassment-procedure-attendee"),
-    url(r"^code-of-conduct/harassment-staff-procedures$", TemplateView.as_view(template_name="static_pages/harassment-procedure-staff.html"), name="harassment-procedure-staff"),
     url(r"^admin/", include(admin.site.urls)),
 
     url(r"^account/", include("account.urls")),