From 3f188729f9de6126f4ee6ca1259f42a6551fcd06 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sun, 13 Aug 2017 12:31:04 -0700 Subject: [PATCH 01/22] Target the northbaypython branch of symposion for now --- requirements/base.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 2fb7510..b182309 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -13,6 +13,7 @@ django-sitetree==1.8.0 django-countries==4.6.1 easy-thumbnails==2.4.1 django-timezone-field==2.0 +django-mode-utils==3.0.0 # For testing @@ -21,6 +22,6 @@ coverage==4.0.3 # Registrasion https://github.com/chrisjrn/registrasion/tarball/master#egg=registrasion -https://github.com/pinax/symposion/tarball/ad81810#egg=symposion +https://github.com/chrisjrn/symposion/tarball/northbaypython#egg=symposion https://github.com/chrisjrn/registrasion-stripe/tarball/master#egg=registrasion-stripe https://github.com/chrisjrn/symposion-bootstrap-templates/tarball/master#egg=symposion-bootstrap-templates From 1de0a5d46ab985417157998fe5e3145f3c749f74 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sun, 13 Aug 2017 12:31:22 -0700 Subject: [PATCH 02/22] Adds ConferenceSpeaker model to Symposion --- pinaxcon/proposals/forms.py | 21 +++++- .../migrations/0002_conferencespeaker.py | 33 ++++++++ pinaxcon/proposals/models.py | 75 +++++++++++++++++++ pinaxcon/settings.py | 3 + 4 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 pinaxcon/proposals/migrations/0002_conferencespeaker.py diff --git a/pinaxcon/proposals/forms.py b/pinaxcon/proposals/forms.py index b8d52ad..0bbbe91 100644 --- a/pinaxcon/proposals/forms.py +++ b/pinaxcon/proposals/forms.py @@ -1,6 +1,25 @@ from django import forms -from .models import TalkProposal +from .models import ConferenceSpeaker, TalkProposal + + +class ConferenceSpeakerForm(forms.ModelForm): + + class Meta: + model = ConferenceSpeaker + exclude = [ + 'user', + 'biography_html', + 'experience_html', + 'invite_email', + 'invite_token', + 'annotation', + ] + + def __init__(self, *a, **k): + super(ConferenceSpeakerForm, self).__init__(*a, **k) + self.fields['code_of_conduct'].required = True + class ProposalForm(forms.ModelForm): diff --git a/pinaxcon/proposals/migrations/0002_conferencespeaker.py b/pinaxcon/proposals/migrations/0002_conferencespeaker.py new file mode 100644 index 0000000..52f1657 --- /dev/null +++ b/pinaxcon/proposals/migrations/0002_conferencespeaker.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2017-08-13 18:45 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('symposion_speakers', '0007_auto_20170810_1651'), + ('proposals', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='ConferenceSpeaker', + fields=[ + ('speakerbase_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='symposion_speakers.SpeakerBase')), + ('twitter_username', models.CharField(blank=True, help_text='Your Twitter account', max_length=15)), + ('first_time', models.BooleanField(help_text='')), + ('experience', models.TextField(blank=True, help_text="List any past speaking experience you have. Edit using Markdown.", verbose_name='Past speaking experience')), + ('experience_html', models.TextField(blank=True)), + ('travel_assistance', models.BooleanField(help_text='Check this field if you require travel assistance to get to North Bay Python in Petaluma, California.')), + ('lodging_assistance', models.BooleanField(help_text='Check this field if you require lodging assistance in Petaluma, California during North Bay Python.')), + ('home_city', models.CharField(blank=True, help_text='Which city (and state, and country) will you be traveling from to get to North Bay Python?', max_length=127)), + ('minority_group', models.CharField(blank=True, help_text='If you are a member of one or more groups that are underrepresented in the tech industry, you may list these here. Your response is optional.', max_length=256, verbose_name='Diversity statement')), + ('code_of_conduct', models.BooleanField(help_text="I have read and, in the event that my proposal is accepted, agree that I will comply with the Code of Conduct.")), + ], + bases=('symposion_speakers.speakerbase',), + ), + ] diff --git a/pinaxcon/proposals/models.py b/pinaxcon/proposals/models.py index 2da49d8..97a1d9f 100644 --- a/pinaxcon/proposals/models.py +++ b/pinaxcon/proposals/models.py @@ -1,6 +1,81 @@ from django.db import models +from django.utils.translation import ugettext_lazy as _ +from symposion.markdown_parser import parse from symposion.proposals.models import ProposalBase +from symposion.speakers.models import SpeakerBase + + + +class ConferenceSpeaker(SpeakerBase): + + def clean_twitter_username(self): + value = self.twitter_username + if value.startswith("@"): + value = value[1:] + return value + + def save(self, *args, **kwargs): + self.experience_html = parse(self.experience) + self.twitter_username = self.clean_twitter_username() + return super(ConferenceSpeaker, self).save(*args, **kwargs) + + twitter_username = models.CharField( + max_length=15, + blank=True, + help_text=_(u"Your Twitter account") + ) + + first_time = models.BooleanField( + blank=True, + verbose_name=_("First-time speaker?"), + help_text=_("Check this field if this is your first time speaking " + "at a technical conference."), + ) + + experience = models.TextField(blank=True, help_text=_ + ("List any past speaking experience you have. This can include " + "user groups, meetups, or presentations at work or school. Edit " + "using " + "Markdown."), + verbose_name=_("Past speaking experience"), + ) + experience_html = models.TextField(blank=True) + + travel_assistance = models.BooleanField( + blank=True, + verbose_name=_("Travel assistance required?"), + help_text=_("Check this field if you require travel assistance to get " + "to North Bay Python in Petaluma, California."), + ) + + lodging_assistance = models.BooleanField( + blank=True, + verbose_name=_("Lodging assistance required?"), + help_text=_("Check this field if you require lodging assistance in " + "Petaluma, California during North Bay Python."), + ) + + home_city = models.CharField( + blank=True, + max_length=127, + help_text=_("Which city (and state, and country) will you be " + "traveling from to get to North Bay Python?"), + ) + + minority_group = models.CharField(blank=True, max_length=256, + verbose_name=_("Diversity statement"), + help_text=_("If you are a member of one or more groups that are " + "under-represented in the tech industry, you may list " + "these here. Your response is optional."), + ) + + code_of_conduct = models.BooleanField( + help_text=_("I have read and, in the event that my proposal is " + "accepted, agree that I will comply with the " + "Code of Conduct."), + ) class Proposal(ProposalBase): diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index d1e0f0f..f403c4b 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -256,6 +256,9 @@ PINAX_STRIPE_PUBLIC_KEY = os.environ.get("STRIPE_PUBLIC_KEY", "your test public PINAX_STRIPE_SECRET_KEY = os.environ.get("STRIPE_SECRET_KEY", "your test secret key") PINAX_STRIPE_SEND_EMAIL_RECEIPTS = False +SYMPOSION_SPEAKER_MODEL = "pinaxcon.proposals.models.ConferenceSpeaker" +SYMPOSION_SPEAKER_FORM = "pinaxcon.proposals.forms.ConferenceSpeakerForm" + # Registrasion Attendee profile model ATTENDEE_PROFILE_MODEL = "pinaxcon.registrasion.models.AttendeeProfile" # Registrasion attendee profile form -- must act on ATTENDEE_PROFILE_FORM From 2ad649da3033a31bf5efbab3881f3d0023c2e207 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sun, 13 Aug 2017 12:52:57 -0700 Subject: [PATCH 03/22] Adds CFP fields --- pinaxcon/proposals/forms.py | 13 +++- .../migrations/0003_auto_20170813_1945.py | 69 +++++++++++++++++++ pinaxcon/proposals/models.py | 47 +++++++++---- 3 files changed, 114 insertions(+), 15 deletions(-) create mode 100644 pinaxcon/proposals/migrations/0003_auto_20170813_1945.py diff --git a/pinaxcon/proposals/forms.py b/pinaxcon/proposals/forms.py index 0bbbe91..b2a3337 100644 --- a/pinaxcon/proposals/forms.py +++ b/pinaxcon/proposals/forms.py @@ -1,4 +1,5 @@ from django import forms +from symposion.proposals.forms import ProposalMixIn from .models import ConferenceSpeaker, TalkProposal @@ -22,7 +23,12 @@ class ConferenceSpeakerForm(forms.ModelForm): -class ProposalForm(forms.ModelForm): +class ProposalForm(forms.ModelForm, ProposalMixIn): + + def __init__(self, *a, **k): + super(ProposalForm, self).__init__(*a, **k) + self.description_required() + self.abstract_required() def clean_description(self): value = self.cleaned_data["description"] @@ -39,9 +45,12 @@ class TalkProposalForm(ProposalForm): model = TalkProposal fields = [ "title", - "audience_level", "description", "abstract", + "new_presentation", + "extended_presentation", "additional_notes", + "extra_av", + "slides_release", "recording_release", ] diff --git a/pinaxcon/proposals/migrations/0003_auto_20170813_1945.py b/pinaxcon/proposals/migrations/0003_auto_20170813_1945.py new file mode 100644 index 0000000..0642b22 --- /dev/null +++ b/pinaxcon/proposals/migrations/0003_auto_20170813_1945.py @@ -0,0 +1,69 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2017-08-13 19:45 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('proposals', '0002_conferencespeaker'), + ] + + operations = [ + migrations.RemoveField( + model_name='talkproposal', + name='audience_level', + ), + migrations.AddField( + model_name='talkproposal', + name='extended_presentation', + field=models.BooleanField(default=False, help_text='Most talks at North Bay Python go for 30 minutes. We have some openings for 45-minute talks. If you check this field, please explain in your additional notes how you would use the extra 15 minutes.', verbose_name='Optionally consider this proposal for a 45-minute slot'), + ), + migrations.AddField( + model_name='talkproposal', + name='extra_av', + field=models.TextField(blank=True, help_text='We will provide you with a projector with HDMI connection, an audio connection, and one microphone per speaker. If you need anything more than this to present this talk, please list them here.', verbose_name='Extra tech and A/V requirements'), + ), + migrations.AddField( + model_name='talkproposal', + name='new_presentation', + field=models.BooleanField(default=False, help_text='Check this box if North Bay Python will be the first time this talk is presented at a technical conference.', verbose_name='This is a new presentation'), + ), + migrations.AddField( + model_name='talkproposal', + name='slides_release', + field=models.BooleanField(default=True, help_text='I authorize North Bay Python to release a copy of my slides and related materials under the Creative Commons Attribution-ShareAlike 3.0 United States licence, and certify that I have the authority to do so.'), + ), + migrations.AlterField( + model_name='conferencespeaker', + name='experience', + field=models.TextField(blank=True, help_text="List any past speaking experience you have. This can include user groups, meetups, or presentations at work or school. Edit using Markdown.", verbose_name='Past speaking experience'), + ), + migrations.AlterField( + model_name='conferencespeaker', + name='first_time', + field=models.BooleanField(help_text='Check this field if this is your first time speaking at a technical conference.', verbose_name='First-time speaker?'), + ), + migrations.AlterField( + model_name='conferencespeaker', + name='lodging_assistance', + field=models.BooleanField(help_text='Check this field if you require lodging assistance in Petaluma, California during North Bay Python.', verbose_name='Lodging assistance required?'), + ), + migrations.AlterField( + model_name='conferencespeaker', + name='minority_group', + field=models.CharField(blank=True, help_text='If you are a member of one or more groups that are under-represented in the tech industry, you may list these here. Your response is optional.', max_length=256, verbose_name='Diversity statement'), + ), + migrations.AlterField( + model_name='conferencespeaker', + name='travel_assistance', + field=models.BooleanField(help_text='Check this field if you require travel assistance to get to North Bay Python in Petaluma, California.', verbose_name='Travel assistance required?'), + ), + migrations.AlterField( + model_name='talkproposal', + name='recording_release', + field=models.BooleanField(default=True, help_text='I authorize North Bay Python to release a recording of my talk under the Creative Commons Attribution-ShareAlike 3.0 United States licence.'), + ), + ] diff --git a/pinaxcon/proposals/models.py b/pinaxcon/proposals/models.py index 97a1d9f..d0f81af 100644 --- a/pinaxcon/proposals/models.py +++ b/pinaxcon/proposals/models.py @@ -80,21 +80,42 @@ class ConferenceSpeaker(SpeakerBase): class Proposal(ProposalBase): - AUDIENCE_LEVEL_NOVICE = 1 - AUDIENCE_LEVEL_EXPERIENCED = 2 - AUDIENCE_LEVEL_INTERMEDIATE = 3 - - AUDIENCE_LEVELS = [ - (AUDIENCE_LEVEL_NOVICE, "Novice"), - (AUDIENCE_LEVEL_INTERMEDIATE, "Intermediate"), - (AUDIENCE_LEVEL_EXPERIENCED, "Experienced"), - ] - - audience_level = models.IntegerField(choices=AUDIENCE_LEVELS) - + extended_presentation = models.BooleanField( + default=False, + verbose_name=_("Optionally consider this proposal for a 45-minute " + "slot"), + help_text=_("Most talks at North Bay Python go for 30 minutes. We " + "have some openings for 45-minute talks. If you check this " + "field, please explain in your additional notes how you " + "would use the extra 15 minutes."), + ) + extra_av = models.TextField( + blank=True, + verbose_name=_("Extra tech and A/V requirements"), + help_text=_("We will provide you with a projector with HDMI " + "connection, an audio connection, and one microphone per " + "speaker. If you need anything more than this to present " + "this talk, please list them here."), + ) + new_presentation = models.BooleanField( + default=False, + verbose_name=_("This is a new presentation"), + help_text=_("Check this box if North Bay Python will be the first " + "time this talk is presented at a technical conference."), + ) + slides_release = models.BooleanField( + default=True, + help_text=_("I authorize North Bay Python to release a copy of my " + "slides and related materials under the Creative Commons " + "Attribution-ShareAlike 3.0 United States licence, and " + "certify that I have the authority to do so."), + ) recording_release = models.BooleanField( default=True, - help_text="By submitting your proposal, you agree to give permission to the conference organizers to record, edit, and release audio and/or video of your presentation. If you do not agree to this, please uncheck this box." + help_text=_("I authorize North Bay Python to release a recording of " + "my talk under the Creative Commons " + "Attribution-ShareAlike 3.0 United States licence."), + ) class Meta: From d20afc9782c77a093629f99b632aa3bfe4b3cb32 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sun, 13 Aug 2017 17:21:02 -0700 Subject: [PATCH 04/22] Adds a logo to the footer. --- pinaxcon/templates/_footer.html | 10 +- static/images/logo.svg | 316 ++++++++++++++++++++++++++++++++ static/scss/custom.scss | 33 ++++ 3 files changed, 358 insertions(+), 1 deletion(-) create mode 100644 static/images/logo.svg diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html index 58c3227..5e0de6b 100644 --- a/pinaxcon/templates/_footer.html +++ b/pinaxcon/templates/_footer.html @@ -1,5 +1,13 @@ +{% load staticfiles %}
-
+ +
+
+
+
+
+ +

