From ca9e042cc4fcdd597fc7db08401f0578f786e656 Mon Sep 17 00:00:00 2001 From: Josh Simmons Date: Sat, 8 Jun 2019 11:51:42 -0700 Subject: [PATCH 1/4] change to 2019 dates, swap in CFP for ticket links --- pinaxcon/templates/static_pages/homepage.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index 2a24bf3..6b3d589 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -6,7 +6,7 @@ {% load sponsorship_tags %} {% load schedule_tags %} -{% block head_title %}November 3 and 4, 2018{% endblock %} +{% block head_title %}November 2 and 3, 2019{% endblock %} {% block body_class %}home{% endblock %} @@ -32,8 +32,8 @@

- November 3 & 4, 2018
- Tickets on sale now! + November 2 & 3, 2019
+ {% comment %}Tickets on sale now!{% endcomment %}

@@ -69,13 +69,14 @@
- Buy a Ticket! + Submit a Proposal! Twitter Facebook
+{% comment %}

Speakers

@@ -123,7 +124,6 @@
{% endfor %} -{% comment %}
@@ -135,8 +135,8 @@
-{% endcomment %}
+{% endcomment %}
From 766f7f40441dc31a4655bed2a9289527b0cef95d Mon Sep 17 00:00:00 2001 From: Josh Simmons Date: Sat, 8 Jun 2019 11:54:52 -0700 Subject: [PATCH 2/4] Revert "change to 2019 dates, swap in CFP for ticket links" This reverts commit ca9e042cc4fcdd597fc7db08401f0578f786e656. --- pinaxcon/templates/static_pages/homepage.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index 6b3d589..2a24bf3 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -6,7 +6,7 @@ {% load sponsorship_tags %} {% load schedule_tags %} -{% block head_title %}November 2 and 3, 2019{% endblock %} +{% block head_title %}November 3 and 4, 2018{% endblock %} {% block body_class %}home{% endblock %} @@ -32,8 +32,8 @@

- November 2 & 3, 2019
- {% comment %}Tickets on sale now!{% endcomment %} + November 3 & 4, 2018
+ Tickets on sale now!

-{% comment %}

Speakers

@@ -124,6 +123,7 @@
{% endfor %} +{% comment %}
@@ -135,8 +135,8 @@
-
{% endcomment %} +
From 72f260b5f3d131266c7eb9e7552c2f283b4e0c54 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer <_@chrisjrn.com> Date: Sat, 8 Jun 2019 17:09:20 -0700 Subject: [PATCH 3/4] Moves Homepage for refactorating --- pinaxcon/templates/_styles.html | 2 +- pinaxcon/templates/static_pages/homepage.html | 197 +------------- .../templates/static_pages/homepage0.html | 250 ++++++++++++++++++ 3 files changed, 252 insertions(+), 197 deletions(-) create mode 100644 pinaxcon/templates/static_pages/homepage0.html diff --git a/pinaxcon/templates/_styles.html b/pinaxcon/templates/_styles.html index dbcba58..8b46441 100644 --- a/pinaxcon/templates/_styles.html +++ b/pinaxcon/templates/_styles.html @@ -2,7 +2,7 @@ {% load staticfiles %} - + {% compress css %} diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index 2a24bf3..9a02f26 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -27,7 +27,7 @@

- The Mystic Theatre
+ The Mystic Theatre
Petaluma, California

@@ -36,32 +36,6 @@ Tickets on sale now!
-
@@ -77,174 +51,5 @@
-
-

Speakers

- -
- -
-
-
-
-
-
-

Mariatta Wijaya

- Keynote Speaker -
- -
-
-
-
-
-
-

Robert M. "r0ml" Lefkowitz

- Keynote Speaker -
- - {% speakers as speakers %} - {% for speaker in speakers %} -
-
-
- {% if speaker.photo %} -
- {% else %} -
- {% endif %} -
-
- {% for presentation in speaker.all_presentations %} - -

{{ speaker.conferencespeaker.name }}

- {{ presentation.title }} - - {% endfor %} -
- {% endfor %} - -{% comment %} -
-
-
-
-
-
-

VM Brasseur

- Speaker Training -
- -
-{% endcomment %}
- -
-
-
-
- See the Schedule -
-
-
-
-
- - -
-
-
-

Downtown Petaluma

- -

North Bay Python's home is Petaluma, a delightfully quaint dairy town, nestled on a river at the edge of California's Wine Country. Here's what you can look forward to:

- -
    -
  • An historic venue with countless restaurants and coffee shops in walking distance
    • -
  • World-famous craft food and drink producers on your doorstep
    • -
  • Charming small-town hotels, as close as one block away
    • -
- -

… and it's only an hour away from San Francisco (on a good day).

