CopyleftConf/copyleftconf-website Changeset - 0e43bb3571ee

Changeset - 0e43bb3571ee

Parent rev.

Child rev.

[Not reviewed]

Merge

0 7 0

Christopher Neugebauer - 7 years ago 2017-08-21 00:31:12
chrisjrn@gmail.com

Merge branch 'refs/heads/chrisjrn/cfp-launch'

5 files changed with 13 insertions and 6 deletions:

pinaxcon/proposals/forms.py

pinaxcon/templates/static_pages/about/colophon.html

pinaxcon/templates/static_pages/homepage.html

pinaxcon/templates/static_pages/news.html

pinaxcon/urls.py

0 comments (0 inline, 0 general)

pinaxcon/proposals/forms.py

➞

Show inline comments

@@ ... / @@ -30,4 +30,11 @@ class ProposalForm(forms.ModelForm, ProposalMixIn): @@
         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):

pinaxcon/templates/static_pages/about/colophon.html

➞

Show inline comments

@@ ... / @@ -13,5 +13,5 @@ @@
 <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

➞

Show inline comments

@@ ... / @@ -29,5 +29,5 @@ @@
           <h4>
             December 2 &amp; 3, 2017<br/>
-            Talk submissions open August 21
+            Talk submissions close September 29
           </h4>
         </div>
@@ ... / @@ -65,4 +65,5 @@ @@
     <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>

pinaxcon/templates/static_pages/news.html

➞

Show inline comments

@@ ... / @@ -11,6 +11,4 @@ @@
 {% block content %}
 {% comment %}
 <h2>Now accepting talk proposals for North Bay Python 2017</h2>
@@ ... / @@ -25,6 +23,4 @@ @@
 <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>

pinaxcon/urls.py

➞

Show inline comments

@@ ... / @@ -29,4 +29,7 @@ urlpatterns = [ @@
     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

0 comments (0 inline, 0 general)