© 2017 North Bay Python. North Bay Python is a member project of Software Freedom Conservancy, a 501(c)(3) charity.

Facebook | Twitter | Lanyrd | Code of Conduct | Terms and Conditions | Colophon

diff --git a/static/images/logo.svg b/static/images/logo.svg new file mode 100644 index 0000000..340fb28 --- /dev/null +++ b/static/images/logo.svg @@ -0,0 +1,316 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/static/scss/custom.scss b/static/scss/custom.scss index adbc934..25b7fed 100644 --- a/static/scss/custom.scss +++ b/static/scss/custom.scss @@ -198,6 +198,39 @@ $homepage-block-min-height: 480px; } } +.circle { + position: relative; + border-radius: 100%; + overflow: hidden; + width: 100%; + box-shadow: 0px 0px 2em black; +} + +.circle:before { + content: ""; + display: block; + padding-top: 100%; +} + +.fill { + position: absolute; + width: 100%; + height: 100%; + top: 0; + bottom: 0; + left: 0; + right:0; + background-size: cover; + background-position: center; +} + +.squish { + position: relative; + width: 70%; + margin: auto; + margin-top: 5%; + margin-bottom: 5%; +} .btn-group + p { margin-top: 1em; From d597c74e9092cbf882c5daf3c7f4edf4d91663f4 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sun, 13 Aug 2017 17:23:19 -0700 Subject: [PATCH 05/22] Shadow adjustments --- static/scss/custom.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/scss/custom.scss b/static/scss/custom.scss index 25b7fed..154da4d 100644 --- a/static/scss/custom.scss +++ b/static/scss/custom.scss @@ -203,7 +203,8 @@ $homepage-block-min-height: 480px; border-radius: 100%; overflow: hidden; width: 100%; - box-shadow: 0px 0px 2em black; + border: 0.05em solid black; + box-shadow: 0px 0px 1em $gray-dark; } .circle:before { From 5ee9c16bb55dba6e44215c1ad3623e076b61b530 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sun, 13 Aug 2017 17:46:37 -0700 Subject: [PATCH 06/22] Removes hills --- pinaxcon/templates/site_base.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index bf65c2a..eda39fe 100644 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -22,9 +22,6 @@
- -
-
{% include "_messages.html" %} From a2438a66fb8ee36c2a18369054009950dd39a8fe Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sun, 13 Aug 2017 17:46:42 -0700 Subject: [PATCH 07/22] Homepage updates --- pinaxcon/templates/static_pages/homepage.html | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index 1a4f07a..e9a03c4 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -42,11 +42,15 @@

Downtown Petaluma

-

North Bay Python's home is Petaluma, a shockingly quaint dairy town, nestled on a river at the edge of California's Wine Country.

+

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

-

We're hosting the conference at the Mystic Theatre, a 1912-era music hall in the middle of Historic Downtown Petaluma. There are countless places to eat, craft food and drink producers within walking distance, and plenty of places to stay nearby.

+
    +
  • 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.

+

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

@@ -104,13 +108,14 @@

Inclusion and Diversity

-

North Bay Python is proud to be founded on a commitment to inclusion and diversity.

+

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

-

We value your safety, so we have a strong Code of Conduct and enforcement policy built on the Python Software Foundation's PyCon US policy.

- -

We have set diversity targets for our conference program, including short-term and long-term goals for gender balance. We make financial assistance available to speakers.

- -

We will always have low-cost tickets available, and we will enthusiastically waive ticket costs on request if you need it.

+
    +
  • 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.
    • +
From 6c21596d55d99515951916b4b00585ac01b03eb0 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sun, 13 Aug 2017 20:29:44 -0700 Subject: [PATCH 08/22] Adds social media and newsletter bits --- pinaxcon/templates/static_pages/homepage.html | 54 +++++++++++++++---- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index e9a03c4..f532c10 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -19,20 +19,54 @@

A Python conference north of the Golden Gate

-

- The Mystic Theatre
- Petaluma, California -

+
+
+

+ The Mystic Theatre
+ Petaluma, California +

+ +

+ 2017 conference: December 2 & 3
+ Talk submissions close September 29 +

+
+
+
+
+

Sign up for our low-volume announcements newsletter

+
+
+
+
+ + + + + + +
+ + + + + +
+
+
+
+ +
-

- 2017 conference: December 2 & 3
- Talk submissions close September 29 -

-
- Submit a Proposal +
From 27080b4e3560a28d0d0d57eb3cf984d0dff75e7d Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sun, 13 Aug 2017 20:42:24 -0700 Subject: [PATCH 09/22] Sponsor page touchups; fixes responsiveness on the logo --- pinaxcon/templates/_footer.html | 6 +++--- .../templates/static_pages/sponsors/become_a_sponsor.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html index 5e0de6b..2476d13 100644 --- a/pinaxcon/templates/_footer.html +++ b/pinaxcon/templates/_footer.html @@ -1,19 +1,19 @@ {% load staticfiles %}
-
+
-
+

© 2017 North Bay Python. North Bay Python is a member project of Software Freedom Conservancy, a 501(c)(3) charity.

Facebook | Twitter | Lanyrd | Code of Conduct | Terms and Conditions | Colophon

-
+
This site is free and open source software, powered by Symposion and Registrasion.
diff --git a/pinaxcon/templates/static_pages/sponsors/become_a_sponsor.html b/pinaxcon/templates/static_pages/sponsors/become_a_sponsor.html index 9697b83..5ae8c9a 100644 --- a/pinaxcon/templates/static_pages/sponsors/become_a_sponsor.html +++ b/pinaxcon/templates/static_pages/sponsors/become_a_sponsor.html @@ -22,11 +22,11 @@ Your generous support builds careers, brings students together with expert devel

Below is an overview of sponsorship levels. Please see our prospectus or contact sponsor@northbaypython.org for additional details.

-

Package Sponsorship

+

Package Sponsorship starts at $2000

Package sponsorships are the widest-reaching and best value sponsorships we offer at North Bay Python. When our attendees arrive at the venue, they'll see your signage as they walk through the door. As they're sitting in the theatre, they'll see your logo on the backdrop behind the speakers, and on-screen on between talks. You'll also get the chance to present a short talk about your organization between two of our invited presentations.

-

À la Carte Sponsorship

+

À la Carte Sponsorship starts at $3000

If you're looking for something a bit more exclusive, North Bay Python's À la Carte sponsorships allow you to promote your organization as part of an important offering during the conference, including lanyards, catering, or video branding. We'll also recognize you as a Silver package sponsor, with the opportunity for discounted upgrades to higher package tiers.

From 6265b747c423bade4749ef1f6e5b4d4769f8e72b Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Sun, 13 Aug 2017 22:12:12 -0700 Subject: [PATCH 10/22] Some text about the conference. --- .../static_pages/about/north_bay_python.html | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pinaxcon/templates/static_pages/about/north_bay_python.html b/pinaxcon/templates/static_pages/about/north_bay_python.html index 13a6269..baec761 100644 --- a/pinaxcon/templates/static_pages/about/north_bay_python.html +++ b/pinaxcon/templates/static_pages/about/north_bay_python.html @@ -8,6 +8,30 @@ {% block body_class %}about{% endblock %} -{% block content %} +{% block lede %} + +A single-track conference north of the Bay focused on community, collaboration, and all things Python. + +{% endblock %} + +{% block content %} + +

Welcome to the North Bay

+ +

North Bay Python is a two-day, single-track Python conference held in the Mystic Theater in Petaluma, California, held over the weekend of December 2 & 3, 2017.

+ +

We're a nonprofit conference for professionals, enthusiasts and students alike, focused on inclusion, accessibility, diversity, and affordability, with not only a great lineup of talks from all over the Python ecosystem but plenty of time to meet new people and develop new ideas too.

+ +

Our venue, the historic Mystic Theater in Downtown Petaluma, is not only a beautiful example of an early 1900s Vaudeville theatre, but is a short walk away from over fifty different food and drink options in Downtown Petaluma, as well as several different hotels, the closest of which is only a block away.

+ +

The Conference

+ +

North Bay Python is a single-track conference, with a carefully curated set of talks representing the truly diverse Python community and their different areas of interest. If a topic is less to your interest, or you've met some people you really want to sit down and chat with, we'll have plenty of areas away from the main theater to catch up and chat as well.

+ +

The Location

+ +

Petaluma is right in the middle of the beautiful scenery of the North Bay, and less than an hour's drive from San Francisco over the Golden Gate Bridge. The Mystic is not the only example of early 1900s architecture, either; downtown is full of historic buildings, as well as being at the center of thing things like the maker movement and a thriving craft brewery scene.

+ +

If you want to stay overnight, we have deals with local hotels - the closest one is just one block away. If you're driving up, Petaluma has plenty of free parking, and if you don't feel like driving, we'll be putting on a shuttle from public transport stops as well.

{% endblock %} From d7219ab153dbadcf03557cfda6fce02892001389 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Sun, 13 Aug 2017 23:01:39 -0700 Subject: [PATCH 11/22] fix contrast of links on dark jumbotrons, remove lanyrd from footer (oops) --- pinaxcon/templates/_footer.html | 2 +- static/scss/custom.scss | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html index 663f2ba..8813d93 100644 --- a/pinaxcon/templates/_footer.html +++ b/pinaxcon/templates/_footer.html @@ -10,7 +10,7 @@

© 2017 North Bay Python, a member project of Software Freedom Conservancy, a 501(c)(3) charity.

-

Facebook | Twitter | Lanyrd | Code of Conduct | Terms and Conditions | Colophon

+

Facebook | Twitter | Code of Conduct | Terms and Conditions | Colophon

diff --git a/static/scss/custom.scss b/static/scss/custom.scss index d009683..d196b24 100644 --- a/static/scss/custom.scss +++ b/static/scss/custom.scss @@ -151,6 +151,16 @@ $homepage-block-min-height: 480px; background: $gray-base; color: white; text-shadow: 1px 1px $gray-dark; + + a:not(.btn) { + color: lighten($brand-primary, 20%); + + &:hover, + &:focus, + &:active { + color: lighten($brand-primary, 15%); + } + } } .navbar { @@ -282,4 +292,4 @@ body.news { h2, .h2 { font-size: 28px; } -} \ No newline at end of file +} From c35f12113232e569e0bdec14230aaec3c4728a93 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer <_@chrisjrn.com> Date: Mon, 14 Aug 2017 09:02:49 -0700 Subject: [PATCH 12/22] Update base.txt fix fix --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index b182309..36a1dc5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -13,7 +13,7 @@ django-sitetree==1.8.0 django-countries==4.6.1 easy-thumbnails==2.4.1 django-timezone-field==2.0 -django-mode-utils==3.0.0 +django-model-utils==3.0.0 # For testing From 9fa88f7c1c94f73dfdd794b6223d1ad5c9081b2d Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer <_@chrisjrn.com> Date: Mon, 14 Aug 2017 09:07:25 -0700 Subject: [PATCH 13/22] Update runtime.txt (UNDO THIS MOMENTARILY TO FIX HEROKU) --- runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime.txt b/runtime.txt index 4b38fc9..fdf7966 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-2.7.13 +python-2.7.12 From 89e9e98db29c8bae4ad3e3f0452b33efd6aaea4d Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer <_@chrisjrn.com> Date: Mon, 14 Aug 2017 09:25:47 -0700 Subject: [PATCH 14/22] Reverts runtime.txt --- runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime.txt b/runtime.txt index fdf7966..4b38fc9 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-2.7.12 +python-2.7.13 From d2f394ee780e58c278f7dd5bbafba76c325e7c57 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Mon, 14 Aug 2017 10:06:41 -0700 Subject: [PATCH 15/22] add office hours schedule to cfp page --- .../static_pages/program/call_for_proposals.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pinaxcon/templates/static_pages/program/call_for_proposals.md b/pinaxcon/templates/static_pages/program/call_for_proposals.md index 4167a36..873c7c7 100644 --- a/pinaxcon/templates/static_pages/program/call_for_proposals.md +++ b/pinaxcon/templates/static_pages/program/call_for_proposals.md @@ -56,7 +56,7 @@ This [public speaking](https://github.com/vmbrasseur/Public_Speaking "Public Spe ### Office Hours and Mentorship -The program committee will be holding regularly-scheduled office hours during the CFP period to help you organize proposals. +The program committee will be holding regularly-scheduled office hours during the CFP period to help you organize proposals. You are also welcome to email us or drop by #nbpy on the Freenode IRC network anytime to ask questions. We're happy to help with any of the following: @@ -66,9 +66,20 @@ We're happy to help with any of the following: + Connecting you with rehearsal audiences or even just watching you present over a video conference as practice + Anything else that'd help you be at ease and excited about bringing your ideas to our audience! -Our office hours schedule has not yet been announced, but you can reach us by email at program@northbaypython.org or on IRC in #nbpy on Freenode at any time. +Our office hours are scheduled for every Wednesday at 7pm and Friday at 3pm Pacific Time. They will take place in #nbpy on the Freenode IRC network. IRC is a web chat protocol and you can use this IRC web client to connect. - ++ Wednesday, August 23 at 7pm ++ Friday, August 25 at 3pm ++ Wednesday, August 30 at 7pm ++ Friday, September 1 at 3pm ++ Wednesday, September 6 at 7pm ++ Friday, September 8 at 3pm ++ Wednesday, September 13 at 7pm ++ Friday, September 15 at 3pm ++ Wednesday, September 20 at 7pm ++ Friday, September 22 at 3pm ++ Wednesday, September 27 at 7pm ++ Friday, September 29 at 3pm ## Submitting From dbdbdac6d8d05038823f9c7f34efbe2460b109a5 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 14 Aug 2017 12:34:53 -0700 Subject: [PATCH 16/22] Adds sponsorship page --- pinaxcon/templates/symposion/base.html | 1 + pinaxcon/templates/symposion/sponsorship/list.html | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 pinaxcon/templates/symposion/base.html create mode 100644 pinaxcon/templates/symposion/sponsorship/list.html diff --git a/pinaxcon/templates/symposion/base.html b/pinaxcon/templates/symposion/base.html new file mode 100644 index 0000000..aea02ee --- /dev/null +++ b/pinaxcon/templates/symposion/base.html @@ -0,0 +1 @@ +{% extends "page_with_title_and_lede.html" %} diff --git a/pinaxcon/templates/symposion/sponsorship/list.html b/pinaxcon/templates/symposion/sponsorship/list.html new file mode 100644 index 0000000..e9d5372 --- /dev/null +++ b/pinaxcon/templates/symposion/sponsorship/list.html @@ -0,0 +1,8 @@ +{% extends "symposion/sponsorship/list_.html" %} + +{% block lede %} + We're grateful to the following organizations, who've made a substantial + contribution to North Bay Python 2017. If you want to join us, find + out more at our become a sponsor + page. +{% endblock %} From 5ef70cc599ac84428d860a63a91fb253b2947063 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 14 Aug 2017 14:19:31 -0700 Subject: [PATCH 17/22] Homepage/about stuff --- .../static_pages/about/north_bay_python.html | 93 ++++++++++++++++--- pinaxcon/templates/static_pages/homepage.html | 2 +- 2 files changed, 82 insertions(+), 13 deletions(-) diff --git a/pinaxcon/templates/static_pages/about/north_bay_python.html b/pinaxcon/templates/static_pages/about/north_bay_python.html index baec761..206ec23 100644 --- a/pinaxcon/templates/static_pages/about/north_bay_python.html +++ b/pinaxcon/templates/static_pages/about/north_bay_python.html @@ -9,29 +9,98 @@ {% block body_class %}about{% endblock %} {% block lede %} - -A single-track conference north of the Bay focused on community, collaboration, and all things Python. - + A single-track conference north of the Golden Gate, focused on community, + collaboration, and all things Python. {% endblock %} {% block content %} -