-
- -
-
-
-
- Learn More - Hotels - Travel -
- -
- Image credit: Mystic Theatre, © 2017 Esten Hurtle (CC BY-SA 2.0) -
-
-
-
-
- -
-
-

Sponsors

- - {% sponsor_levels as levels %} - - -
- -
-
- Become a Sponsor -
-
-
- -
-
-
-

Inclusion and Diversity

- -

North Bay Python is proud to be founded on a commitment to inclusion and diversity. Here's what we commit to:

- -
    -
  • A strong Code of Conduct and enforcement policy built on the Python Software Foundation's PyCon US policy.
    • -
  • Diversity targets for speakers and attendees.
    • -
  • Financial assistance for speakers who need it.
    • -
  • Low-cost tickets, with fees enthusiastically waived on request.
    • -
-
- -
-
-
-
- Read the Code of Conduct -
- -
- Image credit: DjangoGirls Brisbane, © 2014 Richard Jones (CC BY 2.0) -
-
-
-
-
- {% endblock %} diff --git a/pinaxcon/templates/static_pages/homepage0.html b/pinaxcon/templates/static_pages/homepage0.html new file mode 100644 index 0000000..2a24bf3 --- /dev/null +++ b/pinaxcon/templates/static_pages/homepage0.html @@ -0,0 +1,250 @@ +{% extends "site_base_home.html" %} + +{% load i18n %} +{% load staticfiles %} +{% load thumbnail %} +{% load sponsorship_tags %} +{% load schedule_tags %} + +{% block head_title %}November 3 and 4, 2018{% endblock %} + +{% block body_class %}home{% endblock %} + +{% block body %} + +
+
+
+
+
+
+
+
+

North Bay Python

+

The Python conference in a live music venue

+
+ +
+
+

+ The Mystic Theatre
+ Petaluma, California +

+ +

+ November 3 & 4, 2018
+ Tickets on sale now! +

+
+ + +
+ +
+ +
+ +
+
+ +
+
+

Speakers

+ +
+ +
+
+
+
+
+
+

Mariatta Wijaya

+ Keynote Speaker +
+ +
+
+
+
+
+
+

Robert M. "r0ml" Lefkowitz

+ Keynote Speaker +
+ + {% speakers as speakers %} + {% for speaker in speakers %} +
+
+
+ {% if speaker.photo %} +
+ {% else %} +
+ {% endif %} +
+
+ {% for presentation in speaker.all_presentations %} + +

{{ speaker.conferencespeaker.name }}

+ {{ presentation.title }} + + {% endfor %} +
+ {% endfor %} + +{% comment %} +
+
+
+
+
+
+

VM Brasseur

+ Speaker Training +
+ +
+{% endcomment %} +
+ +
+
+
+
+ See the Schedule +
+
+
+
+
+ + +
+
+
+

Downtown Petaluma

+ +

North Bay Python's home is Petaluma, a delightfully quaint dairy town, nestled on a river at the edge of California's Wine Country. Here's what you can look forward to:

+ +
    +
  • An historic venue with countless restaurants and coffee shops in walking distance
    • +
  • World-famous craft food and drink producers on your doorstep
    • +
  • Charming small-town hotels, as close as one block away
    • +
+ +

… and it's only an hour away from San Francisco (on a good day).

+
+ +
+
+
+
+ Learn More + Hotels + Travel +
+ +
+ Image credit: Mystic Theatre, © 2017 Esten Hurtle (CC BY-SA 2.0) +
+
+
+
+
+ +
+
+

Sponsors

+ + {% sponsor_levels as levels %} + + +
+ +
+
+ Become a Sponsor +
+
+
+ +
+
+
+

Inclusion and Diversity

+ +

North Bay Python is proud to be founded on a commitment to inclusion and diversity. Here's what we commit to:

+ +
    +
  • A strong Code of Conduct and enforcement policy built on the Python Software Foundation's PyCon US policy.
    • +
  • Diversity targets for speakers and attendees.
    • +
  • Financial assistance for speakers who need it.
    • +
  • Low-cost tickets, with fees enthusiastically waived on request.
    • +
