Merge pull request #28 from northbaypython/josh/copy

add terms and conditions and news, a few minor tweaks

.gitignore

@@ -6,3 +6,4 @@ dev.db
 .coverage
 staticfiles
 venv/
+pinaxcon/site_media

pinaxcon/templates/_default_sidebar.html

@@ -15,7 +15,7 @@
                 <div>
                     {% if sponsor.website_logo %}
                         <a href="{{ sponsor.external_url }}">
-                            <img src="{% thumbnail sponsor.website_logo '100x60' %}" alt="{{ sponsor.name }}" />
+                            <img src="{% thumbnail sponsor.website_logo '150x90' %}" alt="{{ sponsor.name }}" />
                         </a>
                     {% else %}
                         <a href="{{ sponsor.external_url }}">{{ sponsor.name }}</a>

pinaxcon/templates/_footer.html

@@ -1,6 +1,7 @@
 <div class="pull-left">
     North Bay Python is a member project of the <a href="https://sfconservancy.org">Software Freedom Conservancy</a>, a 501(c)(3) charity.<br/>
-    <a href="/code-of-conduct">Code of Conduct</a> | <a href="/terms-and-conditions">Terms and Conditions</a> | <a href="/about/colophon">Colophon</a>
+
+    <a href="https://facebook.com/northbaypython">Facebook</a> | <a href="https://twitter.com/northbaypython">Twitter</a> | <a href="https://lanyrd.com/2017/nbpy">Lanyrd</a> | <a href="/code-of-conduct">Code of Conduct</a> | <a href="/terms-and-conditions">Terms and Conditions</a> | <a href="/about/colophon">Colophon</a>
 </div>
 
 <div class="pull-right">

pinaxcon/templates/static_pages/about/colophon.html

@@ -16,12 +16,16 @@
 
 <h2>Code of Conduct</h2>
 
-<p>Our <a href="/code-of-conduct">Code of Conduct</a> was forked from the <a href="https://github.com/python/pycon-code-of-conduct">PyCon US Code of Conduct</a>, including the staff and attendee guides, under a <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported License</a>, itself originally forked from the example policy from the <a href="http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy">Geek Feminism wiki</a>, created by the <a href="https://adainitiative.org/">Ada Initiative</a> and other volunteers. which is under a <a href="https://creativecommons.org/publicdomain/zero/1.0/">Creative Commons Zero license</a>.</p>
+<p>Our <a href="/code-of-conduct">Code of Conduct</a> was forked from the <a href="https://github.com/python/pycon-code-of-conduct">PyCon US Code of Conduct</a>, including the staff and attendee guides, under a <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported License</a>, itself originally forked from the example policy from the <a href="http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy">Geek Feminism wiki</a>, created by the <a href="https://adainitiative.org/">Ada Initiative</a> and other volunteers, which is under a <a href="https://creativecommons.org/publicdomain/zero/1.0/">Creative Commons Zero license</a>.</p>
 
 <h2>Python</h2>
 
 <p>"Python" and the Python logos are trademarks or registered trademarks of the <a href="https://python.org">Python Software Foundation</a>, used by North Bay Python with permission from the Foundation.</p>
 
+<h2>Terms and Conditions</h2>
+
+<p>Our <a href="/terms-and-conditions">Terms and Conditions</a> were forked from the <a href="https://github.com/linuxaustralia/constitution_and_policies/blob/master/terms_and_conditions.md">Linux Australia Event Terms and Conditions</a> under the <a href="https://github.com/linuxaustralia/constitution_and_policies/blob/master/LICENCE.md">GNU General Public License v3.0</a>. Our Photography and Audio Video Recording policy is adapted from the <a href="https://evergreen-ils.org/conference/photography-policy/">Evergreen policy</a>, itself adapted from the <a href="https://adacamp.org/adacamp-toolkit/policies/#photo">AdaCamp policy</a> under a <a href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution Share Alike 4.0 International License</a> license.</p>
+
 <h2>Web Application</h2>
 
 <p>Our website is powered by a heap of free and open source software, most notably:</p>

pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.md