Welcome to the North Bay

+

+ North Bay Python is a two-day, single-track Python conference held in the + Mystic Theatre in Historic Downtown Petaluma, California, held over the + weekend of December 2 & 3, 2017. +

-

North Bay Python is a two-day, single-track Python conference held in the Mystic Theater in Petaluma, California, held over the weekend of December 2 & 3, 2017.

+

+ We're a nonprofit conference for professionals, enthusiasts and students + alike; we're focused on inclusion, accessibility, diversity, and + affordability; and we're planning a great lineup of talks from all over the + Python ecosystem, with plenty of time to meet new people and + develop new ideas too. +

-

We're a nonprofit conference for professionals, enthusiasts and students alike, focused on inclusion, accessibility, diversity, and affordability, with not only a great lineup of talks from all over the Python ecosystem but plenty of time to meet new people and develop new ideas too.

- -

Our venue, the historic Mystic Theater in Downtown Petaluma, is not only a beautiful example of an early 1900s Vaudeville theatre, but is a short walk away from over fifty different food and drink options in Downtown Petaluma, as well as several different hotels, the closest of which is only a block away.

+

+ Our venue, the historic Mystic Theatre in Downtown Petaluma, is a + beautiful example of an early 1900s Vaudeville theatre, and it's a short walk + away from over fifty different food and drink options in Downtown Petaluma, + as well as several different hotels, the closest of which is only a block away. +

