From 6de963c1166d06a45afc4de7b00c0547b9779100 Mon Sep 17 00:00:00 2001
From: Joshua Simmons <i@joshuasimmons.name>
Date: Mon, 13 Nov 2017 18:05:51 -0800
Subject: [PATCH] draft local transit page and update URLs

---
 .../static_pages/attend/transit.html          | 30 ++++++++++++++++---
 pinaxcon/urls.py                              |  5 ++--
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/pinaxcon/templates/static_pages/attend/transit.html b/pinaxcon/templates/static_pages/attend/transit.html
index def1c1b..4607cc0 100644
--- a/pinaxcon/templates/static_pages/attend/transit.html
+++ b/pinaxcon/templates/static_pages/attend/transit.html
@@ -2,19 +2,41 @@
 
 {% load i18n %}
 
-{% block head_title %}Getting Around Ptown{% endblock %}
+{% block head_title %}Getting Around P'town{% endblock %}
 
-{% block heading %}Getting Around Ptown{% endblock %}
+{% block heading %}Getting Around P'town{% endblock %}
 
 {% block body_class %}attend{% endblock %}
 
 {% block lede %}
-  
+  Petaluma is, for the most part, very walkable. However, you can use public transit or taxis and  can find ample parking to help with the rest.
 {% endblock %}
 
 
 {% block content %}
 
-Getting Around Ptown has key distances and details about taxis, busses, and walking paths.
+<p>The Mystic and Hotel Petaluma are both located in Downtown Petaluma which is compact and walkable, but some hotels are further afield and you may find a need for taxis or public transit. Here you'll find a guide to local transit. You can find information about parking on the <a href="/attend/travel">Travel</a> page.</p>
+
+<h2>Public Transit</h2>
+
+<h3>Getting around Petaluma</h3>
+
+<p><a href="http://transit.cityofpetaluma.net/">Petaluma Transit</a> busses are one way of getting around town. There are two major transit hubs: Copeland Transit Mall near downtown, and Eastside Transit Center on the east side of Highway 101. Bus route 11 connects the two transit hubs.</p>
+
+<p>Route 2 runs on the east side of town, including by the Quality Inn. Route 10 and 11 run through downtown by the conference venue. Route 11 runs by the Best Western. Route 24 runs by the Sheraton, but like route 10, does not run on Sunday.</p>
+
+<h3>Getting around Sonoma County</h3>
+
+<p>There are two public transit options for getting around Sonoma County, including the <a href="http://sonomamarintrain.org/">SMART train</a> and <a href="http://sctransit.com/">Sonoma County Transit busses</a>. Both the <a href="https://goo.gl/maps/2E9Su6GJiFP2">train station</a> and the <a href="https://goo.gl/maps/jskmwX4FgM12">bus transit mall</a> are located across the river, a short distance away from the conference venue.</p>
+
+<h2>Taxis</h2>
+
+<p>There are a handful of taxi companies you can catch a ride with in Petaluma. You can also find rides using popular ride sharing apps.</p>
+
+<ul>
+  <li>A1 Taxi at +1 (707) 763-3393</li>
+  <li>J's Taxi at +1 (707) 364-1544</li>
+  <li>Petaluma Green Taxi at +1 (707) 769-8294</li>
+</ul>
 
 {% endblock %}
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 277cdb8..5ab3159 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -15,7 +15,6 @@ import symposion.views
 urlpatterns = [
     url(r"^$", TemplateView.as_view(template_name="static_pages/homepage.html"), name="home"),
 
-
     # about
     url(r"^about/north-bay-python$", TemplateView.as_view(template_name="static_pages/about/north_bay_python.html"), name="about/north-bay-python"),
     url(r"^about/petaluma$", TemplateView.as_view(template_name="static_pages/about/petaluma.html"), name="about/petaluma"),
@@ -43,8 +42,10 @@ urlpatterns = [
     url(r"^attend/accessibility-and-accommodations$",TemplateView.as_view(template_name="static_pages/attend/accommodations.html"), name="attend/accessibility-and-accommodations"),
     url(r"^accessibility$", RedirectView.as_view(url="attend/accessibility-and-accommodations")),
     url(r"^guides$",TemplateView.as_view(template_name="static_pages/attend/guides.html"), name="attend/guides"),
+    url(r"^guide$", RedirectView.as_view(url="guides")),
+
     url(r"^emergencies$", TemplateView.as_view(template_name="static_pages/attend/emergencies.html"), name="attend/emergencies"),
-    url(r"^emergency$", RedirectView.as_view(url="attend/emergencies")),
+    url(r"^emergency$", RedirectView.as_view(url="emergencies")),
     url(r"^attend/food$", TemplateView.as_view(template_name="static_pages/attend/food.html"), name="attend/food"),
     url(r"^food$", RedirectView.as_view(url="attend/food")),
     url(r"^attend/transit$", TemplateView.as_view(template_name="static_pages/attend/transit.html"), name="attend/transit"),