Changeset - e2618f812ecc
[Not reviewed]
Merge
0 6 0
Christopher Neugebauer - 7 years ago 2017-08-21 00:33:56
chrisjrn@gmail.com
Merge branch 'master' into prod
6 files changed with 17 insertions and 10 deletions:
0 comments (0 inline, 0 general)
pinaxcon/proposals/forms.py
Show inline comments
...
 
@@ -20,24 +20,31 @@ class ConferenceSpeakerForm(forms.ModelForm):
 
    def __init__(self, *a, **k):
 
        super(ConferenceSpeakerForm, self).__init__(*a, **k)
 
        self.fields['code_of_conduct'].required = True
 

	
 

	
 

	
 
class ProposalForm(forms.ModelForm, ProposalMixIn):
 

	
 
    def __init__(self, *a, **k):
 
        super(ProposalForm, self).__init__(*a, **k)
 
        self.description_required()
 
        self.abstract_required()
 
        self.fields["additional_notes"].help_text = ("Anything else "
 
            "you'd like the program committee to know when making their "
 
            "selection. This is not made public. "
 
            "Edit using "
 
            "<a href='http://daringfireball.net/projects/markdown/basics' "
 
            "target='_blank'>Markdown</a>.")
 

	
 

	
 
    def clean_description(self):
 
        value = self.cleaned_data["description"]
 
        if len(value) > 400:
 
            raise forms.ValidationError(
 
                u"The description must be less than 400 characters"
 
            )
 
        return value
 

	
 

	
 
class TalkProposalForm(ProposalForm):
 

	
pinaxcon/templates/static_pages/about/colophon.html
Show inline comments
...
 
@@ -3,25 +3,25 @@
 
{% load i18n %}
 

	
 
{% block head_title %}Colophon{% endblock %}
 

	
 
{% block heading %}Colophon{% endblock %}
 

	
 
{% block body_class %}about{% endblock %}
 

	
 
{% block content %}
 

	
 
<h2>Call for Proposals</h2>
 

	
 
<p>Portions of our Call for Proposals page were drawn from ideas seen on <a href="https://djangocon.eu">DjangoCon EU</a>, <a href="https://seagl.org">SeaGL</a>, <a href="http://www.fogcityruby.com/speak/">Fog City Ruby</a>, and others. Thanks to all for their inspiration and permission to borrow!</p>
 
<p>Portions of our <a href="/program/call-for-proposals">Call for Proposals</a> page were drawn from ideas seen on <a href="https://djangocon.eu" title="DjangoCon Europe">DjangoCon EU</a>, <a href="https://seagl.org" title="Seattle GNU Linux">SeaGL</a>, <a href="http://www.fogcityruby.com/speak/" title="Fog City Ruby">Fog City Ruby</a>, and others. Thanks to all for their inspiration and permission to borrow!</p>
 

	
 
<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</a> license, 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</a> license.</p>
 

	
 
<h2>Fiscal Sponsor</h2>
 

	
 
<p>Our fiscal sponsor is <a href="https://sfconservancy.org">Software Freedom Conservancy</a>, a 501(c)(3) charity dedicated to the promotion and development of free and open source software. Conservancy allows us to work without managing our own corporate structure and administrative services. Our relationship with Conservancy goes beyond logistics, though, as we are also philosophically aligned as we work to advance software freedom and expand the Python developer community.</p>
 

	
 
<h2>Photography</h2>
 

	
 
<ul>
pinaxcon/templates/static_pages/homepage.html
Show inline comments
...
 