The Conference

-

North Bay Python is a single-track conference, with a carefully curated set of talks representing the truly diverse Python community and their different areas of interest. If a topic is less to your interest, or you've met some people you really want to sit down and chat with, we'll have plenty of areas away from the main theater to catch up and chat as well.

+

+ North Bay Python is a single-track conference, with a carefully curated set + of talks representing the truly diverse Python community and their different + areas of interest. +

-

The Location

+

+ If a topic is less to your interest, or you've met some people you really + want to sit down and chat with, we'll have plenty of areas + away from the main theatre to catch up and chat as well. +

-

Petaluma is right in the middle of the beautiful scenery of the North Bay, and less than an hour's drive from San Francisco over the Golden Gate Bridge. The Mystic is not the only example of early 1900s architecture, either; downtown is full of historic buildings, as well as being at the center of thing things like the maker movement and a thriving craft brewery scene.

+

Petaluma, California

-

If you want to stay overnight, we have deals with local hotels - the closest one is just one block away. If you're driving up, Petaluma has plenty of free parking, and if you don't feel like driving, we'll be putting on a shuttle from public transport stops as well.

+

+ North Bay Python's home is Petaluma, a delightfully quaint dairy town, + nestled on a river at the southern edge of California's Wine Country. We've + got beautiful scenery right on our doorstep, and we're less than an hour's + drive from San Francisco over the Golden Gate Bridge. +

