Merge branch 'master' into prod

This commit is contained in:
Christopher Neugebauer 2017-10-10 17:51:06 -07:00
commit 76d87f27c1
3 changed files with 13 additions and 2 deletions

View file

@ -541,7 +541,7 @@
"fields": {
"title": "How to Pitch Your Manager",
"hint": "",
"url": "/attend/business-cases",
"url": "/attend/business-case",
"urlaspattern": false,
"tree": 1,
"hidden": false,

View file

@ -1,4 +1,5 @@
{% load staticfiles %}
{% load sponsorship_tags %}
<div class="row">
<div class="logo">
@ -10,6 +11,16 @@
<div class="footer-copy">
<p>&copy; 2017 North Bay Python, member project of <a href="https://sfconservancy.org" >Software Freedom Conservancy</a>, a 501(c)(3) charity.</p>
{% sponsors "platinum" as platinum %}
<p>We acknowledge the support of our Platinum sponsor{{ platinum|length|pluralize}},
{% for sponsor in platinum %}
{% if forloop.last and not forloop.first %}
and
{% endif %}
{{ sponsor }}{% if forloop.last %}.{% endif %}
{% endfor %}
<p>
<a href="https://facebook.com/northbaypython">Facebook</a>
| <a href="https://twitter.com/northbaypython">Twitter</a>

View file

@ -13,7 +13,7 @@
<a name="3"></a>
<h2>Tickets now on sale for North Bay Python 2017</h2>
<p><span class="date">Thursday, October 5, 2017</span>&mdash;We are excited to announce that <a href="https://2017.northbaypython.org/tickets">tickets are now on sale</a> for North Bay Python 2017. With just two months until the conference we have a few key dates coming up:</p>
<p><span class="date">Friday, October 6, 2017</span>&mdash;We are excited to announce that <a href="https://2017.northbaypython.org/tickets">tickets are now on sale</a> for North Bay Python 2017. With just two months until the conference we have a few key dates coming up:</p>
<ul>
<li><a href="https://2017.northbaypython.org/tickets">Tickets</a> are available at a discount until Friday, October 20.</li>