@@ -1,4 +1,4 @@
-This procedure has been adopted from the Ada Initiative's guide titled "[Conference anti-harassment/Responding to Reports](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Responding_to_reports)”.
+*This procedure has been adopted from the Ada Initiative's guide titled "[Conference anti-harassment/Responding to Reports](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Responding_to_reports)”.*
 
 1\. Keep in mind that all conference staff will be wearing a conference t-shirt/button with the word “STAFF” on it (or otherwise clearly marked as staff). The staff will also be prepared to handle the incident. All of our staff are informed of the [code of conduct policy](/code-of-conduct) and guide for handling harassment at the conference. *There will be a mandatory staff meeting onsite at the conference when this will be reiterated.*
 

pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.md

@@ -1,6 +1,5 @@
-This procedure has been adopted from the Ada Initiative's guide titled "[Conference anti-harassment/Responding to Reports](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Responding_to_reports)”.
+*This procedure has been adopted from the Ada Initiative's guide titled "[Conference anti-harassment/Responding to Reports](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Responding_to_reports)”.*
 
--------------------------------------------------------------------------------------------------
 Be sure to have a good understanding of our Code of Conduct policy, which can be found here: [https://northbaypython.org/code-of-conduct](/code-of-conduct)
 
 Also have a good understanding of what is expected from an attendee that wants to report a harassment incident. These guidelines can be found here: [https://northbaypython.org/code-of-conduct/harassment-incidents](/code-of-conduct/harassment-incidents)

pinaxcon/templates/static_pages/news.html

@@ -10,7 +10,26 @@
 
 {% block content %}
 
-  * conservancy press release
+<h2>Call for Proposals is now open for North Bay Python 2017</h2>
-  * CFP opening
+
+<p><span class="date">Monday, August 21, 2017</span> -- The North Bay Python team is excited to announce that the <a href="/program/call-for-proposals">call for proposals</a> (CFP) is now open! We are seeking speakers of all experience levels to contribute to our inaugural conference. The CFP will close on September 29, 2017.</p>
+
+<p>North Bay Python is a single-track event featuring two days of presentations by members of the community. The vast majority of the conference program will come from people who propose talks in our CFP process. Whether you use Python professionally, as a hobbyist, or are just excited about Python or programming or open source, we'd love to hear from you.</p>
+
+<p>Our program committee, which is responsible for reviewing proposals, is interested in building a program that reflects the diversity of people who are using Python. Never given a presentation before but excited to share? We're here to help you craft a proposal and can refer you to quality resources for making your first conference talk. Not sure what to talk about, but interested in trying? We've got ideas for presentations we'd love to see and we're happy to share them with you!</p>
+
+<p>In order to ensure a balanced program, we are proactively doing outreach to new and experienced speakers alike. We are also including a blind review phase in our <a href="/program/selection-process">selection process</a> in order to combat bias. Our goal is to have no less than 33% of our speakers be not-men, ideally 50%, and to reflect the racial diversity of United States and Bay Area demographics.</p>
+
+<p>Feel free to reach out with any questions, comments, or ideas you have. You can find us on <a href="https://twitter.com/northbaypython">Twitter</a>, <a href="https://facebook.com/northbaypython">Facebook</a>, and <a href="http://webchat.freenode.net/?channels=%23nbpy">IRC</a>, or you can <a href="mailto:program@northbaypython.org">email us</a>. And, please, get started today! The call for proposals closes on September 29, 2017.</p>
+
+<h2>North Bay Python joins Software Freedom Conservancy</h2>
+
+<p><span class="date">Bloop, August Bleep, 2017</span> -- We are proud to announce that North Bay Python is now a member project of <a href="https://sfconservancy.org">Software Freedom Conservancy</a>, a 501(c)(3) charity dedicated to ethical technology and the development and promotion free and open source software. Conservancy will act as our fiscal sponsor, allowing our team to operate without managing our own corporate structure and administrative services.</p>
+
+<p>Conservancy is home to many popular <a href="https://sfconservancy.org/projects/current/">free and open source software projects</a>, like <a href="http://www.seleniumhq.org/">Selenium</a>, <a href="https://www.phpmyadmin.net/">phpMyAdmin</a>, <a href="https://twistedmatrix.com/trac/">Twisted</a>, and <a href="https://www.gnome.org/outreachy/">Outreachy</a>, some of which run their own events. North Bay Python has the distinct honor of being the first member project that is exclusively focused on organizing community events.</p>
+
+<p>We couldn't be more excited. We're celebrating by donating five free tickets to Outreachy interns and will be promoting member projects relevant to the Python community at the conference. Interested Outreachy interns should <a href="mailto:outreach@northbaypython.org">contact us</a>. We'll also have discounted tickets available for active financial supporters of Software Freedom Conservancy - details will be announced when tickets go on sale.</p>
+
+<p>We look forward to working with Conservancy to advance software freedom and expand the community of Python developers. If this is the first time you've heard of Conservancy, we encourage you to check out <a href="https://sfconservancy.org">their website</a> and give them your support.</p>
 
 {% endblock %}

pinaxcon/templates/static_pages/terms_and_conditions.html

@@ -1,6 +1,7 @@
 {% extends "page_with_title_and_lede.html" %}
 
 {% load i18n %}
+{% load markdown_deux_tags %}
 
 {% block head_title %}Terms and Conditions{% endblock %}
 
@@ -9,5 +10,9 @@
 {% block body_class %}terms-and-conditions{% endblock %}
 
 {% block content %}
+  {% markdown %}
 
+{% include "static_pages/terms_and_conditions.md" %}
+
+  {% endmarkdown %}
 {% endblock %}

pinaxcon/templates/static_pages/terms_and_conditions.md

@@ -0,0 +1,116 @@
+These Terms and Conditions apply to all attendees who have registered for North Bay Python.
+
+Registration
+------------
+
+Registering for the event does not guarantee your ticket until it has been paid for in full. So to secure your ticket, pay the registration invoice as soon as possible.
+
+Security and Credit Cards
+-------------------------
+
+All transactions are performed through a payment gateway facility and use SSL encryption. The facility accepts MasterCard, Visa, and may accept other cards as well. All transactions are performed by the event organizers on behalf of Software Freedom Conservancy.
+
+Cancellation Policy
+-------------------
+
+**Cancellations made prior to November 2, 2017**: Incur a cancellation fee of $25 or 15% of the ticket cost, whichever is greater, which will be deducted from any registration fee paid. The balance will be refunded.
+
+**Cancellations made after November 2, 2017**: No refund.
+
+Substitutions
+-------------
+
+You may substitute another person, however you must contact us with this person's details. If you wish to substitute after November 2, 2017 please note that we will not be able to provide any personalized items.
+
+Privacy Notice
+--------------
+
+In the course of registering for the event and related events, personal information will be collected about attendees such as their name, contact details, etc. This information is required to facilitate registration to the event, for catering requirements, and for organizers or their agents to contact particular attendees as and when required in respect of the event. Attendees who do not disclose this personal information will be unable to complete registration at the event and will therefore not be able to attend.
+
+Personal information will only be disclosed to North Bay Python, Software Freedom Conservancy, and to Government agencies where organizers believe disclosure is appropriate for legal compliance and law enforcement; to facilitate court proceedings; to enforce our terms and conditions; or to protect the rights, property, or safety of the event, our attendees, or others. North Bay Python and Software Freedom Conservancy will not sell your personal information to third parties and will not use your personal information to send promotional material from any of our affiliated partners and/or sponsors.
+
+As part of the registration process attendees will be asked if they would like to subscribe to the event mailing lists and/or the event announcement mailing list. Attendees who subscribe to one or more of these lists will be sent emails from the event organizers and other subscribers to the mailing lists. If at any time, attendees wish to unsubscribe from any of these mailing lists, please follow the 'how to unsubscribe' directions on the bottom of any message you receive from these mailing lists.
+
+From time to time event organizers update their information and website practices. Please regularly review this page for the most recent information about the event privacy practices.
+
+All personal information will be kept private and used only for event registration purposes, statistics for future events, and convenience for future event registration.
+
+Network
+-------
+
+The event may provide attendees with access to a wired and/or wireless network. Access to this network is a privilege and not an entitlement, and must be used appropriately. Inappropriate use includes, but is not limited to: unlawful activities, interfering with the equipment or network access of others and not respecting the reasonable expectations of privacy that attendees have for traffic flowing through the network.
+
+If any attendees use the network inappropriately, then the event organisers will take any enforcement action they consider appropriate. Enforcement action includes but is not limited to:
+
+* suspending access to the network
+* disconnecting the network permanently
+* the alleged offender may be asked to immediately leave the venue and/or will be prohibited from continuing to attend the event (without reimbursement)
+* the incident may be reported to the police
+* any other measure the event organizers see fit
+
+Be aware that for security and operational reasons the event organizers may both monitor and log network traffic.
+
+Discrimination and Anti-Social Behaviour
+----------------------------------------
+
+North Bay Python is proud to support people from all walks of life, especially underrepresented groups like women and people of color, and will not tolerate in any fashion any intimidation, harassment, and/or any abusive, discriminatory or derogatory behaviour by any attendees of the event and/or related events.
+
+Examples of these behaviors and measures the event organizers may take are set out in the [Code of Conduct](/code-of-conduct). By registering for and attending North Bay Python, you agree to this Code of Conduct.
+
+Talk Recordings
+---------------
+
+Event organizers may provide recordings of talks (audio and/or video) given at the event. This service is provided on a best-effort basis only. Any recordings will be released as and when they are ready, which may be some time after the conclusion of the event, and the recordings may be of varying quality.
+
+Photography and Audio Video Recording
+-------------------------------------
+
+This applies to all attendees of North Bay Python and related events, including staff who are designated as official photographers and audio and video recorders.
+
+Do not photograph, video or audio record anyone without their express permission.
+
+Attendees will have a way to visibly signal their preference for photography at the conference. You agree to consider and act according to these preferences:
+
+* Opt-in: Photography always okay
+* Permission required: Ask before photographing
+* Opt-out: Photographs are never okay, don't ask
+
+There is no prior opt-in for audio or video recordings. You must always ask before recording. 
+
+The event may have one or more staff taking photographs and/or audio or video recordings during the 
+event. These staff will respect attendees' preferences regarding photography and recordings.
+
+The only exception is for recordings of talks given at the event where attendees who ask questions of the presenter may be included in the talk recording.
+
+If Software Freedom Conservancy or North Bay Python organizers chooses to publish photographs and recordings taken by event staff, we will publish them under a Creative Commons license. Conservancy and North Bay Python further reserve the right to use those photographs and recordings in promotional materials to promote North Bay Python and/or the use of free and open source software.
+
+If there is a violation of this policy, event organizers will request that the photograph be removed from any sites where it was posted and deleted from the devices. In the event that this request is ignored or further violations occur, the participants violating this policy may be sanctioned or expelled from the conference without a refund or banned from future North Bay Python events.
+
+Media
+-----
+
+There are a limited number of Media Passes available to media personnel. Media Passes are free of charge, and entitle media personnel to attend the event with all the entitlements of a Corporate registration. Please note, due to the limited numbers of Media Passes available, all Media Passes will need to be approved by the event organizers.
+
+Any media attending the event are required to identify themselves as "media" to attendees prior to speaking on the record with any attendees of the event. It is the responsibility of the media to introduce themselves to the persons they wish to interview and to arrange any interviews with those persons. The event organizers will not make introductions or arrange interviews on behalf of media.
+
+Students
+--------
+
+Students who register for a student ticket (if available) to attend the event may be required to provide event organizers with proof that they are eligible for registration as a student, such as providing a valid student ID card.
+
+Smoke-free
+----------
+
+All event venues including the social event venues are smoke-free. If attendees wish to smoke during the event and/or related events, they must do so in signed areas. Please consider others and refrain from smoking directly outside the venues' entrances.
+
+Health and Safety
+-----------------
+
+If you are attending the event as a presenter, it is your responsibility to ensure that your talk meets health and safety requirements under United States and California law. If you are unsure about what this means, please contact the event organizers.
+
+Immigration/Entry Requirements
+------------------------------
+
+Anyone who lives outside the United States will need a passport and may require a visa to gain entry into the United States. Please contact your local United States embassy to determine your travel needs. You should take into account the Cancellation Policy above and do this well in advance of the event.
+
+Where a letter of invitation is required, one will be issued by event organizers for presenters whose submissions have been accepted.