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

@@ ... / @@ -31,2 +31,9 @@ class ProposalForm(forms.ModelForm, ProposalMixIn): @@
         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>.")

pinaxcon/templates/static_pages/about/colophon.html

➞

Show inline comments

...		@@ -14,3 +14,3 @@

		<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>

pinaxcon/templates/static_pages/homepage.html

➞

Show inline comments

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

pinaxcon/templates/static_pages/news.html

➞

Show inline comments

@@ ... / @@ -12,4 +12,2 @@ @@
 {% comment %}
 <h2>Now accepting talk proposals for North Bay Python 2017</h2>
@@ ... / @@ -26,4 +24,2 @@ @@
 {% endcomment %}
 <h2>North Bay Python joins Software Freedom Conservancy</h2>

pinaxcon/urls.py

➞

Show inline comments

@@ ... / @@ -30,2 +30,5 @@ urlpatterns = [ @@
     url(r"^proposals$", RedirectView.as_view(url="program/call-for-proposals")),
     url(r"^cfp$", RedirectView.as_view(url="program/call-for-proposals")),
     # attend

0 comments (0 inline, 0 general)