From 0d2de61345c5d45b53f4dcd2e685b5c8c0133fd8 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 16 Oct 2017 16:50:49 -0700 Subject: [PATCH 01/18] Speaker photos --- .../schedule/presentation_detail.html | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pinaxcon/templates/symposion/schedule/presentation_detail.html diff --git a/pinaxcon/templates/symposion/schedule/presentation_detail.html b/pinaxcon/templates/symposion/schedule/presentation_detail.html new file mode 100644 index 0000000..9ab471e --- /dev/null +++ b/pinaxcon/templates/symposion/schedule/presentation_detail.html @@ -0,0 +1,33 @@ +{% extends "symposion/schedule/presentation_detail_.html" %} + +{% load thumbnail %} + +{% comment %} + Blocks you can override: + + - description (appears in lede) + - abstract + - speaker +{% endcomment %} + +{% block speaker %} +

{{ speaker.name }}

+ +
+
+
+ {{ speaker.biography_html|safe }} +
+ + {% if speaker.conferencespeaker.twitter_username %} + Twitter + {% endif %} +
+
+
+
+
+
+ +
+{% endblock %} From 171788dd7d40be83bdce067ed0b2ee98555dc8bd Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 16 Oct 2017 17:16:29 -0700 Subject: [PATCH 02/18] Speaker pics --- .../symposion/schedule/presentation_detail.html | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pinaxcon/templates/symposion/schedule/presentation_detail.html b/pinaxcon/templates/symposion/schedule/presentation_detail.html index 9ab471e..3a88413 100644 --- a/pinaxcon/templates/symposion/schedule/presentation_detail.html +++ b/pinaxcon/templates/symposion/schedule/presentation_detail.html @@ -1,6 +1,7 @@ {% extends "symposion/schedule/presentation_detail_.html" %} {% load thumbnail %} +{% load staticfiles %} {% comment %} Blocks you can override: @@ -14,6 +15,15 @@

{{ speaker.name }}

+
+
+ {% if speaker.photo %} +
+ {% else %} +
+ {% endif %} +
+
{{ speaker.biography_html|safe }} @@ -23,11 +33,5 @@ Twitter {% endif %}
-
-
-
-
-
-
{% endblock %} From 98d22f6c9926fe4d7987c12d9450359b051dc792 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Fri, 20 Oct 2017 17:19:09 -0700 Subject: [PATCH 03/18] Adds logo explanation. --- pinaxcon/templates/static_pages/about/colophon.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index 0754892..3cc72db 100644 --- a/pinaxcon/templates/static_pages/about/colophon.html +++ b/pinaxcon/templates/static_pages/about/colophon.html @@ -33,6 +33,10 @@

"Python" and the Python logos are trademarks or registered trademarks of the Python Software Foundation, used by North Bay Python with permission from the Foundation.

+

Our Logo

+ +

Our logo is a pythonic tribute to the rolling green hills of Sonoma County. It is inspired by Bliss, a photo made famous as the default background from Windows XP. Bliss was photographed 16 miles from Downtown Petaluma. +

Terms and Conditions