+ +

+ The Mystic is not the only local example of early 1900s architecture, either; + downtown is full of historic buildings, and it's at the center of the + maker movement and a thriving craft brewery scene. +

+ +

Getting here

+ +

By car

+ +

+ If you're driving up, Downtown Petaluma is at exit 472 on Highway 101, 35 + miles north of the Golden Gate Bridge. All parking is free in Petaluma, + including in the undercover garages at Keller St and Theatre Square, both + are in short walking distance of the Mystic. +

+ +

By bus

+ +

+ Public transit to Petaluma is not great. You can take the 101 bus operated + by Golden Gate Transit from downtown San Francisco, or south from Santa Rosa. + Depending on sponsorship, we hope to run a free shuttle with BART and + Caltrain connections for people from further out of town. +

+ +

By plane

+ +

+ If you're coming from out of the area, you may want to consider Sonoma County + Airport (STS) – it's 30 minutess out of Petaluma, and has nonstop + flights to most major west coast cities. If you can't make it to STS, you can + also try San Francisco (SFO) or Oakland (OAK) international airports. +

+ +

Staying here

+ +

+ Petaluma, as well as being a place where people live, also has hotels! We're + arranging deals with some of the best local hotels in the area – the + closest is just one block away. We'll share details of our hotel deals with + you when conference tickets go on sale. +

