From 4152e5bf3e7781e995d1eb00a3412296acd1ec24 2017-11-30 05:12:04
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: 2017-11-30 05:12:04
Subject: [PATCH] Merge branch 'master' into prod

---

diff --git a/pinaxcon/templates/static_pages/attend/guides.html b/pinaxcon/templates/static_pages/attend/guides.html
index b6128d86ab03167185345760e92c672f9807ec80..17426cfd125f0f19bf212470d37ff78757238dea 100644
--- a/pinaxcon/templates/static_pages/attend/guides.html
+++ b/pinaxcon/templates/static_pages/attend/guides.html
@@ -33,7 +33,7 @@
 
 <ul>
   <li><strong><a href="/attend/accessibility-and-accommodations">Accessibility and Accommodations</a></strong> includes information for: parents; people with vision, hearing, and mobility issues; and people with dietary restrictions.</li>
-  <li><strong><a href="/attend/emergencies">Emergencies</a></strong> might involve the Code of Conduct, contacting organizers, calling the police, or finding a hospital or pharmacy.</li>
+  <li><strong><a href="/safety">Attendee Safety &amp; Emergencies</a></strong> that might involve the Code of Conduct, contacting organizers, calling the police, or finding a hospital or pharmacy.</li>
   <li><strong><a href="/attend/food">Finding Food</a></strong> is easy in Petaluma, especially with this guide to local restaurants and markets sponsored by Yelp.</li>
   <li><strong><a href="/wiki/fitness">Fitness</a></strong> doesn't need to take a backseat while at North Bay Python, we have information about gyms and pools as well as running and hiking paths.</li>
   <li><strong><a href="/attend/transit">Getting Around P'town</a></strong> has key distances and details about taxis, busses, and walking paths.</li>
diff --git a/pinaxcon/templates/static_pages/attend/emergencies.html b/pinaxcon/templates/static_pages/safety.html
similarity index 75%
rename from pinaxcon/templates/static_pages/attend/emergencies.html
rename to pinaxcon/templates/static_pages/safety.html
index 7d647451c6a6859dc3dbca1a8821bb97f7f23463..f60143fdb3049d1a48980e00e04c09e9ed835cbe 100644
--- a/pinaxcon/templates/static_pages/attend/emergencies.html
+++ b/pinaxcon/templates/static_pages/safety.html
@@ -2,9 +2,9 @@
 
 {% load i18n %}
 
-{% block head_title %}Emergencies{% endblock %}
+{% block head_title %}Participant Safety{% endblock %}
 
-{% block heading %}Emergencies{% endblock %}
+{% block heading %}Safety{% endblock %}
 
 {% block body_class %}attend{% endblock %}
 
@@ -12,18 +12,24 @@
   If a person's safety or health are at risk, please call local emergency dispatch at +1 (707) 762-2727 to get the police, fire department, or an ambulance, and then notify event organizers.
 {% endblock %}
 
-
 {% block content %}
 
-<p>Please find an organizer or volunteer if you need to report an issue or ask a question. If it's not urgent, email us at <a href="mailto:safety@northbaypython.org">safety@northbaypython.org</a>. If there is imminent danger, please call local emergency dispatch at +1 (707) 762-2727 (the local number for 911) first.</p>
+<p>Please find an organizer or volunteer if you need to report an issue or ask a question.</p>
 
-<h2>Emergency Dispatch</h2>
+<ul>
+  <li>If it's not urgent, email us at <strong><a href="mailto:safety@northbaypython.org">safety@northbaypython.org</a></strong>.</li>
+  <li>If there is imminent danger, please call local emergency dispatch at <strong>+1 (707) 762-2727</strong> (the local number for 911) first.</li>
+  <li>If another participant’s behaviour is making you feel unsafe, uncomfortable, or threatened, you can contact a member of our incident by calling <strong>+1 (707) 755-7357</strong>
+</ul>
 
-<p>911 is the number to dial to reach emergency dispatch in the United States. If you are dialing from a mobile phone, dial +1 (707) 762-2727 so that you are immediately connected with Petaluma's emergency dispatchers. You can find more information on the website for the <a href="http://cityofpetaluma.net/police/">City of Petaluma Police Department</a>.</p>
 
 <h2>Code of Conduct Incident Reporting</h2>
 
-<p>If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff. Conference staff will be wearing t-shirts and/or badges that clearly identify them as staff. You can email the incident response team at <a href="mailto:safety@northbaypython.org">safety@northbaypython.org</a>. You may also contact venue staff and ask to be put in touch with conference chair <a href="mailto:chrisjrn@northbaypython.org">Christopher Neugebauer</a>.</p>
+<p>If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff.</p>
+
+<p>Conference staff and organizers will be wearing badges that clearly identify them as staff or organizers.</p>
+
+<p>You can email the incident response team at <a href="mailto:safety@northbaypython.org">safety@northbaypython.org</a>. You may speak to any conference staff and ask to be put in touch with an organizer.</p>
 
 <p>If the matter is especially urgent, please dial our Code of Conduct incident hotline +1 (707) 755-7357. This number will automatically route to a member of the conference staff who can render assistance.</p>
 
@@ -35,7 +41,13 @@
   <li><a href="/code-of-conduct/harassment-staff-procedures">Staff procedure for incident handling</a></li>
 </ul>
 
-<h2>Hospitals</h2>
+
+<h2>Emergency Dispatch</h2>
+
+<p>911 is the number to dial to reach emergency dispatch in the United States. If you are dialing from a mobile phone, dial +1 (707) 762-2727 so that you are immediately connected with Petaluma's emergency dispatchers. You can find more information on the website for the <a href="http://cityofpetaluma.net/police/">City of Petaluma Police Department</a>.</p>
+
+
+<h2>Hospitals and Medical Care</h2>
 
 <h3>Emergency Room</h3>
 
@@ -59,6 +71,7 @@ Petaluma, CA 94954</p>
 Unit 41 Suite 10</br>
 Petaluma, CA 94954</p>
 
+
 <h2>Pharmacies</h2>
 
 <p>Here is a listing of local pharmacies ordered by distance from the conference venue:</p>
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 64481b5165954ad682812e33d665fe70da1069df..b1caf840893f5808e8fcd2b521df299068046819 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -47,8 +47,10 @@ urlpatterns = [
     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="emergencies")),
+    url(r"^safety$", TemplateView.as_view(template_name="static_pages/safety.html"), name="safety"),
+    url(r"^emergencies$", RedirectView.as_view(url="safety")),
+    url(r"^emergency$", RedirectView.as_view(url="safety")),
+
     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"),