@@ -19,25 +19,25 @@
 
        <h2 class="homepage-subtitle">A Python conference north of the Golden Gate</h2>
 
      </div>
 

	
 
      <div class="row">
 
        <div class="col-md-6">
 
          <h3>
 
            The Mystic Theatre</br>
 
            Petaluma, California
 
          </h3>
 

	
 
          <h4>
 
            December 2 &amp; 3, 2017<br/>
 
            Talk submissions open August 21
 
            Talk submissions close September 29
 
          </h4>
 
        </div>
 
        <div class="col-md-4 col-md-offset-2 email-signup-panel">
 
          <div class="panel panel-default">
 
            <div class="panel-heading">
 
              <h2 class="panel-title">Sign up for our low-volume announcements newsletter!</h4>
 
            </div>
 
            <div class="panel-body">
 
              <form
 
                class="form-inline"
 
                action="https://tinyletter.com/northbaypython" method="post" target="popupwindow" onsubmit="window.open('https://tinyletter.com/northbaypython', 'popupwindow', 'scrollbars=yes,width=800,height=600');return true">
 
                <div class="form-group">
...
 
@@ -55,24 +55,25 @@
 
                <input type="hidden" value="1" name="embed"/>
 
              </form>
 
            </div>
 
          </div>
 
        </div>
 

	
 
      </div>
 

	
 
    </div>
 

	
 
    <div class="container homepage-block-footer">
 
      <div>
 
        <a class="btn btn-primary btn-lg" href="/dashboard">Submit a Proposal</a>
 
        <a class="btn btn-default btn-lg " href="https://twitter.com/northbaypython">Twitter</a>
 
        <a class="btn btn-default btn-lg" href="https://facebook.com/northbaypython">Facebook</a>
 
      </div>
 
    </div>
 
  </div>
 

	
 
  <div class="jumbotron homepage-block dark">
 
    <div class="homepage-block-bg mystic-background"></div>
 
    <div class="container homepage-block-content">
 
      <h1>Downtown Petaluma</h1>
 

	
 
      <p>North Bay Python's home is Petaluma, a delightfully quaint dairy town, nestled on a river at the edge of California's Wine Country. Here's what you can look forward to:</p>
pinaxcon/templates/static_pages/news.html
Show inline comments
 
{% extends "page_with_title_and_lede.html" %}
 

	
 
{% load i18n %}
 

	
 
{% block head_title %}News{% endblock %}
 

	
 
{% block heading %}News{% endblock %}
 

	
 
{% block body_class %}news{% endblock %}
 

	
 
{% block content %}
 

	
 
{% comment %}
 

	
 
<h2>Now accepting talk proposals for North Bay Python 2017</h2>
 

	
 
<p><span class="date">Monday, August 21, 2017</span>&mdash;The North Bay Python team is excited to announce that the <a href="/program/call-for-proposals" title="North Bay Python 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 and 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" title="North Bay Python proposal 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" title="North Bay Python on Twitter">Twitter</a>, <a href="https://facebook.com/northbaypython" title="North Bay Python on Facebook">Facebook</a>, and <a href="https://webchat.freenode.net/?channels=%23nbpy" title="IRC Web Client for #nbpy Channel on Freenode">IRC</a>, or you can <a href="mailto:program@northbaypython.org" title="program@northbaypython.org">email us</a>. Please, get started today! The <a href="/program/call-for-proposals" title="North Bay Python Call for Proposals">call for proposals</a> closes on September 29, 2017.</p>
 

	
 
{% endcomment %}
 

	
 
<h2>North Bay Python joins Software Freedom Conservancy</h2>
 

	
 
<p><span class="date">Wednesday, August 16, 2017</span>&mdash;We are proud to announce that North Bay Python is now a member project of <a href="https://sfconservancy.org" title="Software Freedom Conservancy">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/" title="Current Member Projects of the Software Freedom Conservancy">free and open source software projects</a>, like <a href="http://www.seleniumhq.org/" title="Selenium">Selenium</a>, <a href="https://pypy.org/" title="PyPy">PyPy</a>, <a href="https://www.phpmyadmin.net/" title="phpMyAdmin">phpMyAdmin</a>, <a href="https://twistedmatrix.com/trac/" title="Twisted">Twisted</a>, and <a href="https://www.gnome.org/outreachy/" title="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 participants and will be promoting member projects relevant to the Python community at the conference. Interested Outreachy alums (past or present) should <a href="mailto:outreach@northbaypython.org" title="outreach@northbaypython.org">contact us</a>. We'll also have discounted tickets available for active financial supporters of Software Freedom Conservancy.</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" title="Software Freedom Conservancy">their website</a> and give them your support.</p>
 

	
 