+
+ +
+
+
+
+ Read the Code of Conduct +
+ +
+ Image credit: DjangoGirls Brisbane, © 2014 Richard Jones (CC BY 2.0) +
+
+
+
+
+ +{% endblock %} From 2b4006877670e2d8ba91f06d435bdd269dd36873 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer <_@chrisjrn.com> Date: Sat, 8 Jun 2019 17:14:50 -0700 Subject: [PATCH 4/4] CFP -> Speak --- .../program/call_for_proposals.html | 24 ------------------- pinaxcon/templates/static_pages/speak.html | 24 +++++++++++++++++++ .../call_for_proposals.md => speak.md} | 14 +++++------ pinaxcon/urls.py | 7 +++--- 4 files changed, 35 insertions(+), 34 deletions(-) delete mode 100644 pinaxcon/templates/static_pages/program/call_for_proposals.html create mode 100644 pinaxcon/templates/static_pages/speak.html rename pinaxcon/templates/static_pages/{program/call_for_proposals.md => speak.md} (94%) diff --git a/pinaxcon/templates/static_pages/program/call_for_proposals.html b/pinaxcon/templates/static_pages/program/call_for_proposals.html deleted file mode 100644 index 7a7983b..0000000 --- a/pinaxcon/templates/static_pages/program/call_for_proposals.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "page_with_title_and_lede.html" %} - -{% load i18n %} -{% load markdown_deux_tags %} - -{% block head_title %}Call for Proposals{% endblock %} - -{% block heading %}Call for Proposals{% endblock %} - -{% block body_class %}program{% endblock %} - -{% block lede %} - -North Bay Python is seeking speakers of all experience levels to contribute to our second conference program! We'd love to hear from you whether you use Python professionally, as a hobbyist, or are just excited about Python, programming, and free and open source software. - -{% endblock %} - -{% block content %} - {% markdown %} - -{% include "static_pages/program/call_for_proposals.md" %} - - {% endmarkdown %} -{% endblock %} diff --git a/pinaxcon/templates/static_pages/speak.html b/pinaxcon/templates/static_pages/speak.html new file mode 100644 index 0000000..8d63c74 --- /dev/null +++ b/pinaxcon/templates/static_pages/speak.html @@ -0,0 +1,24 @@ +{% extends "page_with_title_and_lede.html" %} + +{% load i18n %} +{% load markdown_deux_tags %} + +{% block head_title %}Speak at North Bay Python{% endblock %} + +{% block heading %}Speak at North Bay Python{% endblock %} + +{% block body_class %}program{% endblock %} + +{% block lede %} + +North Bay Python is seeking speakers of all experience levels to contribute to our conference program! We'd love to hear from you whether you use Python professionally, as a hobbyist, or are just excited about Python, programming, and free and open source software. + +{% endblock %} + +{% block content %} + {% markdown %} + +{% include "static_pages/speak.md" %} + + {% endmarkdown %} +{% endblock %} diff --git a/pinaxcon/templates/static_pages/program/call_for_proposals.md b/pinaxcon/templates/static_pages/speak.md similarity index 94% rename from pinaxcon/templates/static_pages/program/call_for_proposals.md rename to pinaxcon/templates/static_pages/speak.md index fc3a708..fccf869 100644 --- a/pinaxcon/templates/static_pages/program/call_for_proposals.md +++ b/pinaxcon/templates/static_pages/speak.md @@ -1,4 +1,4 @@ -### The North Bay Python 2018 CFP is open! +### Proposal submissions for North Bay Python 2019 are open! There's information and resources below that you should read, but in case you've already read it and want to dive in now: @@ -14,11 +14,11 @@ Portions of this page were drawn from ideas seen on [DjangoCon EU](https://djang ## Dates -+ **July 5**: CFP opens -+ **August 10**: CFP closes -+ **Week of September 10**: Acceptance notifications sent -+ **Week of September 17**: Speaker confirmations due; program finalized and announced -+ **November 3–4**: Conference happens! ++ **July 1**: Proposal submissions open ++ **August 8**: Proposal submissions close ++ **Week of August 23**: Acceptance notifications sent ++ **Week of September 9**: Speaker confirmations due; program finalized and announced ++ **November 2–3**: Conference happens! ## Speaker Benefits @@ -37,7 +37,7 @@ North Bay Python is a conference in support of the local programmer community ou ## Audience -We anticipate more than 300 attendees at our 2018 conference. In 2017, we had 230 attendees from California and beyond, including: +We anticipate 200-300 attendees at our 2019 conference. In 2017, we had 230 attendees from California and beyond, including: + 78% from the San Francisco Bay Area, including 25% from Sonoma County + 5% from elsewhere in California diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index a54b73c..112d52b 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -28,10 +28,11 @@ urlpatterns = [ # program url(r"^program/events$", TemplateView.as_view(template_name="static_pages/program/events.html"), name="program/events"), url(r"^events$", RedirectView.as_view(url="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/call-for-proposals$", RedirectView.as_view(url="/speak")), url(r"^program/selection-process$", TemplateView.as_view(template_name="static_pages/program/selection_process.html"), name="program/selection-process"), - url(r"^proposals$", RedirectView.as_view(url="program/call-for-proposals")), - url(r"^cfp$", RedirectView.as_view(url="program/call-for-proposals")), + url(r"^proposals$", RedirectView.as_view(url="/speak")), + url(r"^cfp$", RedirectView.as_view(url="/speak")), + url(r"^speak$", TemplateView.as_view(template_name="static_pages/speak.html"), name="speak"), # attend url(r"^attend$", TemplateView.as_view(template_name="static_pages/attend/attend.html"), name="attend/attend"),