CopyleftConf/copyleftconf-website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into prod

Browse source
This commit is contained in:
Christopher Neugebauer 2017-08-18 08:48:01 -07:00
commit fb3e1d6c18
5 changed files with 159 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

154
fixtures/sitetree.json
View file

@ -51,7 +51,7 @@
"access_restricted": false,
"access_perm_type": 1,
"parent": null,
"sort_order": 7,
"sort_order": 8,
"access_permissions": []
}
},
@ -64,7 +64,7 @@
"url": "/program/call-for-proposals",
"urlaspattern": false,
"tree": 1,
"hidden": true,
"hidden": false,
"alias": null,
"description": "",
"inmenu": true,
@ -74,7 +74,7 @@
"access_guest": false,
"access_restricted": false,
"access_perm_type": 1,
"parent": null,
"parent": 24,
"sort_order": 4,
"access_permissions": []
}
@ -99,7 +99,7 @@
"access_restricted": false,
"access_perm_type": 1,
"parent": null,
"sort_order": 8,
"sort_order": 9,
"access_permissions": []
}
},
@ -123,7 +123,7 @@
"access_restricted": false,
"access_perm_type": 1,
"parent": null,
"sort_order": 9,
"sort_order": 24,
"access_permissions": []
}
},
@ -318,5 +318,149 @@
"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": []
}
}
]

22
pinaxcon/templates/_account_bar.html
View file

@ -1,22 +0,0 @@
{% 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>

2
pinaxcon/templates/static_pages/about/north_bay_python.html
View file

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

2
pinaxcon/templates/static_pages/about/team.html
View file

@ -49,7 +49,7 @@ Our team of North Bay and Bay Area locals has years of experience building commu
<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>

8
static/scss/custom.scss
View file

@ -364,6 +364,13 @@ footer .footer-copy {
.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) {
@ -382,4 +389,5 @@ footer .footer-copy {
.navbar-toggle {
background-color: $gray-lighter;
font-size: 10px;
}