{% endblock %}
pinaxcon/urls.py
Show inline comments
...
 
@@ -19,24 +19,27 @@ urlpatterns = [
 
    url(r"^about/north-bay-python$", TemplateView.as_view(template_name="static_pages/about/north_bay_python.html"), name="about/north-bay-python"),
 
    # TODO add /about/the-mystic
 
    # TODO add /about/petaluma
 
    url(r"^about/team$", TemplateView.as_view(template_name="static_pages/about/team.html"), name="about/team"),
 
    url(r"^about/colophon$", TemplateView.as_view(template_name="static_pages/about/colophon.html"), name="about/colophon"),
 

	
 
    # program
 
    # TODO add /program/sessions
 
    # TODO add /program/events
 
    url(r"^program/call-for-proposals$", TemplateView.as_view(template_name="static_pages/program/call_for_proposals.html"), name="program/call-for-proposals"),
 
    url(r"^program/selection-process$", TemplateView.as_view(template_name="static_pages/program/selection_process.html"), name="program/selection-process"),
 

	
 
    url(r"^proposals$", RedirectView.as_view(url="program/call-for-proposals")),
 
    url(r"^cfp$", RedirectView.as_view(url="program/call-for-proposals")),
 

	
 
    # attend
 
    # TODO add /attend/buy-a-ticket
 
    # TODO add /attend/volunteer
 
    # TODO add /attend/financial-assistance
 
    # TODO add /attend/how-to-pitch-your-manager
 
    # TODO add /attend/how-to-get-here
 
    # TODO add /attend/where-to-stay
 
    url(r"^code-of-conduct$", TemplateView.as_view(template_name="static_pages/code_of_conduct/code_of_conduct.html"), name="code-of-conduct"),
 
    url(r"^code-of-conduct/harassment-incidents$", TemplateView.as_view(template_name="static_pages/code_of_conduct/harassment_procedure_attendee.html"), name="code-of-conduct/harassment-incidents"),
 
    url(r"^code-of-conduct/harassment-staff-procedures$", TemplateView.as_view(template_name="static_pages/code_of_conduct/harassment_procedure_staff.html"), name="code-of-conduct/harassment-staff-procedures"),
 
    url(r"^terms-and-conditions$", TemplateView.as_view(template_name="static_pages/terms_and_conditions.html"), name="terms-and-conditions"),
 

	
requirements/base.txt
Show inline comments
...
 
@@ -15,16 +15,16 @@ django-markdown-deux==1.0.5
 
django-sitetree==1.8.0
 
django-countries==4.6.1
 
easy-thumbnails==2.4.1
 
django-timezone-field==2.0
 
django-model-utils==3.0.0
 

	
 

	
 
# For testing
 
django-nose==1.4.4
 
coverage==4.0.3
 

	
 
# Registrasion
 
https://github.com/chrisjrn/registrasion/tarball/master#egg=registrasion
 
https://github.com/chrisjrn/symposion/tarball/northbaypython#egg=symposion
 
https://github.com/chrisjrn/registrasion-stripe/tarball/master#egg=registrasion-stripe
 
https://github.com/chrisjrn/symposion-bootstrap-templates/tarball/master#egg=symposion-bootstrap-templates
 
https://github.com/chrisjrn/registrasion/tarball/master
 
https://github.com/chrisjrn/symposion/tarball/northbaypython
 
https://github.com/chrisjrn/registrasion-stripe/tarball/master
 
https://github.com/chrisjrn/symposion-bootstrap-templates/tarball/master
0 comments (0 inline, 0 general)