Merge branch 'master' into prod

pinaxcon/proposals/forms.py

@@ -29,6 +29,13 @@ class ProposalForm(forms.ModelForm, ProposalMixIn):
         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"]

pinaxcon/templates/static_pages/about/colophon.html

@@ -12,7 +12,7 @@
 
 <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>
 

pinaxcon/templates/static_pages/homepage.html

@@ -28,7 +28,7 @@
 
           <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">
@@ -64,6 +64,7 @@
 
     <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>

pinaxcon/templates/static_pages/news.html

@@ -10,8 +10,6 @@
 
 {% 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>
@@ -24,8 +22,6 @@
 
 <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>

pinaxcon/urls.py

@@ -28,6 +28,9 @@ urlpatterns = [
     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

requirements/base.txt

@@ -24,7 +24,7 @@ django-nose==1.4.4
 coverage==4.0.3
 
 # Registrasion
-https://github.com/chrisjrn/registrasion/tarball/master#egg=registrasion
+https://github.com/chrisjrn/registrasion/tarball/master
-https://github.com/chrisjrn/symposion/tarball/northbaypython#egg=symposion
+https://github.com/chrisjrn/symposion/tarball/northbaypython
-https://github.com/chrisjrn/registrasion-stripe/tarball/master#egg=registrasion-stripe
+https://github.com/chrisjrn/registrasion-stripe/tarball/master
-https://github.com/chrisjrn/symposion-bootstrap-templates/tarball/master#egg=symposion-bootstrap-templates
+https://github.com/chrisjrn/symposion-bootstrap-templates/tarball/master