From ab52e9285749435c8a534db3c3adde181c7f6188 Mon Sep 17 00:00:00 2001
From: Joshua Simmons
Date: Thu, 10 Aug 2017 16:37:10 -0700
Subject: [PATCH 1/6] point Symposion link at the repository
---
pinaxcon/templates/_footer.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html
index 95b69c7..9b77933 100644
--- a/pinaxcon/templates/_footer.html
+++ b/pinaxcon/templates/_footer.html
@@ -4,6 +4,6 @@
From 7c8f90db729af534116e4e2b0729670b3241de1d Mon Sep 17 00:00:00 2001
From: Joshua Simmons
Date: Thu, 10 Aug 2017 16:44:17 -0700
Subject: [PATCH 2/6] make both GitHub links use https
---
pinaxcon/templates/_footer.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html
index 9b77933..2cc7dce 100644
--- a/pinaxcon/templates/_footer.html
+++ b/pinaxcon/templates/_footer.html
@@ -5,5 +5,5 @@
From a57fab2872e98c9caa5ae8a157b03830fed8aaf0 Mon Sep 17 00:00:00 2001
From: Joshua Simmons
Date: Thu, 10 Aug 2017 16:49:53 -0700
Subject: [PATCH 3/6] add colophon copy
---
.../static_pages/about/colophon.html | 25 ++++++++++++++++---
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html
index 78d7f82..8cd0f46 100644
--- a/pinaxcon/templates/static_pages/about/colophon.html
+++ b/pinaxcon/templates/static_pages/about/colophon.html
@@ -10,9 +10,26 @@
{% block content %}
- * Python logo attribution and copyright notice
- * SFC copyright notices
- * information about codebase inc. Django, Symposion, Registrasion
- * COC attribution
+Call for Proposals
+
+
Portions of our Call for Proposals page were drawn from ideas seen on DjangoCon EU, SeaGL, Fog City Ruby, and others. Thanks to all for their inspiration and permission to borrow!
+ +Our Code of Conduct was forked from the PyCon US Code of Conduct, including the staff and attendee guides, under a Creative Commons Attribution 3.0 Unported License, itself originally forked from the example policy from the Geek Feminism wiki, created by the Ada Initiative and other volunteers. which is under a Creative Commons Zero license.
+ +"Python" and the Python logos are trademarks or registered trademarks of the Python Software Foundation, used by North Bay Python with permission from the Foundation.
+ +Our website is powered by a heap of free and open source software, most notably:
+ +Our sponsors help put this conference on. Our base costs, including our venue, printing, web hosting, and more, are all funded through sponsorship.
+In return, we offer complimentary corporate level tickets, a chance to talk about your company on our main stage, floor space in the lobby to display your free-standing banners, and as much praise as we can deliver in front of 400 grateful Pythonistas.
+Our base costs, including our venue, printing, web hosting, and more, are all funded through sponsorship. In return, we offer complimentary corporate level tickets, a chance to talk about your company on our main stage, floor space in the lobby to display your free-standing banners, and as much praise as we can deliver in front of 400 grateful Pythonistas.
Below is an overview of sponsorship levels. Please see our prospectus or contact sponsor@northbaypython.org for additional details.
@@ -28,7 +34,7 @@Sponsorship can also be in the form of in-kind donations of goods and services essential to organizing the conference, or in assisting speakers to attend the conference. If you can make a substantial in-kind donation, we will recognize you as a package-level sponsor of equivalent value.
-Community groups, such as Python Meetups and PyLadies groups, are the lifeblood of the Python community, and we need your help to put on the best conference we can. If you can help us with one of the following, we'll recognize you as a community partner, which comes with all of the benefits of a Silver sponsorship.
From 2e2d900c661a11c07d0fa42a0447e036e0bfbbbc Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Thu, 10 Aug 2017 21:56:01 -0700 Subject: [PATCH 5/6] stub out the team page --- .../templates/static_pages/about/team.html | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/pinaxcon/templates/static_pages/about/team.html b/pinaxcon/templates/static_pages/about/team.html index 6e101d5..ade99d1 100644 --- a/pinaxcon/templates/static_pages/about/team.html +++ b/pinaxcon/templates/static_pages/about/team.html @@ -8,6 +8,42 @@ {% block body_class %}about{% endblock %} -{% block content %} +{% block lede %} + +Our five person team has years of experience building communities, running events, and, of course, programming. We're also all in on cultivating a more inclusive culture. + +{% endblock %} + +{% block content %} + +Need to contact someone in a hurry? You can reach us all at spam@northbaypython.org. Read on to learn about the organizing team.
+ +Bio and a pic
+ +Bio and a pic
+ +Bio and a pic
+ +Bio and a pic
+ +Bio and a pic
{% endblock %} From 0dd8917d58b2549505cea748012c63c60bd89944 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Thu, 10 Aug 2017 21:56:34 -0700 Subject: [PATCH 6/6] polish off nav for CFP launch --- fixtures/sitetree.json | 146 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-) diff --git a/fixtures/sitetree.json b/fixtures/sitetree.json index facdea6..8532b8b 100644 --- a/fixtures/sitetree.json +++ b/fixtures/sitetree.json @@ -83,7 +83,7 @@ "model": "sitetree.treeitem", "pk": 8, "fields": { - "title": "Code of Conduct", + "title": "Safety", "hint": "", "url": "/code-of-conduct", "urlaspattern": false, @@ -126,5 +126,149 @@ "sort_order": 9, "access_permissions": [] } +}, +{ + "model": "sitetree.treeitem", + "pk": 11, + "fields": { + "title": "North Bay Python", + "hint": "", + "url": "/about/north-bay-python", + "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": 1, + "sort_order": 11, + "access_permissions": [] + } +}, +{ + "model": "sitetree.treeitem", + "pk": 12, + "fields": { + "title": "The Team", + "hint": "", + "url": "/about/team", + "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": 1, + "sort_order": 12, + "access_permissions": [] + } +}, +{ + "model": "sitetree.treeitem", + "pk": 13, + "fields": { + "title": "Colophon", + "hint": "", + "url": "/about/colophon", + "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": 1, + "sort_order": 13, + "access_permissions": [] + } +}, +{ + "model": "sitetree.treeitem", + "pk": 14, + "fields": { + "title": "Reporting an Incident", + "hint": "", + "url": "/code-of-conduct/harassment-incidents", + "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": 8, + "sort_order": 15, + "access_permissions": [] + } +}, +{ + "model": "sitetree.treeitem", + "pk": 15, + "fields": { + "title": "Staff Procedures", + "hint": "", + "url": "/code-of-conduct/harassment-staff-procedures", + "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": 8, + "sort_order": 17, + "access_permissions": [] + } +}, +{ + "model": "sitetree.treeitem", + "pk": 17, + "fields": { + "title": "Code of Conduct", + "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": 8, + "sort_order": 14, + "access_permissions": [] + } } ]