From 9329cdbaf5a935e7c78c3d8005476f3161ef57dd Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer <_@chrisjrn.com> Date: Sat, 15 Jun 2019 13:09:30 -0500 Subject: [PATCH] First pile of homepage cleanup --- .../static_pages/about/colophon.html | 2 ++ .../static_pages/{attend => go}/day-trip.html | 0 .../static_pages/{attend => go}/fly.html | 0 .../static_pages/{attend => go}/stay.html | 0 pinaxcon/templates/static_pages/homepage.html | 18 +++++++++--------- .../finaid.html => opportunity-grant.html} | 6 +++--- pinaxcon/urls.py | 14 ++++++++------ static/images/brandon.jpg | Bin 27174 -> 0 bytes static/images/cczona.jpg | Bin 80333 -> 0 bytes .../{ => homepage}/django-girls-2014.jpg | Bin static/images/homepage/golden-gate.jpg | Bin 0 -> 704749 bytes .../images/{ => homepage}/mystic-marquee.jpg | Bin static/images/mariatta.jpg | Bin 31881 -> 0 bytes static/images/r0ml.jpg | Bin 39869 -> 0 bytes static/scss/custom.scss | 4 ++++ 15 files changed, 26 insertions(+), 18 deletions(-) rename pinaxcon/templates/static_pages/{attend => go}/day-trip.html (100%) rename pinaxcon/templates/static_pages/{attend => go}/fly.html (100%) rename pinaxcon/templates/static_pages/{attend => go}/stay.html (100%) rename pinaxcon/templates/static_pages/{attend/finaid.html => opportunity-grant.html} (91%) delete mode 100644 static/images/brandon.jpg delete mode 100644 static/images/cczona.jpg rename static/images/{ => homepage}/django-girls-2014.jpg (100%) create mode 100644 static/images/homepage/golden-gate.jpg rename static/images/{ => homepage}/mystic-marquee.jpg (100%) delete mode 100644 static/images/mariatta.jpg delete mode 100644 static/images/r0ml.jpg diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index 2dc2f66..a4ee233 100644 --- a/pinaxcon/templates/static_pages/about/colophon.html +++ b/pinaxcon/templates/static_pages/about/colophon.html @@ -27,6 +27,8 @@

Python

diff --git a/pinaxcon/templates/static_pages/attend/day-trip.html b/pinaxcon/templates/static_pages/go/day-trip.html similarity index 100% rename from pinaxcon/templates/static_pages/attend/day-trip.html rename to pinaxcon/templates/static_pages/go/day-trip.html diff --git a/pinaxcon/templates/static_pages/attend/fly.html b/pinaxcon/templates/static_pages/go/fly.html similarity index 100% rename from pinaxcon/templates/static_pages/attend/fly.html rename to pinaxcon/templates/static_pages/go/fly.html diff --git a/pinaxcon/templates/static_pages/attend/stay.html b/pinaxcon/templates/static_pages/go/stay.html similarity index 100% rename from pinaxcon/templates/static_pages/attend/stay.html rename to pinaxcon/templates/static_pages/go/stay.html diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index abf1997..96ddda7 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -72,7 +72,7 @@
-

Fly

+

Fly

@@ -85,9 +85,9 @@

-

Stay

+

Stay

-
+

Drive 35 miles North of the Golden Gate Bridge, or take transit from downtown San Francisco, and spend the night. @@ -98,7 +98,7 @@

-

Day Trip

+

Day Trip

Enjoy free all-day parking close to the venue, or take regular buses from San Francisco, Marin County, and Sonoma County

@@ -121,7 +121,7 @@
-

Attendee Safety

+

Attendee Safety

We take our code of conduct serioiusly: our staff have taken enforcement training.

@@ -130,18 +130,18 @@
-

Opportunity Grants

+

Opportunity Grants

-
+

If you live out of town, we want to make sure you can attend.

-

Diversity Targets

+

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: