Enjoy free all-day parking close to the venue, or take regular buses from San Francisco, Marin County, and Sonoma County
-
Attendee Safety
+
We take our code of conduct serioiusly: our staff have taken enforcement training.
@@ -130,18 +130,18 @@
-
Opportunity Grants
+
-
+
If you live out of town, we want to make sure you can attend.
-
Diversity Targets
+
-
+
We want to look like the Bay Area. We have diversity targets for our speakers and audience.
diff --git a/pinaxcon/templates/static_pages/attend/finaid.html b/pinaxcon/templates/static_pages/opportunity-grant.html
similarity index 91%
rename from pinaxcon/templates/static_pages/attend/finaid.html
rename to pinaxcon/templates/static_pages/opportunity-grant.html
index 852928e..f33bdab 100644
--- a/pinaxcon/templates/static_pages/attend/finaid.html
+++ b/pinaxcon/templates/static_pages/opportunity-grant.html
@@ -2,9 +2,9 @@
{% load i18n %}
-{% block head_title %}Financial Aid{% endblock %}
+{% block head_title %}Opportunity Grants{% endblock %}
-{% block heading %}Financial Aid{% endblock %}
+{% block heading %}Opportunity Grants{% endblock %}
{% block body_class %}attend{% endblock %}
@@ -18,7 +18,7 @@ Part of the Python community spirit is making knowledge – and access to th
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:
+
If you're selected to receive an opportunity grant, 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.
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index ffd981c..8f4b21b 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -39,11 +39,13 @@ 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"^opportunity-grant$", TemplateView.as_view(template_name="static_pages/attend/finaid.html"), name="opportunity-grant"),
+
+ url(r"^opportunity-grant$", TemplateView.as_view(template_name="static_pages/opportunity-grant.html"), name="opportunity-grant"),
+ url(r"^attend/finaid$", RedirectView.as_view(url="/opportunity-grant")),
url(r"^attend/finaid$", RedirectView.as_view(url="/opportunity-grant")),
url(r"^attend/financial-aid$", RedirectView.as_view(url="/opportunity-grant")),
-
+
+ url(r"^attend/stay$", TemplateView.as_view(template_name="static_pages/attend/travel.html"), name="attend/travel"),
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"),
@@ -55,9 +57,9 @@ urlpatterns = [
url(r"^guide$", RedirectView.as_view(url="guides")),
# go
- url(r"^go/fly$", TemplateView.as_view(template_name="static_pages/attend/fly.html"), name="go/fly"),
- url(r"^go/stay$", TemplateView.as_view(template_name="static_pages/attend/stay.html"), name="go/stay"),
- url(r"^go/day-trip$", TemplateView.as_view(template_name="static_pages/attend/day-trip.html"), name="go/day-trip`"),
+ url(r"^go/fly$", TemplateView.as_view(template_name="static_pages/go/fly.html"), name="go/fly"),
+ url(r"^go/stay$", TemplateView.as_view(template_name="static_pages/go/stay.html"), name="go/stay"),
+ url(r"^go/day-trip$", TemplateView.as_view(template_name="static_pages/go/day-trip.html"), name="go/day-trip`"),
url(r"^safety$", TemplateView.as_view(template_name="static_pages/safety.html"), name="safety"),
url(r"^emergencies$", RedirectView.as_view(url="safety")),
diff --git a/static/images/brandon.jpg b/static/images/brandon.jpg
deleted file mode 100644
index 4202751..0000000
Binary files a/static/images/brandon.jpg and /dev/null differ
diff --git a/static/images/cczona.jpg b/static/images/cczona.jpg
deleted file mode 100644
index 0bdeda9..0000000
Binary files a/static/images/cczona.jpg and /dev/null differ
diff --git a/static/images/django-girls-2014.jpg b/static/images/homepage/django-girls-2014.jpg
similarity index 100%
rename from static/images/django-girls-2014.jpg
rename to static/images/homepage/django-girls-2014.jpg
diff --git a/static/images/homepage/golden-gate.jpg b/static/images/homepage/golden-gate.jpg
new file mode 100644
index 0000000..8866781
Binary files /dev/null and b/static/images/homepage/golden-gate.jpg differ
diff --git a/static/images/mystic-marquee.jpg b/static/images/homepage/mystic-marquee.jpg
similarity index 100%
rename from static/images/mystic-marquee.jpg
rename to static/images/homepage/mystic-marquee.jpg
diff --git a/static/images/mariatta.jpg b/static/images/mariatta.jpg
deleted file mode 100644
index de84f1c..0000000
Binary files a/static/images/mariatta.jpg and /dev/null differ
diff --git a/static/images/r0ml.jpg b/static/images/r0ml.jpg
deleted file mode 100644
index b86154a..0000000
Binary files a/static/images/r0ml.jpg and /dev/null differ
diff --git a/static/scss/custom.scss b/static/scss/custom.scss
index b3e9c7e..a9c8761 100644
--- a/static/scss/custom.scss
+++ b/static/scss/custom.scss
@@ -240,6 +240,10 @@ $homepage-block-smaller-min-height: 360px;
}
}
+
+ a {
+ color: $logo-sky-blue;
+ }
}
