Changeset - fb3e1d6c1874
[Not reviewed]
Merge
0 5 0
Christopher Neugebauer - 7 years ago 2017-08-18 15:48:01
chrisjrn@gmail.com
Merge branch 'master' into prod
5 files changed with 159 insertions and 29 deletions:
0 comments (0 inline, 0 general)
fixtures/sitetree.json
Show inline comments
...
 
@@ -42,97 +42,97 @@
 
        "tree": 1,
 
        "hidden": false,
 
        "alias": null,
 
        "description": "",
 
        "inmenu": true,
 
        "inbreadcrumbs": true,
 
        "insitetree": true,
 
        "access_loggedin": false,
 
        "access_guest": false,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": null,
 
        "sort_order": 7,
 
        "sort_order": 8,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 7,
 
    "fields": {
 
        "title": "Call for Proposals",
 
        "hint": "",
 
        "url": "/program/call-for-proposals",
 
        "urlaspattern": false,
 
        "tree": 1,
 
        "hidden": true,
 
        "hidden": false,
 
        "alias": null,
 
        "description": "",
 
        "inmenu": true,
 
        "inbreadcrumbs": true,
 
        "insitetree": true,
 
        "access_loggedin": false,
 
        "access_guest": false,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": null,
 
        "parent": 24,
 
        "sort_order": 4,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 8,
 
    "fields": {
 
        "title": "Safety",
 
        "hint": "",
 
        "url": "/code-of-conduct",
 
        "urlaspattern": false,
 
        "tree": 1,
 
        "hidden": false,
 
        "alias": null,
 
        "description": "",
 
        "inmenu": true,
 
        "inbreadcrumbs": true,
 
        "insitetree": true,
 
        "access_loggedin": false,
 
        "access_guest": false,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": null,
 
        "sort_order": 8,
 
        "sort_order": 9,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 9,
 
    "fields": {
 
        "title": "News",
 
        "hint": "",
 
        "url": "/news",
 
        "urlaspattern": false,
 
        "tree": 1,
 
        "hidden": false,
 
        "alias": null,
 
        "description": "",
 
        "inmenu": true,
 
        "inbreadcrumbs": true,
 
        "insitetree": true,
 
        "access_loggedin": false,
 
        "access_guest": false,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": null,
 
        "sort_order": 9,
 
        "sort_order": 24,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 11,
 
    "fields": {
 
        "title": "North Bay Python",
 
        "hint": "",
 
        "url": "/about/north-bay-python",
 
        "urlaspattern": false,
 
        "tree": 1,
...
 
@@ -309,14 +309,158 @@
 
        "description": "",
 
        "inmenu": true,
 
        "inbreadcrumbs": true,
 
        "insitetree": true,
 
        "access_loggedin": false,
 
        "access_guest": false,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": 3,
 
        "sort_order": 22,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 24,
 
    "fields": {
 
        "title": "Program",
 
        "hint": "",
 
        "url": "/program",
 
        "urlaspattern": false,
 
        "tree": 1,
 
        "hidden": true,
 
        "alias": null,
 
        "description": "",
 
        "inmenu": true,
 
        "inbreadcrumbs": true,
 
        "insitetree": true,
 
        "access_loggedin": false,
 
        "access_guest": false,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": null,
 
        "sort_order": 7,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 25,
 
    "fields": {
 
        "title": "Log In",
 
        "hint": "",
 
        "url": "/account/login/",
 
        "urlaspattern": false,
 
        "tree": 1,
 
        "hidden": false,
 
        "alias": null,
 
        "description": "",
 
        "inmenu": true,
 
        "inbreadcrumbs": true,
 
        "insitetree": true,
 
        "access_loggedin": false,
 
        "access_guest": true,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": null,
 
        "sort_order": 26,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 26,
 
    "fields": {
 
        "title": "My Account",
 
        "hint": "",
 
        "url": "/dashboard",
 
        "urlaspattern": false,
 
        "tree": 1,
 
        "hidden": false,
 
        "alias": null,
 
        "description": "",
 
        "inmenu": true,
 
        "inbreadcrumbs": true,
 
        "insitetree": true,
 
        "access_loggedin": true,
 
        "access_guest": false,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": null,
 
        "sort_order": 29,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 27,
 
    "fields": {
 
        "title": "Dashboard",
 
        "hint": "",
 
        "url": "/dashboard",
 
        "urlaspattern": false,
 
        "tree": 1,
 
        "hidden": false,
 
        "alias": null,
 
        "description": "",
 
        "inmenu": true,
 
        "inbreadcrumbs": true,
 
        "insitetree": true,
 
        "access_loggedin": true,
 
        "access_guest": false,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": 26,
 
        "sort_order": 27,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 28,
 
    "fields": {
 
        "title": "Log Out",
 
        "hint": "",
 
        "url": "/account/logout/",
 
        "urlaspattern": false,
 
        "tree": 1,
 
        "hidden": false,
 
        "alias": null,
 
        "description": "",
 
        "inmenu": true,
 
        "inbreadcrumbs": true,
 
        "insitetree": true,
 
        "access_loggedin": true,
 
        "access_guest": false,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": 26,
 
        "sort_order": 28,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 29,
 
    "fields": {
 
        "title": "Wiki",
 
        "hint": "",
 
        "url": "/wiki",
 
        "urlaspattern": false,
 
        "tree": 1,
 
        "hidden": true,
 
        "alias": null,
 
        "description": "",
 
        "inmenu": true,
 
        "inbreadcrumbs": true,
 
        "insitetree": true,
 
        "access_loggedin": false,
 
        "access_guest": false,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": null,
 
        "sort_order": 25,
 
        "access_permissions": []
 
    }
 
}
 
]
pinaxcon/templates/_account_bar.html
Show inline comments
 
{% load i18n %}
 
{% load account_tags %}
 

	
 
<ul class="nav navbar-nav pull-right">
 
    {% if request.user.is_authenticated %}
 
        <li>
 
            <a href="{% url "dashboard" %}"><i class="fa fa-tasks"></i> {% trans "Dashboard" %}</a>
 
        </li>
 
        <li>
 
            <a id="account_logout" href="{% url 'account_logout' %}"><i class="fa fa-power-off"></i> {% trans "Log out" %}</a>
 
        </li>
 
    {% else %}
 
        <li><a href="{% url 'account_login' %}">{% trans "Log in" %}</a></li>
 
        {% if ACCOUNT_OPEN_SIGNUP %}
 
            <li><a href="{% url 'account_signup' %}">{% trans "Sign up" %}</a></li>
 
        {% endif %}
 
    {% endif %}
 
</ul>
 

	
 
<form id="accountLogOutForm" action="{% url 'account_logout' %}" method="POST">
 
    {% csrf_token %}
 
</form>
pinaxcon/templates/static_pages/about/north_bay_python.html
Show inline comments
...
 
@@ -40,22 +40,22 @@
 
<h3>Getting Here</h3>
 

	
 
<h4>By Car</h4>
 

	
 
<p>If you're driving up, Downtown Petaluma is at exit 472 on Highway 101, 35 miles north of the Golden Gate Bridge. All parking is free in Petaluma, including in the undercover garages at Keller St and Theatre Square. Both garages are in short walking distance of the Mystic.</p>
 

	
 
<h4>By Bus</h4>
 

	
 
<p>Public transit to Petaluma is not great. You can take the 101 bus operated by Golden Gate Transit from downtown San Francisco, or south from Santa Rosa. Depending on sponsorship, we hope to run a free shuttle with BART and Caltrain connections for people from further out of town.</p>
 

	
 
<h4>By Plane</h4>
 

	
 
<p>If you're coming from out of the area, you may want to consider Sonoma County Airport (STS). STS is 30 minutess out of Petaluma, and has nonstop flights to most major west coast cities. If you can't make it to STS, you can also try San Francisco (SFO) or Oakland (OAK) international airports.</p>
 
<p>If you're coming from out of the area, you may want to consider Sonoma County Airport (STS). STS is 30 minutes out of Petaluma, and has nonstop flights to most major west coast cities. If you can't make it to STS, you can also try San Francisco (SFO) or Oakland (OAK) international airports.</p>
 

	
 
<p>If you happen to have an aircraft of your own, Petaluma Municipal Airport is 3 miles down the road.</p>
 

	
 

	
 
<h3>Staying Here</h3>
 

	
 
<p>Petaluma also has hotels! We're arranging deals with some of the best local hotels in the area &ndash; the closest is just one block away. We'll share details with you when conference tickets go on sale.</p>
 

	
 
{% endblock %}
pinaxcon/templates/static_pages/about/team.html
Show inline comments
...
 
@@ -40,25 +40,25 @@ Our team of North Bay and Bay Area locals has years of experience building commu
 
<h3>Sam Kitajima-Kimbrel, Program Chair</h3>
 

	
 
<p><img src="{% static "images/team/sam.jpg" %}" alt="Sam Kitajima-Kimbrel" class="team-headshot">Sam is a Python developer and distributed-systems "enthusiast" hailing from Seattle by birth, New York by nurture, and the Bay Area by choice. Five years ago he attended his first PyCon US and hasn't been able to break the habit; after making the jump from audience to stage in 2014 and speaking regularly at events around the world, he was thrilled to join team when invited by Chris and Josh. Sam currently works at Nuna building healthcare data infrastructure for the U.S. Medicaid and Medicare programs and resides in Oakland with his husband Kameron. (<a href="https://twitter.com/skimbrel">@skimbrel on Twitter</a>)</p>
 

	
 
<h3>Andrew Godwin</h3>
 

	
 
<p><img src="{% static "images/team/andrew.jpg" %}" alt="Andrew Godwin" class="team-headshot">Andrew is a Django and Python developer who originally hails from London but moved to the Bay Area four years ago. He's been writing open source software for over a decade as well as working in various different parts of the technology industry, and currently works at Eventbrite. He regularly speaks at Python (and other) events around the world, and has a keen interest in building communities and inclusivity. (<a href="https://twitter.com/andrewgodwin">@andrewgodwin on Twitter</a>)</p>
 

	
 
<h3>Josh Simmons</h3>
 
<p><img src="{% static "images/team/josh.jpg" %}" alt="Josh Simmons" class="team-headshot">Josh is a community organizer and web developer with a penchant for armchair philosophy who was born and raised in the North Bay. He spent 4.5 years building Web &amp; Interactive Media Professionals (WIMP), a local community with over 600 members, before moving on to do community management for O'Reilly Media. These days Josh works on the Google Open Source outreach team and serves as a board member and volunteer CFO for Open Source Initiative. (<a href="https://twitter.com/joshsimmons">@joshsimmons on Twitter</a>)</p>
 

	
 

	
 
<h2>Advisors</h2>
 
<h2>Advisors<a name="advisors"></a></h2>
 

	
 
<p>We acknowledge that our small team has limited perspective, and that to build a truly inclusive event, we need to seek the perspectives of a diverse range of people. We thank the following people and organizations for providing us with advice along the way.</p>
 

	
 
<ul>
 
  <li><a href="https://twitter.com/vavroom">Nicolas Steenhout</a> is helping us with accessibility and inclusion of people with disabilities.</li>
 
  <li><a href="https://twitter.com/vmbrasseur">VM (Vicky) Brasseur</a> is helping us run an excellent call for proposals, design our office hours program, and support new speakers with speaker training.</li>
 
  <li><a href="https://twitter.com/sigje">Jen Davis</a> is helping us make the event accessible to parents by advising on things like childcare.</li>
 
</ul>
 

	
 

	
 
<h2>Supporting Organizations</h2>
 
<h3>Software Freedom Conservancy</h3>
static/scss/custom.scss
Show inline comments
...
 
@@ -355,31 +355,39 @@ footer .footer-copy {
 
    text-align: left;
 
  }
 

	
 
  .email-signup-panel {
 
    margin-top: 2em;
 
  }
 
}
 

	
 
@media (max-width: 768px) {
 
  .navbar-nav.pull-right {
 
    float: left !important;
 
  }
 

	
 
}
 

	
 
@media (max-width: 992px) and (min-width: 768px) {
 
  .nav > li > a {
 
    padding: 15px 9px;
 
  }
 
}
 

	
 
@media (max-width: 550px) {
 

	
 
}
 

	
 
@media (min-width: 992px) {
 
  .email-signup-panel {
 
    margin-top: 22px;
 
  }
 
}
 

	
 
.homepage-subtitle {
 
  font-size: $font-size-h3;
 
}
 

	
 
.navbar-toggle {
 
  background-color: $gray-lighter;
 
  font-size: 10px;
 
}
0 comments (0 inline, 0 general)