{% endblock %} diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index f532c10..58e3171 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -76,7 +76,7 @@

Downtown Petaluma

-

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

+

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
    • From 62be64504a47010e5ae10fb19a57716b19abfb05 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 14 Aug 2017 14:25:10 -0700 Subject: [PATCH 18/22] line brakes --- .../static_pages/about/north_bay_python.html | 54 +++++-------------- 1 file changed, 12 insertions(+), 42 deletions(-) diff --git a/pinaxcon/templates/static_pages/about/north_bay_python.html b/pinaxcon/templates/static_pages/about/north_bay_python.html index 206ec23..4bc34df 100644 --- a/pinaxcon/templates/static_pages/about/north_bay_python.html +++ b/pinaxcon/templates/static_pages/about/north_bay_python.html @@ -9,60 +9,42 @@ {% block body_class %}about{% endblock %} {% block lede %} - A single-track conference north of the Golden Gate, focused on community, - collaboration, and all things Python. + A single-track conference north of the Golden Gate, focused on community, collaboration, and all things Python. {% endblock %} {% block content %}

    - North Bay Python is a two-day, single-track Python conference held in the - Mystic Theatre in Historic Downtown Petaluma, California, held over the - weekend of December 2 & 3, 2017. + North Bay Python is a two-day, single-track Python conference held in the Mystic Theatre in Historic Downtown Petaluma, California, held over the weekend of December 2 & 3, 2017.

    - We're a nonprofit conference for professionals, enthusiasts and students - alike; we're focused on inclusion, accessibility, diversity, and - affordability; and we're planning a great lineup of talks from all over the - Python ecosystem, with plenty of time to meet new people and + We're a nonprofit conference for professionals, enthusiasts and students alike; we're focused on inclusion, accessibility, diversity, and affordability; and we're planning a great lineup of talks from all over the Python ecosystem, with plenty of time to meet new people and develop new ideas too.

    - Our venue, the historic Mystic Theatre in Downtown Petaluma, is a - beautiful example of an early 1900s Vaudeville theatre, and it's a short walk - away from over fifty different food and drink options in Downtown Petaluma, - as well as several different hotels, the closest of which is only a block away. + Our venue, the historic Mystic Theatre in Downtown Petaluma, is a beautiful example of an early 1900s Vaudeville theatre, and it's a short walk away from over fifty different food and drink options in Downtown Petaluma, as well as several different hotels, the closest of which is only a block away.

    The Conference

    - North Bay Python is a single-track conference, with a carefully curated set - of talks representing the truly diverse Python community and their different - areas of interest. + North Bay Python is a single-track conference, with a carefully curated set of talks representing the truly diverse Python community and their different areas of interest.

    - If a topic is less to your interest, or you've met some people you really - want to sit down and chat with, we'll have plenty of areas - away from the main theatre to catch up and chat as well. + If a topic is less to your interest, or you've met some people you really want to sit down and chat with, we'll have plenty of areas away from the main theatre to catch up and chat as well.

    Petaluma, California

    - North Bay Python's home is Petaluma, a delightfully quaint dairy town, - nestled on a river at the southern edge of California's Wine Country. We've - got beautiful scenery right on our doorstep, and we're less than an hour's - drive from San Francisco over the Golden Gate Bridge. + North Bay Python's home is Petaluma, a delightfully quaint dairy town, nestled on a river at the southern edge of California's Wine Country. We've got beautiful scenery right on our doorstep, and we're less than an hour's drive from San Francisco over the Golden Gate Bridge.

    - The Mystic is not the only local example of early 1900s architecture, either; - downtown is full of historic buildings, and it's at the center of the - maker movement and a thriving craft brewery scene. + The Mystic is not the only local example of early 1900s architecture, either; downtown is full of historic buildings, and it's at the center of the maker movement and a thriving craft brewery scene.

    Getting here

    @@ -70,37 +52,25 @@

    By car

    - If you're driving up, Downtown Petaluma is at exit 472 on Highway 101, 35 - miles north of the Golden Gate Bridge. All parking is free in Petaluma, - including in the undercover garages at Keller St and Theatre Square, both - are in short walking distance of the Mystic. + If you're driving up, Downtown Petaluma is at exit 472 on Highway 101, 35 miles north of the Golden Gate Bridge. All parking is free in Petaluma, including in the undercover garages at Keller St and Theatre Square, both are in short walking distance of the Mystic.

    By bus

    - Public transit to Petaluma is not great. You can take the 101 bus operated - by Golden Gate Transit from downtown San Francisco, or south from Santa Rosa. - Depending on sponsorship, we hope to run a free shuttle with BART and - Caltrain connections for people from further out of town. + Public transit to Petaluma is not great. You can take the 101 bus operated by Golden Gate Transit from downtown San Francisco, or south from Santa Rosa. Depending on sponsorship, we hope to run a free shuttle with BART and Caltrain connections for people from further out of town.

    By plane

    - If you're coming from out of the area, you may want to consider Sonoma County - Airport (STS) – it's 30 minutess out of Petaluma, and has nonstop - flights to most major west coast cities. If you can't make it to STS, you can - also try San Francisco (SFO) or Oakland (OAK) international airports. + If you're coming from out of the area, you may want to consider Sonoma County Airport (STS) – it's 30 minutess out of Petaluma, and has nonstop flights to most major west coast cities. If you can't make it to STS, you can also try San Francisco (SFO) or Oakland (OAK) international airports.

    Staying here

    - Petaluma, as well as being a place where people live, also has hotels! We're - arranging deals with some of the best local hotels in the area – the - closest is just one block away. We'll share details of our hotel deals with - you when conference tickets go on sale. + Petaluma, as well as being a place where people live, also has hotels! We're arranging deals with some of the best local hotels in the area – the closest is just one block away. We'll share details of our hotel deals with you when conference tickets go on sale.

    {% endblock %} From d285c4c96847de055726053c4e62007852297936 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 14 Aug 2017 14:26:31 -0700 Subject: [PATCH 19/22] more line breaks --- .../static_pages/about/north_bay_python.html | 45 +++++-------------- 1 file changed, 12 insertions(+), 33 deletions(-) diff --git a/pinaxcon/templates/static_pages/about/north_bay_python.html b/pinaxcon/templates/static_pages/about/north_bay_python.html index 4bc34df..f0f0183 100644 --- a/pinaxcon/templates/static_pages/about/north_bay_python.html +++ b/pinaxcon/templates/static_pages/about/north_bay_python.html @@ -14,63 +14,42 @@ {% block content %} -

    - North Bay Python is a two-day, single-track Python conference held in the Mystic Theatre in Historic Downtown Petaluma, California, held over the weekend of December 2 & 3, 2017. -

    +

    North Bay Python is a two-day, single-track Python conference held in the Mystic Theatre in Historic Downtown Petaluma, California, held over the weekend of December 2 & 3, 2017.

    -

    - We're a nonprofit conference for professionals, enthusiasts and students alike; we're focused on inclusion, accessibility, diversity, and affordability; and we're planning a great lineup of talks from all over the Python ecosystem, with plenty of time to meet new people and - develop new ideas too. -

    +

    We're a nonprofit conference for professionals, enthusiasts and students alike; we're focused on inclusion, accessibility, diversity, and affordability; and we're planning a great lineup of talks from all over the Python ecosystem, with plenty of time to meet new people and + develop new ideas too.

    -

    - Our venue, the historic Mystic Theatre in Downtown Petaluma, is a beautiful example of an early 1900s Vaudeville theatre, and it's a short walk away from over fifty different food and drink options in Downtown Petaluma, as well as several different hotels, the closest of which is only a block away. -

    +

    Our venue, the historic Mystic Theatre in Downtown Petaluma, is a beautiful example of an early 1900s Vaudeville theatre, and it's a short walk away from over fifty different food and drink options in Downtown Petaluma, as well as several different hotels, the closest of which is only a block away.

    The Conference

    -

    - North Bay Python is a single-track conference, with a carefully curated set of talks representing the truly diverse Python community and their different areas of interest. +

    North Bay Python is a single-track conference, with a carefully curated set of talks representing the truly diverse Python community and their different areas of interest.

    -

    - If a topic is less to your interest, or you've met some people you really want to sit down and chat with, we'll have plenty of areas away from the main theatre to catch up and chat as well. -

    +

    If a topic is less to your interest, or you've met some people you really want to sit down and chat with, we'll have plenty of areas away from the main theatre to catch up and chat as well.

    Petaluma, California

    -

    - North Bay Python's home is Petaluma, a delightfully quaint dairy town, nestled on a river at the southern edge of California's Wine Country. We've got beautiful scenery right on our doorstep, and we're less than an hour's drive from San Francisco over the Golden Gate Bridge. -

    +

    North Bay Python's home is Petaluma, a delightfully quaint dairy town, nestled on a river at the southern edge of California's Wine Country. We've got beautiful scenery right on our doorstep, and we're less than an hour's drive from San Francisco over the Golden Gate Bridge.

    -

    - The Mystic is not the only local example of early 1900s architecture, either; downtown is full of historic buildings, and it's at the center of the maker movement and a thriving craft brewery scene. -

    +

    The Mystic is not the only local example of early 1900s architecture, either; downtown is full of historic buildings, and it's at the center of the maker movement and a thriving craft brewery scene.

    Getting here

    By car

    -

    - If you're driving up, Downtown Petaluma is at exit 472 on Highway 101, 35 miles north of the Golden Gate Bridge. All parking is free in Petaluma, including in the undercover garages at Keller St and Theatre Square, both are in short walking distance of the Mystic. -

    +

    If you're driving up, Downtown Petaluma is at exit 472 on Highway 101, 35 miles north of the Golden Gate Bridge. All parking is free in Petaluma, including in the undercover garages at Keller St and Theatre Square, both are in short walking distance of the Mystic.

    By bus

    -

    - Public transit to Petaluma is not great. You can take the 101 bus operated by Golden Gate Transit from downtown San Francisco, or south from Santa Rosa. Depending on sponsorship, we hope to run a free shuttle with BART and Caltrain connections for people from further out of town. -

    +

    Public transit to Petaluma is not great. You can take the 101 bus operated by Golden Gate Transit from downtown San Francisco, or south from Santa Rosa. Depending on sponsorship, we hope to run a free shuttle with BART and Caltrain connections for people from further out of town.

    By plane

    -

    - If you're coming from out of the area, you may want to consider Sonoma County Airport (STS) – it's 30 minutess out of Petaluma, and has nonstop flights to most major west coast cities. If you can't make it to STS, you can also try San Francisco (SFO) or Oakland (OAK) international airports. -

    +

    If you're coming from out of the area, you may want to consider Sonoma County Airport (STS) – it's 30 minutess out of Petaluma, and has nonstop flights to most major west coast cities. If you can't make it to STS, you can also try San Francisco (SFO) or Oakland (OAK) international airports.

    Staying here

    -

    - Petaluma, as well as being a place where people live, also has hotels! We're arranging deals with some of the best local hotels in the area – the closest is just one block away. We'll share details of our hotel deals with you when conference tickets go on sale. -

    +

    Petaluma, as well as being a place where people live, also has hotels! We're arranging deals with some of the best local hotels in the area – the closest is just one block away. We'll share details of our hotel deals with you when conference tickets go on sale.

    {% endblock %} From 33e29a1b97bfb8d3e55994748bb24d8d95cb2ae8 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 14 Aug 2017 15:13:30 -0700 Subject: [PATCH 20/22] Made changes requested in review --- .../static_pages/about/north_bay_python.html | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pinaxcon/templates/static_pages/about/north_bay_python.html b/pinaxcon/templates/static_pages/about/north_bay_python.html index f0f0183..80bb7d7 100644 --- a/pinaxcon/templates/static_pages/about/north_bay_python.html +++ b/pinaxcon/templates/static_pages/about/north_bay_python.html @@ -14,42 +14,47 @@ {% block content %} -

    North Bay Python is a two-day, single-track Python conference held in the Mystic Theatre in Historic Downtown Petaluma, California, held over the weekend of December 2 & 3, 2017.

    +

    North Bay Python is a two-day, single-track Python conference held at the Mystic Theatre in Historic Downtown Petaluma, California, over the weekend of December 2 & 3, 2017.

    -

    We're a nonprofit conference for professionals, enthusiasts and students alike; we're focused on inclusion, accessibility, diversity, and affordability; and we're planning a great lineup of talks from all over the Python ecosystem, with plenty of time to meet new people and +

    We're a nonprofit conference for professionals, enthusiasts and students alike. We're focused on inclusion, accessibility, diversity, and affordability, Most importantly, we're planning a great lineup of talks from all over the Python ecosystem, with plenty of time to meet new people and develop new ideas too.

    -

    Our venue, the historic Mystic Theatre in Downtown Petaluma, is a beautiful example of an early 1900s Vaudeville theatre, and it's a short walk away from over fifty different food and drink options in Downtown Petaluma, as well as several different hotels, the closest of which is only a block away.

    +

    Our venue, the Mystic Theatre in Downtown Petaluma, is a beautiful example of an early 1900s Vaudeville theatre, and it's a short walk away from over 50 different food and drink options in Downtown Petaluma, as well as several different hotels, the closest of which is only a block away.

    +

    The Conference

    -

    North Bay Python is a single-track conference, with a carefully curated set of talks representing the truly diverse Python community and their different areas of interest. -

    +

    North Bay Python is a single-track conference with a carefully curated set of talks representing the diverse Python community and their different areas of interest.

    If a topic is less to your interest, or you've met some people you really want to sit down and chat with, we'll have plenty of areas away from the main theatre to catch up and chat as well.

    +

    Petaluma, California

    North Bay Python's home is Petaluma, a delightfully quaint dairy town, nestled on a river at the southern edge of California's Wine Country. We've got beautiful scenery right on our doorstep, and we're less than an hour's drive from San Francisco over the Golden Gate Bridge.

    -

    The Mystic is not the only local example of early 1900s architecture, either; downtown is full of historic buildings, and it's at the center of the maker movement and a thriving craft brewery scene.

    +

    The Mystic is not the only local example of early 1900s architecture, either: Downtown is full of great examples of Victorian-era buildings that survived the 1906 earthquake. Just down the road, you'll find the center of the maker movement and a thriving craft brewery scene.

    -

    Getting here

    -

    By car

    +

    Getting Here

    -

    If you're driving up, Downtown Petaluma is at exit 472 on Highway 101, 35 miles north of the Golden Gate Bridge. All parking is free in Petaluma, including in the undercover garages at Keller St and Theatre Square, both are in short walking distance of the Mystic.

    +

    By Car

    + +

    If you're driving up, Downtown Petaluma is at exit 472 on Highway 101, 35 miles north of the Golden Gate Bridge. All parking is free in Petaluma, including in the undercover garages at Keller St and Theatre Square. Both garages are in short walking distance of the Mystic.

    By bus

    Public transit to Petaluma is not great. You can take the 101 bus operated by Golden Gate Transit from downtown San Francisco, or south from Santa Rosa. Depending on sponsorship, we hope to run a free shuttle with BART and Caltrain connections for people from further out of town.

    -

    By plane

    +

    By Plane

    -

    If you're coming from out of the area, you may want to consider Sonoma County Airport (STS) – it's 30 minutess out of Petaluma, and has nonstop flights to most major west coast cities. If you can't make it to STS, you can also try San Francisco (SFO) or Oakland (OAK) international airports.

    +

    If you're coming from out of the area, you may want to consider Sonoma County Airport (STS). STS is 30 minutess out of Petaluma, and has nonstop flights to most major west coast cities. If you can't make it to STS, you can also try San Francisco (SFO) or Oakland (OAK) international airports.

    -

    Staying here

    +

    If you happen to have an aircraft of your own, Petaluma Municipal Airport is 3 miles down the road.

    -

    Petaluma, as well as being a place where people live, also has hotels! We're arranging deals with some of the best local hotels in the area – the closest is just one block away. We'll share details of our hotel deals with you when conference tickets go on sale.

    + +

    Staying Here

    + +

    Petaluma also has hotels! We're arranging deals with some of the best local hotels in the area – the closest is just one block away. We'll share details with you when conference tickets go on sale.

    {% endblock %} From 4a371cd979539785a68598fe09fa09e2c4ea9173 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 14 Aug 2017 15:15:07 -0700 Subject: [PATCH 21/22] Missed a thing --- pinaxcon/templates/static_pages/about/north_bay_python.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinaxcon/templates/static_pages/about/north_bay_python.html b/pinaxcon/templates/static_pages/about/north_bay_python.html index 80bb7d7..4d3c04d 100644 --- a/pinaxcon/templates/static_pages/about/north_bay_python.html +++ b/pinaxcon/templates/static_pages/about/north_bay_python.html @@ -42,7 +42,7 @@

    If you're driving up, Downtown Petaluma is at exit 472 on Highway 101, 35 miles north of the Golden Gate Bridge. All parking is free in Petaluma, including in the undercover garages at Keller St and Theatre Square. Both garages are in short walking distance of the Mystic.

    -

    By bus

    +

    By Bus

    Public transit to Petaluma is not great. You can take the 101 bus operated by Golden Gate Transit from downtown San Francisco, or south from Santa Rosa. Depending on sponsorship, we hope to run a free shuttle with BART and Caltrain connections for people from further out of town.

    From 88ef9e913b985b7caa406ee5a446b00aea5b1da3 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 14 Aug 2017 15:37:33 -0700 Subject: [PATCH 22/22] More about-us copy tidied up; adds a bit about prices --- .../templates/static_pages/about/north_bay_python.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pinaxcon/templates/static_pages/about/north_bay_python.html b/pinaxcon/templates/static_pages/about/north_bay_python.html index 4d3c04d..7ae9a79 100644 --- a/pinaxcon/templates/static_pages/about/north_bay_python.html +++ b/pinaxcon/templates/static_pages/about/north_bay_python.html @@ -16,17 +16,18 @@

    North Bay Python is a two-day, single-track Python conference held at the Mystic Theatre in Historic Downtown Petaluma, California, over the weekend of December 2 & 3, 2017.

    -

    We're a nonprofit conference for professionals, enthusiasts and students alike. We're focused on inclusion, accessibility, diversity, and affordability, Most importantly, we're planning a great lineup of talks from all over the Python ecosystem, with plenty of time to meet new people and - develop new ideas too.

    +

    We're a nonprofit conference for professionals, enthusiasts and students alike. We're focused on inclusion, accessibility, diversity, and affordability. Most importantly, we're planning a great lineup of talks from all over the Python ecosystem, with plenty of time to meet new people and develop new ideas.

    -

    Our venue, the Mystic Theatre in Downtown Petaluma, is a beautiful example of an early 1900s Vaudeville theatre, and it's a short walk away from over 50 different food and drink options in Downtown Petaluma, as well as several different hotels, the closest of which is only a block away.

    +

    Our venue, the Mystic Theatre in Downtown Petaluma, is a beautiful example of an early 1900s Vaudeville theatre. You can find over 50 different food and drink options a short walk away, and the nearest hotel is only a block away.

    The Conference

    North Bay Python is a single-track conference with a carefully curated set of talks representing the diverse Python community and their different areas of interest.

    -

    If a topic is less to your interest, or you've met some people you really want to sit down and chat with, we'll have plenty of areas away from the main theatre to catch up and chat as well.

    +

    If a topic is less to your interest, or you've met some people you really want to sit down and chat with, we'll have plenty of areas away from the main theatre to catch up and chat.

    + +

    Our goal is to keep prices as low as possible. That means we won't be catering lunch. Instead, you can look forward to extra-long lunch breaks you can use to explore all of the great food options around the venue.

    Petaluma, California