@@ -49,4 +53,4 @@

  • Inkscape is used to create most of our graphics.
    • -{% endblock %} \ No newline at end of file +{% endblock %} From dafd122c51e35aa7beac9dfe007841f9776776eb Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 23 Oct 2017 15:41:09 -0700 Subject: [PATCH 04/18] Strikes early bird prices --- pinaxcon/templates/static_pages/attend/attend.html | 14 +++++++------- pinaxcon/templates/static_pages/homepage.html | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pinaxcon/templates/static_pages/attend/attend.html b/pinaxcon/templates/static_pages/attend/attend.html index 2a8954e..7fc5506 100644 --- a/pinaxcon/templates/static_pages/attend/attend.html +++ b/pinaxcon/templates/static_pages/attend/attend.html @@ -25,21 +25,21 @@
    Buy a Ticket

    Which Ticket?

    -

    Early Bird discounts are available for the first 100 tickets sold, or until October 20, whichever comes first. T-shirts are only available for tickets bought before November 7.

    +

    Early Bird discounts are available for the first 100 tickets sold, or until October 20, whichever comes first. T-shirts are only available for tickets bought before November 7.

    -

    Corporate $200 ($180 Early Bird)

    +

    Corporate $200

    For company employees, and individuals who can claim the cost of attending the conference as a business expense or other tax deduction.

    Includes a free t-shirt, and recognition of your affiliation on your conference badge and on the conference supporters list. Group discounts are available for organizations that buy 5 or more tickets.

    -

    Individual Supporter $100 ($80 Early Bird)

    +

    Individual Supporter $100

    For individuals who want to financially contribute to the success of the conference.

    This ticket includes a free t-shirt, and recognition of your Free and Open Source Software, hobby, or nonprofit project on your conference badge.

    -

    Unaffiliated Individual $50 ($25 Early Bird)

    +

    Unaffiliated Individual $50

    For students, hobbyists, and unemployed/underemployed people who are coming to North Bay Python at their own expense.

    @@ -48,7 +48,7 @@

    Special Tickets

    -

    Individual Sponsor $500 ($450 Early Bird)

    +

    Individual Sponsor $500

    This ticket includes all of the benefits of a Corporate ticket, but we’ll also give the ticket holder special thanks during our conference plenary sessions. You can also provide us with a promotional item to put in each attendee’s swag bag.

    @@ -72,8 +72,8 @@ Regular Price $50 $100 $200 $500 - Early Bird - $25 $80 $180 $450 + Early Bird + $25 $80 $180 $450 Group Discount - - $180/ticket for 5+ tickets - diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index 9e5d296..c5b4abc 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -31,7 +31,7 @@

    December 2 & 3, 2017
    - Tickets on sale from $25 + Tickets on sale from $50

    From b7b697d8035bdeaf0a298e4c81dbd05d8daa236a Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 6 Nov 2017 20:24:58 -0500 Subject: [PATCH 13/18] Finaid --- .../templates/static_pages/attend/travel.html | 55 ++++++++----------- pinaxcon/urls.py | 1 + 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/pinaxcon/templates/static_pages/attend/travel.html b/pinaxcon/templates/static_pages/attend/travel.html index 64ae257..7f220a0 100644 --- a/pinaxcon/templates/static_pages/attend/travel.html +++ b/pinaxcon/templates/static_pages/attend/travel.html @@ -2,57 +2,50 @@ {% load i18n %} -{% block head_title %}How to Get Here{% endblock %} +{% block head_title %}Financial Aid{% endblock %} -{% block heading %}How to Get Here{% endblock %} +{% block heading %}Financial Aid{% endblock %} {% block body_class %}attend{% endblock %} {% block lede %} - Chances are you're probably not in Petaluma, so if you want to come to North Bay Python, then you'll need to get here somehow. The good news is that it's reasonably easy to get here, whether you're coming from Sonoma County, elsewhere in the Bay Area, or from further out of town. +Part of the Python Community Spirit is making knowledge, and access to the community available to everyone who needs it. If you live far away from Petaluma and need help getting here, we want to help out. {% endblock %} - {% block content %} -

    By Car

    +

    What we'll cover

    -

    If you're driving up, Downtown Petaluma is at exit 472A on Highway 101, 35 miles north of the Golden Gate Bridge.

    +

    Our mission is to provide an accessible Python conference to everyone in Northern California. We understand that some people will need to travel for 2 or more hours to get to Petaluma, and that the costs of transport and lodging can add up. Our grants are intended to make your weekend at North Bay Python cost about as much as a weekend at home would cost.

    -

    All parking is free in Petaluma, however near the Mystic, street-level parking is time-limited. All-day parking is available at street level west of 5th St (towards 6th St), and at the the undercover garages at Keller St and at Theatre Square. Both garages are in short walking distance of the Mystic.

    +

    If you're selected to receive financial aid, we'll cover the following for you:

    +
      +
    • Ground transportation, up to $70 return: including public transit, including reasonable cab/rideshare fares between the venue and accommodation in Petaluma.
      • +
    • Accommodation subsidy, up to $80 per night, for up to three nights.
      • +
    • Free ticket to the conference.
      • +
    -

    By Public Transit

    +

    These subsidies are designed to make the conference affordable, no matter where you live in Northern California. You are still eligible even if you don't live close to Petaluma, however, we will not subsidise the cost of flights.

    -

    Public transit to Petaluma is currently not great.

    +

    Apply

    -

    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.

    +

    To apply, please fill out the application form.

    -

    SMART, the new train service that runs along the 101 corridor, recently started operations. SMART is not suitable for getting to North Bay Python if you travel on weekends, as the first train leaves after proceedings start. SMART may be a better option than taking the bus between San Rafael and Petaluma if you travel up on weekdays.

    +

    Applications will be assessed every Friday, starting November 10th until November 24th, or our budget is exhausted, whichever comes first. To increase your chances of getting accepted, please apply as soon as possible.

    +

    Applicatiom information

    -

    By Plane

    +

    In the application, you'll need to tell us the following:

    -

    Petaluma is within driving distance of all Bay Area Airports, and each airport has varying levels of public transit links to Petaluma.

    +
      +
    • Your name
      • +
    • Your company/organization
      • +
    • Why you want to come to North Bay Python
      • +
    • Where you're traveling from
      • +
    -

    Sonoma County Airport (STS) 25mi from venue

    +

    The form shouldn't take more than 10 minutes for you to fill out.

    -

    STS is 30 minutes out of Petaluma, and has nonstop flights to most major west coast cities on Alaska, United, and American.

    - -

    On weekdays and weekend afternoons, SMART train runs from STS to Downtown Petaluma Station, 1/4mi away from the North Bay Python venue. STS is also serviced by the Sonoma County Airport Express bus.

    - -

    San Francisco International (SFO)/Oakland International (OAK) 50mi from venue

    - -

    If you can't make it to STS, you can also try San Francisco (SFO) or Oakland (OAK) international airports. These have many more flights than STS, but are twice the distance away, and are subject to more highway traffic between the airport and Petaluma.

    - -

    Transfers to Petaluma are available through the Sonoma County Airport Express.

    - -

    San Jose International (SJC)/Sacramento (SMF) 85mi from venue

    - -

    If you're planning on renting a car, San Jose (SJC) or Sacramento (SMF) are both two hours drive away.

    - -

    Petaluma Municipal 3mi from venue

    - -

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

    {% endblock %} diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 461d80f..43bc52f 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -33,6 +33,7 @@ urlpatterns = [ url(r"^tickets$", RedirectView.as_view(url="attend")), url(r"^tickets/buy$", views.buy_ticket, name="buy_ticket"), url(r"^attend/business-case$", TemplateView.as_view(template_name="static_pages/attend/business-case.html"), name="attend/business-case"), + url(r"^attend/finaid$", TemplateView.as_view(template_name="static_pages/attend/finaid.html"), name="attend/finaid"), 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"), url(r"^attend/tshirt$", TemplateView.as_view(template_name="static_pages/attend/tshirt.html"), name="attend/tshirt"), From f7936e92b568c45b1f71a01ea743ca6895501397 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 6 Nov 2017 20:29:16 -0500 Subject: [PATCH 14/18] Add fined.html --- .../templates/static_pages/attend/finaid.html | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pinaxcon/templates/static_pages/attend/finaid.html diff --git a/pinaxcon/templates/static_pages/attend/finaid.html b/pinaxcon/templates/static_pages/attend/finaid.html new file mode 100644 index 0000000..7292ee7 --- /dev/null +++ b/pinaxcon/templates/static_pages/attend/finaid.html @@ -0,0 +1,51 @@ +{% extends "page_with_title_and_lede.html" %} + +{% load i18n %} + +{% block head_title %}Financial Aid{% endblock %} + +{% block heading %}Financial Aid{% endblock %} + +{% block body_class %}attend{% endblock %} + +{% block lede %} +Part of the Python Community Spirit is making knowledge, and access to the community available to everyone who needs it. If don't live near Petaluma and need help getting here, we want to help out. +{% endblock %} + +{% block content %} + +

    What We'll Cover

    + +

    Our mission is to provide an accessible Python conference to everyone in Northern California. We understand that some people will need to travel for 2 or more hours to get to Petaluma, and that the costs of transport and lodging can add up. Our grants are intended to make your weekend at North Bay Python cost about as much as a weekend at home would cost.

    + +

    If you're selected to receive financial aid, we'll cover the following for you:

    + +
      +
    • Ground transportation, up to $70 return: including public transit, including reasonable cab/rideshare fares between the venue and accommodation in Petaluma.
      • +
    • Accommodation subsidy, up to $80 per night, for up to 3 nights.
      • +
    • Free ticket to the conference.
      • +
    + +

    These subsidies are designed to make the conference affordable, no matter where you live in Northern California. You are still eligible even if you don't live close to Petaluma, however, we will not subsidise the cost of flights.

    + +

    Apply

    + +

    To apply, please fill out the application form.

    + +

    Applications will be assessed every Friday, starting November 10th until November 24th, or our budget is exhausted, whichever comes first. To increase your chances of getting accepted, please apply as soon as possible.

    + +

    Application Information

    + +

    In the application, you'll need to tell us the following:

    + +
      +
    • Your name
      • +
    • Your company/organization
      • +
    • Why you want to come to North Bay Python
      • +
    • Where you're traveling from
      • +
    + +

    The form shouldn't take more than 10 minutes for you to fill out.

    + + +{% endblock %} From 6f478a1a07c2164157fe977b6af07f754560c153 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 6 Nov 2017 20:29:22 -0500 Subject: [PATCH 15/18] fix finaid.html --- pinaxcon/templates/static_pages/attend/finaid.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinaxcon/templates/static_pages/attend/finaid.html b/pinaxcon/templates/static_pages/attend/finaid.html index 7292ee7..5f58b58 100644 --- a/pinaxcon/templates/static_pages/attend/finaid.html +++ b/pinaxcon/templates/static_pages/attend/finaid.html @@ -9,7 +9,7 @@ {% block body_class %}attend{% endblock %} {% block lede %} -Part of the Python Community Spirit is making knowledge, and access to the community available to everyone who needs it. If don't live near Petaluma and need help getting here, we want to help out. +Part of the Python community spirit is making knowledge – and access to the community – available to everyone who needs it. If don't live near Petaluma and need help getting here, we want to help out. {% endblock %} {% block content %} From ff43c02f89346104120f61cf8967627300c81940 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 6 Nov 2017 20:29:25 -0500 Subject: [PATCH 16/18] Revert "Finaid" This reverts commit b7b697d8035bdeaf0a298e4c81dbd05d8daa236a. --- .../templates/static_pages/attend/travel.html | 55 +++++++++++-------- pinaxcon/urls.py | 1 - 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/pinaxcon/templates/static_pages/attend/travel.html b/pinaxcon/templates/static_pages/attend/travel.html index 7f220a0..64ae257 100644 --- a/pinaxcon/templates/static_pages/attend/travel.html +++ b/pinaxcon/templates/static_pages/attend/travel.html @@ -2,50 +2,57 @@ {% load i18n %} -{% block head_title %}Financial Aid{% endblock %} +{% block head_title %}How to Get Here{% endblock %} -{% block heading %}Financial Aid{% endblock %} +{% block heading %}How to Get Here{% endblock %} {% block body_class %}attend{% endblock %} {% block lede %} -Part of the Python Community Spirit is making knowledge, and access to the community available to everyone who needs it. If you live far away from Petaluma and need help getting here, we want to help out. + Chances are you're probably not in Petaluma, so if you want to come to North Bay Python, then you'll need to get here somehow. The good news is that it's reasonably easy to get here, whether you're coming from Sonoma County, elsewhere in the Bay Area, or from further out of town. {% endblock %} + {% block content %} -

    What we'll cover

    +

    By Car

    -

    Our mission is to provide an accessible Python conference to everyone in Northern California. We understand that some people will need to travel for 2 or more hours to get to Petaluma, and that the costs of transport and lodging can add up. Our grants are intended to make your weekend at North Bay Python cost about as much as a weekend at home would cost.

    +

    If you're driving up, Downtown Petaluma is at exit 472A on Highway 101, 35 miles north of the Golden Gate Bridge.

    -

    If you're selected to receive financial aid, we'll cover the following for you:

    +

    All parking is free in Petaluma, however near the Mystic, street-level parking is time-limited. All-day parking is available at street level west of 5th St (towards 6th St), and at the the undercover garages at Keller St and at Theatre Square. Both garages are in short walking distance of the Mystic.

    -
      -
    • Ground transportation, up to $70 return: including public transit, including reasonable cab/rideshare fares between the venue and accommodation in Petaluma.
      • -
    • Accommodation subsidy, up to $80 per night, for up to three nights.
      • -
    • Free ticket to the conference.
      • -
    -

    These subsidies are designed to make the conference affordable, no matter where you live in Northern California. You are still eligible even if you don't live close to Petaluma, however, we will not subsidise the cost of flights.

    +

    By Public Transit

    -

    Apply

    +

    Public transit to Petaluma is currently not great.

    -

    To apply, please fill out the application form.

    +

    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.

    -

    Applications will be assessed every Friday, starting November 10th until November 24th, or our budget is exhausted, whichever comes first. To increase your chances of getting accepted, please apply as soon as possible.

    +

    SMART, the new train service that runs along the 101 corridor, recently started operations. SMART is not suitable for getting to North Bay Python if you travel on weekends, as the first train leaves after proceedings start. SMART may be a better option than taking the bus between San Rafael and Petaluma if you travel up on weekdays.

    -

    Applicatiom information

    -

    In the application, you'll need to tell us the following:

    +

    By Plane

    -
      -
    • Your name
      • -
    • Your company/organization
      • -
    • Why you want to come to North Bay Python
      • -
    • Where you're traveling from
      • -
    +

    Petaluma is within driving distance of all Bay Area Airports, and each airport has varying levels of public transit links to Petaluma.

    -

    The form shouldn't take more than 10 minutes for you to fill out.

    +

    Sonoma County Airport (STS) 25mi from venue

    +

    STS is 30 minutes out of Petaluma, and has nonstop flights to most major west coast cities on Alaska, United, and American.

    + +

    On weekdays and weekend afternoons, SMART train runs from STS to Downtown Petaluma Station, 1/4mi away from the North Bay Python venue. STS is also serviced by the Sonoma County Airport Express bus.

    + +

    San Francisco International (SFO)/Oakland International (OAK) 50mi from venue

    + +

    If you can't make it to STS, you can also try San Francisco (SFO) or Oakland (OAK) international airports. These have many more flights than STS, but are twice the distance away, and are subject to more highway traffic between the airport and Petaluma.

    + +

    Transfers to Petaluma are available through the Sonoma County Airport Express.

    + +

    San Jose International (SJC)/Sacramento (SMF) 85mi from venue

    + +

    If you're planning on renting a car, San Jose (SJC) or Sacramento (SMF) are both two hours drive away.

    + +

    Petaluma Municipal 3mi from venue

    + +

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

    {% endblock %} diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 43bc52f..461d80f 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -33,7 +33,6 @@ urlpatterns = [ url(r"^tickets$", RedirectView.as_view(url="attend")), url(r"^tickets/buy$", views.buy_ticket, name="buy_ticket"), url(r"^attend/business-case$", TemplateView.as_view(template_name="static_pages/attend/business-case.html"), name="attend/business-case"), - url(r"^attend/finaid$", TemplateView.as_view(template_name="static_pages/attend/finaid.html"), name="attend/finaid"), 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"), url(r"^attend/tshirt$", TemplateView.as_view(template_name="static_pages/attend/tshirt.html"), name="attend/tshirt"), From bcaa500665730f7d274019490eabfffb7e78c304 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 6 Nov 2017 20:32:53 -0500 Subject: [PATCH 17/18] re-add finaid.htm --- pinaxcon/urls.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 461d80f..43bc52f 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -33,6 +33,7 @@ urlpatterns = [ url(r"^tickets$", RedirectView.as_view(url="attend")), url(r"^tickets/buy$", views.buy_ticket, name="buy_ticket"), url(r"^attend/business-case$", TemplateView.as_view(template_name="static_pages/attend/business-case.html"), name="attend/business-case"), + url(r"^attend/finaid$", TemplateView.as_view(template_name="static_pages/attend/finaid.html"), name="attend/finaid"), 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"), url(r"^attend/tshirt$", TemplateView.as_view(template_name="static_pages/attend/tshirt.html"), name="attend/tshirt"), From a19985d1b9ab47da8644f9744f5e96abc7681b2b Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 6 Nov 2017 20:47:30 -0500 Subject: [PATCH 18/18] Oops --- pinaxcon/templates/static_pages/attend/finaid.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinaxcon/templates/static_pages/attend/finaid.html b/pinaxcon/templates/static_pages/attend/finaid.html index 5f58b58..e4ad8ee 100644 --- a/pinaxcon/templates/static_pages/attend/finaid.html +++ b/pinaxcon/templates/static_pages/attend/finaid.html @@ -30,7 +30,7 @@ Part of the Python community spirit is making knowledge – and access to th

    Apply

    -

    To apply, please fill out the application form.

    +

    To apply, please fill out the application form.

    Applications will be assessed every Friday, starting November 10th until November 24th, or our budget is exhausted, whichever comes first. To increase your chances of getting accepted, please apply as soon as possible.