From 44073f4c120a3aad3056a04b0e656ad3a45bf078 2017-08-17 23:43:19 From: Christopher Neugebauer Date: 2017-08-17 23:43:19 Subject: [PATCH] Merge branch 'master' into prod --- diff --git a/pinaxcon/middleware.py b/pinaxcon/middleware.py index f0a60b0141375dc77a3f145cc3f408f5e49558e0..b70e96a769b9ee4a9acaad95d48169483e845c3f 100644 --- a/pinaxcon/middleware.py +++ b/pinaxcon/middleware.py @@ -5,6 +5,29 @@ from django import http from django.conf import settings from django.utils.deprecation import MiddlewareMixin +class CanonicalHostMiddleware(MiddlewareMixin): + """ Redirects to a canonical host if the current host is not the canonical + host. """ + + response_redirect_class = http.HttpResponsePermanentRedirect + + def process_request(self, request): + + canonical_host = getattr(settings, "CANONICAL_HOST", None) + + if not canonical_host: + return + + host = request.get_host() + + if host == canonical_host: + return + + path = request.get_full_path() + redirect_url = ('%s://%s%s' % (request.scheme, canonical_host, path)) + return self.response_redirect_class(redirect_url) + + class UnprependWWWMiddleware(MiddlewareMixin): """ Unprepends www if necessary. """ diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index d568f711bd08a5f2f43a43533147b02a6ba89f37..2d744d5899309eec5c08f57666e8e5544d653b57 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -23,6 +23,12 @@ db_from_env = dj_database_url.config() DATABASES['default'].update(db_from_env) ALLOWED_HOSTS = [".localhost", ".herokuapp.com", ".northbaypython.org"] +CANONICAL_HOST = os.environ.get("DJANGO_CANONICAL_HOST", None) + +# If DEFAULT_FROM_EMAIL is not set, email will most likely break in prod. +from_email = os.environ.get("DJANGO_DEFAULT_FROM_EMAIL", None) +if from_email is not None: + DEFAULT_FROM_EMAIL = from_email # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name @@ -34,6 +40,12 @@ ALLOWED_HOSTS = [".localhost", ".herokuapp.com", ".northbaypython.org"] TIME_ZONE = os.environ.get("TZ", "America/Los_Angeles") +# Set the email address that will receive errors. +admin_email = os.environ.get("DJANGO_ADMIN_EMAIL", None) +if admin_email is not None: + ADMINS = ("Webmaster", admin_email) + + # Use SSLRedirectMiddleware SSL_ON = os.environ.get("DJANGO_SSL_ON", True) SSL_ALWAYS = os.environ.get("DJANGO_SSL_ALWAYS", False) @@ -134,8 +146,8 @@ MIDDLEWARE_CLASSES = [ "reversion.middleware.RevisionMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", "ssl_redirect.middleware.SSLRedirectMiddleware", + "pinaxcon.middleware.CanonicalHostMiddleware", "pinaxcon.middleware.UnprependWWWMiddleware", - ] ROOT_URLCONF = "pinaxcon.urls" diff --git a/pinaxcon/templates/_default_sidebar.html b/pinaxcon/templates/_default_sidebar.html index d1d0897eea45b0b02f2f81436896462cabfa2b24..f83429a589d142376d94830614b53d9bd42b78db 100644 --- a/pinaxcon/templates/_default_sidebar.html +++ b/pinaxcon/templates/_default_sidebar.html @@ -15,11 +15,11 @@ {% for sponsor in level.sponsors %}
{% if sponsor.website_logo %} - + {{ sponsor.name }} {% else %} - {{ sponsor.name }} + {{ sponsor.name }} {% endif %}
diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html index a05b171e6ecc66fa0e2b79c59f4f93fe14ce4f40..093cfdfd0bab4e207d2812278334ecb21ee278a3 100644 --- a/pinaxcon/templates/_footer.html +++ b/pinaxcon/templates/_footer.html @@ -8,14 +8,14 @@
-

© 2017 North Bay Python, a member project of Software Freedom Conservancy, a 501(c)(3) charity.

+

© 2017 North Bay Python, member project of Software Freedom Conservancy, a 501(c)(3) charity.

- Facebook - | Twitter - | Code of Conduct - | Colophon

+ Facebook + | Twitter + | Code of Conduct + | Colophon

-

This site is free and open source software, powered by Symposion and Registrasion.

+

This site is free and open source software, powered by Symposion and Registrasion.

diff --git a/pinaxcon/templates/override_bootstrap_theme_base.html b/pinaxcon/templates/override_bootstrap_theme_base.html new file mode 100644 index 0000000000000000000000000000000000000000..0a4f59710edb8ef67032152d19820fa19e587941 --- /dev/null +++ b/pinaxcon/templates/override_bootstrap_theme_base.html @@ -0,0 +1,60 @@ +{% extends "theme_bootstrap/base.html" %} +{% comment %} + Derived from pinax_theme_bootstrap's "theme_bootstrap/base.html". + + Pinax Bootstrap Theme + Copyright (c) 2015 James Tauber and contributors. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + +{% endcomment %} + + +{% block topbar_base %} +
+
+
+ {% block topbar %} +
+ + {% block site_brand %}{{ SITE_NAME }}{% endblock %} +
+
+ {% block nav %} + {% comment %} + + {% endcomment %} + {% endblock %} + {% block account_bar %}{% include "_account_bar.html" %}{% endblock %} +
+ {% endblock %} +
+
+
+{% endblock %} diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index 09940451e9dd917b89f61f2fa161f11addf08033..95411f34b77ed194a8944f90d8eabd5607801a41 100644 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -1,4 +1,4 @@ -{% extends "theme_bootstrap/base.html" %} +{% extends "override_bootstrap_theme_base.html" %} {% load staticfiles %} {% load metron_tags %} diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index 99d26173fff8f088a1515bae578385ba80eab267..eaa67b8e9b8b8d78501784f23bcac49fe8cad8ec 100644 --- a/pinaxcon/templates/static_pages/about/colophon.html +++ b/pinaxcon/templates/static_pages/about/colophon.html @@ -12,41 +12,41 @@

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!

+

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!

Code of Conduct

-

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.

+

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.

Fiscal Sponsor

-

Our fiscal sponsor is Software Freedom Conservancy, a 501(c)(3) charity dedicated to the promotion and development of free and open source software. Conservancy allows us to work without managing our own corporate structure and administrative services. Our relationship with Conservancy goes beyond logistics, though, as we are also philosophically aligned as we work to advance software freedom and expand the Python developer community.

+

Our fiscal sponsor is Software Freedom Conservancy, a 501(c)(3) charity dedicated to the promotion and development of free and open source software. Conservancy allows us to work without managing our own corporate structure and administrative services. Our relationship with Conservancy goes beyond logistics, though, as we are also philosophically aligned as we work to advance software freedom and expand the Python developer community.

Photography

Python

-

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

+

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

Terms and Conditions

- Our Photography and Audio Video Recording policy is adapted from the Evergreen policy, itself adapted from the AdaCamp policy under a Creative Commons Attribution Share Alike 4.0 International license.

+ Our Photography and Audio Video Recording policy is adapted from the Evergreen policy, itself adapted from the AdaCamp policy under a Creative Commons Attribution Share Alike 4.0 International license.

Web Application

Our website is powered by a heap of free and open source software, most notably:

{% endblock %} diff --git a/pinaxcon/templates/static_pages/about/team.html b/pinaxcon/templates/static_pages/about/team.html index 5f2cb51ad8b3b49bdc13f3ffd5326baf17dfcd48..ab5df84f73d90e1f083eb5e4ad0bbfb89881bff3 100644 --- a/pinaxcon/templates/static_pages/about/team.html +++ b/pinaxcon/templates/static_pages/about/team.html @@ -20,33 +20,33 @@ Our team of North Bay and Bay Area locals has years of experience building commu

Contact the Team

-

Need to contact someone in a hurry? You can reach us all at spam@northbaypython.org. Read on to learn about the organizing team.

+

Need to contact someone in a hurry? You can reach us all at spam@northbaypython.org. Read on to learn about the organizing team.

You can also find us all over the internet, including:

Meet the Team

-

Christopher Neugebauer, Conference Chair

+

Christopher Neugebauer, Conference Chair

-

Christopher NeugebauerChristopher is a Python developer who lives in glorious Petaluma, California, though he's originally from the the city of Hobart in Tasmania, Australia. A serial conference organizer, he has been a core organiser of PyCon Australia for a number of years, was director of linux.conf.au 2017, and a good number of his open source contributions help power the website this conference runs on. He was made a fellow of the Python Software Foundation in 2013 in recognition for his contributions to building the Australian Python community. (@chrisjrn on Twitter)

+

Christopher NeugebauerChristopher is a Python developer who lives in glorious Petaluma, California, though he's originally from the the city of Hobart in Tasmania, Australia. A serial conference organizer, he has been a core organiser of PyCon Australia for a number of years, was director of linux.conf.au 2017, and a good number of his open source contributions help power the website this conference runs on. He was made a fellow of the Python Software Foundation in 2013 in recognition for his contributions to building the Australian Python community. (@chrisjrn on Twitter)

-

Sam Kitajima-Kimbrel, Program Chair

+

Sam Kitajima-Kimbrel, Program Chair

-

Sam Kitajima-KimbrelSam 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. (@skimbrel on Twitter)

+

Sam Kitajima-KimbrelSam 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. (@skimbrel on Twitter)

-

Andrew Godwin

+

Andrew Godwin

-

Andrew GodwinAndrew 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. (@andrewgodwin on Twitter)

+

Andrew GodwinAndrew 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. (@andrewgodwin on Twitter)

-

Josh Simmons

-

Josh SimmonsJosh 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 & 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. (@joshsimmons on Twitter)

+

Josh Simmons

+

Josh SimmonsJosh 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 & 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. (@joshsimmons on Twitter)

Advisors

@@ -54,14 +54,14 @@ Our team of North Bay and Bay Area locals has years of experience building commu

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.

Supporting Organizations

-

Software Freedom Conservancy

+

Software Freedom Conservancy

-

Conservancy is a public charity dedicated to the promotion and development of free and open source software, and is the fiscal sponsor of North Bay Python. Without Conservancy and the people behind it—namely Karen Sandler, Bradley Kuhn, Tony Sebro, and Brett Smith—none of this would be possible!

+

Conservancy is a public charity dedicated to the promotion and development of free and open source software, and is the fiscal sponsor of North Bay Python. Without Conservancy and the people behind it—namely Karen Sandler, Bradley Kuhn, Tony Sebro, and Brett Smith—none of this would be possible!

{% endblock %} diff --git a/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md b/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md index e9c33689d0914e4621884e75580df53a440fa0c7..eef88542edf3ce03260bd577e9dff9584910d1c5 100644 --- a/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md +++ b/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md @@ -33,7 +33,7 @@ If a participant engages in behavior that violates this code of conduct, the con Contact Information ------------------- -If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff. Conference staff will be wearing t-shirts and/or badges that clearly identify them as staff. You may also contact venue staff and ask to be put in touch with conference chair [Christopher Neugebauer](mailto:chrisjrn@northbaypython.org "chrisjrn@northbaypython.org"). +If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff. Conference staff will be wearing t-shirts and/or badges that clearly identify them as staff. You may also contact venue staff and ask to be put in touch with conference chair [Christopher Neugebauer](mailto:chrisjrn@northbaypython.org). If the matter is especially urgent, please call our Code of Conduct and safety incident hotline. **The phone number for this hotline will be released shortly before the conference begins.** This number will automatically route to a member of the conference staff who can render assistance. @@ -41,10 +41,10 @@ Conference staff will be happy to help participants contact hotel/venue security Procedure for Handling Harassment ------------------------------------------ -- [Attendee procedure for incident handling](/code-of-conduct/harassment-incidents "North Bay Python attendee procedure for incident handling") -- [Staff procedure for incident handling](/code-of-conduct/harassment-staff-procedures "North Bay Python staff procedure for incident handling") +- [Attendee procedure for incident handling](/code-of-conduct/harassment-incidents) +- [Staff procedure for incident handling](/code-of-conduct/harassment-staff-procedures) License ------- -This Code of Conduct was forked from the [PyCon US Code of Conduct](https://github.com/python/pycon-code-of-conduct "PyCon United States Code of Conduct") under a [Creative Commons Attribution 3.0 Unported](http://creativecommons.org/licenses/by/3.0/ "Creative Commons Attribution 3.0 Unported License") license, itself originally forked from the example policy in [Geek Feminism wiki](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy "Geek Feminism Wiki Example Anti-harassment Policy"), created by the Ada Initiative and other volunteers. which is under a [Creative Commons Zero](https://creativecommons.org/publicdomain/zero/1.0/ "Creative Commons Zero License") license. \ No newline at end of file +This Code of Conduct was forked from the [PyCon US Code of Conduct](https://github.com/python/pycon-code-of-conduct) under a [Creative Commons Attribution 3.0 Unported](http://creativecommons.org/licenses/by/3.0/) license, itself originally forked from the example policy in [Geek Feminism wiki](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy), created by the Ada Initiative and other volunteers. which is under a [Creative Commons Zero](https://creativecommons.org/publicdomain/zero/1.0/) license. diff --git a/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.md b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.md index e6066e1480b3a3bdbdf62a6f9b30bb05f7fe995f..bfaea0dbca4b1e6291300fab01803e992c8f57c2 100644 --- a/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.md +++ b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.md @@ -1,6 +1,6 @@ -*This procedure has been adopted from the Ada Initiative's guide titled "[Conference anti-harassment/Responding to Reports](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Responding_to_reports "Ada Initive Anti-harassment Guide on Responding to Reports")".* +*This procedure has been adopted from the Ada Initiative's guide titled "[Conference anti-harassment/Responding to Reports](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Responding_to_reports)".* -1\. Keep in mind that all conference staff will be wearing a conference t-shirt/button with the word "STAFF" on it (or otherwise clearly marked as staff). The staff will also be prepared to handle the incident. All of our staff are informed of the [code of conduct policy](/code-of-conduct "North Bay Python Code of Conduct") and guide for handling harassment at the conference. *There will be a mandatory staff meeting onsite at the conference when this will be reiterated.* +1\. Keep in mind that all conference staff will be wearing a conference t-shirt/button with the word "STAFF" on it (or otherwise clearly marked as staff). The staff will also be prepared to handle the incident. All of our staff are informed of the [code of conduct policy](/code-of-conduct) and guide for handling harassment at the conference. *There will be a mandatory staff meeting onsite at the conference when this will be reiterated.* 2\. Report the harassment incident (preferably in writing) to a conference staff member. All reports are confidential. Please do not disclose public information about the incident until the staff have had sufficient time in which to address the situation. This is as much for your safety and protection as it is the other attendees. @@ -20,4 +20,4 @@ The staff is well informed on how to deal with the incident and how to further p **Note**: Incidents that violate the Code of Conduct are extremely damaging to the community, and they will not be tolerated. The silver lining is that, in many cases, these incidents present a chance for the offenders, and the community at large, to grow, learn, and become better. North Bay Python staff requests that they be your first resource when reporting a North Bay Python-related incident, so that they may enforce the Code of Conduct and take quick action toward a resolution. -A listing of [North Bay Python staff is located here](/about/team "About the North Bay Python team"), including contact phone numbers. If at all possible, all reports should be made directly to conference chair [Christopher Neugebauer](mailto:chrisjrn@northbaypython.org "chrisjrn@northbaypython.org"). \ No newline at end of file +A listing of [North Bay Python staff is located here](/about/team), including contact phone numbers. If at all possible, all reports should be made directly to conference chair [Christopher Neugebauer](mailto:chrisjrn@northbaypython.org). \ No newline at end of file diff --git a/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.md b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.md index 355caf93c4324ba1e57d0296f6200ddece4c40cd..f979dc2bafb24db0afffb967699189770fb0abfe 100644 --- a/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.md +++ b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.md @@ -1,8 +1,8 @@ -*This procedure has been adopted from the Ada Initiative's guide titled "[Conference anti-harassment/Responding to Reports](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Responding_to_reports "Ada Initive Anti-harassment Guide on Responding to Reports")".* +*This procedure has been adopted from the Ada Initiative's guide titled "[Conference anti-harassment/Responding to Reports](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Responding_to_reports)".* -Be sure to have a good understanding of our Code of Conduct policy, which can be found here: [https://northbaypython.org/code-of-conduct](/code-of-conduct "North Bay Python Code of Conduct") +Be sure to have a good understanding of our Code of Conduct policy, which can be found here: [https://northbaypython.org/code-of-conduct](/code-of-conduct) -Also have a good understanding of what is expected from an attendee that wants to report a harassment incident. These guidelines can be found here: [https://northbaypython.org/code-of-conduct/harassment-incidents](/code-of-conduct/harassment-incidents "North Bay Python attendee procedure for incident handling") +Also have a good understanding of what is expected from an attendee that wants to report a harassment incident. These guidelines can be found here: [https://northbaypython.org/code-of-conduct/harassment-incidents](/code-of-conduct/harassment-incidents) Try to get as much of the incident in written form by the reporter. If you cannot, transcribe it yourself as it was told to you. The important information to gather include the following: @@ -61,4 +61,4 @@ Depending on the incident, the conference chair, or designate, may decide to mak If some attendees were angered by the incident, it is best to apologize to them that the incident occurred to begin with. If there are residual hard feelings, suggest to them to write an email to the conference chair or to the event coordinator. It will be dealt with accordingly. -A listing of [North Bay Python staff is located here](/about/team "About the North Bay Python team"), including contact phone numbers. If at all possible, all reports should be made directly to conference chair [Christopher Neugebauer](mailto:chrisjrn@northbaypython.org "chrisjrn@northbaypython.org"). \ No newline at end of file +A listing of [North Bay Python staff is located here](/about/team), including contact phone numbers. If at all possible, all reports should be made directly to conference chair [Christopher Neugebauer](mailto:chrisjrn@northbaypython.org). \ No newline at end of file diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index 9ce70b89009dc02adbc8f6312bed3d3e09523fe0..6fee13679465a89e97b298f7ed42b07002eb7216 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -16,7 +16,7 @@

North Bay Python

-

A Python conference north of the Golden Gate

+

A Python conference north of the Golden Gate

@@ -42,7 +42,7 @@ action="https://tinyletter.com/northbaypython" method="post" target="popupwindow" onsubmit="window.open('https://tinyletter.com/northbaypython', 'popupwindow', 'scrollbars=yes,width=800,height=600');return true">
- + @@ -64,8 +64,8 @@
@@ -90,11 +90,11 @@
- Learn More + Learn More
- Image credit: Mystic Theatre, © 2017 Christopher Neugebauer (CC BY-SA 2.0) + Image credit: Mystic Theatre, © 2017 Christopher Neugebauer (CC BY-SA 2.0)
@@ -116,11 +116,11 @@ {% for sponsor in level.sponsors %} {% endfor %} @@ -131,7 +131,7 @@
- Become a Sponsor + Become a Sponsor
@@ -159,7 +159,7 @@
- Image credit: DjangoGirls Brisbane, © 2014 Richard Jones (CC BY 2.0) + Image credit: DjangoGirls Brisbane, © 2014 Richard Jones (CC BY 2.0)
diff --git a/pinaxcon/templates/static_pages/program/call_for_proposals.md b/pinaxcon/templates/static_pages/program/call_for_proposals.md index d930fa58da2bcf0610200f7b1dcb31b381fb5e54..ae70ea89f3d6db411ff81e1e6b1f81bdcd010d34 100644 --- a/pinaxcon/templates/static_pages/program/call_for_proposals.md +++ b/pinaxcon/templates/static_pages/program/call_for_proposals.md @@ -3,12 +3,12 @@ We've got lots of good information and resources below that you should read, but in case you've already read it and want to dive in now:
- Submit a Proposal + Submit a Proposal
If you've never presented at a conference before and think you might like to try it, we want to hear from you! The program committee is *very* much interested in encouraging and supporting new speakers, and we will be able to provide detailed feedback and work with you to develop your proposal and talk content so you can give the best talk possible. -In the interest of transparency, we have documented our [selection process](/program/selection-process "North Bay Python proposal selection process"). Portions of this page were drawn from ideas seen on [DjangoCon EU](https://djangocon.eu "DjangoCon Europe"), [SeaGL](https://seagl.org "Seattle GNU Linux"), [Fog City Ruby](http://www.fogcityruby.com/speak/ "Fog City Ruby"), and others. Thanks to all for their inspiration and permission to borrow! +In the interest of transparency, we have documented our [selection process](/program/selection-process). Portions of this page were drawn from ideas seen on [DjangoCon EU](https://djangocon.eu), [SeaGL](https://seagl.org), [Fog City Ruby](http://www.fogcityruby.com/speak/), and others. Thanks to all for their inspiration and permission to borrow! ## Dates @@ -22,7 +22,7 @@ In the interest of transparency, we have documented our [selection process](/pro North Bay Python is dedicated to featuring a diverse and inclusive speaker lineup. -**All speakers will be expected to have read and adhere to the conference [Code of Conduct](/code-of-conduct "North Bay Python Code of Conduct"). In particular for speakers: slide contents and spoken material should be appropriate for a professional audience including people of many different backgrounds. Sexual language and imagery is not appropriate, and neither are language or imagery that denigrate or demean people based on race, gender, religion, sexual orientation, physical appearance, disability, or body size.** +**All speakers will be expected to have read and adhere to the conference [Code of Conduct](/code-of-conduct). In particular for speakers: slide contents and spoken material should be appropriate for a professional audience including people of many different backgrounds. Sexual language and imagery is not appropriate, and neither are language or imagery that denigrate or demean people based on race, gender, religion, sexual orientation, physical appearance, disability, or body size.** We will make every effort to provide accommodations for speakers and attendees of all abilities—all we ask is that you let us know so we can prepare accordingly. @@ -38,7 +38,7 @@ North Bay Python is a conference in support of the local programmer community ou This doesn't mean that every talk needs to be a beginner's talk. If you're talking about advanced concepts, people who are new to Python or your library should come away excited about the possibilities, and know what concepts they need to learn to get there. -This is a list of topics we think might go well in the North Bay Python program, but it is by no means exhaustive. If you have a talk idea on a subject not listed here and you think it fits well with our community and mission, we would love to hear about it! +This is a list of topics we think might go well in the North Bay Python program, but it is by no means exhaustive. If you have a talk idea on a subject not listed here and you think it fits well with our community and mission, we would love to hear about it! + The Python community + Python fundamentals @@ -53,11 +53,11 @@ This is a list of topics we think might go well in the North Bay Python program, ## Resources -This [public speaking](https://github.com/vmbrasseur/Public_Speaking "Public Speaking Resource Repository by VM Brasseur") repository, maintained by [VM Brasseur](https://twitter.com/vmbrasseur "VM Brasseur on Twitter"), has many useful resources to help you polish your proposals and talks. +This [public speaking](https://github.com/vmbrasseur/Public_Speaking) repository, maintained by [VM Brasseur](https://twitter.com/vmbrasseur), has many useful resources to help you polish your proposals and talks. ### Office Hours and Mentorship -The program committee will be holding regularly-scheduled office hours during the CFP period to help you organize proposals. You are also welcome to email us or drop by #nbpy on the Freenode IRC network anytime to ask questions. +The program committee will be holding regularly-scheduled office hours during the CFP period to help you organize proposals. You are also welcome to email us or drop by #nbpy on the Freenode IRC network anytime to ask questions. We're happy to help with any of the following: @@ -67,13 +67,13 @@ We're happy to help with any of the following: + Connecting you with rehearsal audiences or even just watching you present over a video conference as practice + Anything else that'd help you be at ease and excited about bringing your ideas to our audience! -Our office hours are scheduled for every Wednesday at 7pm and Friday at 3pm Pacific Time. They will take place in #nbpy on the Freenode IRC network. IRC is a web chat protocol and you can use this IRC web client to connect. +Our office hours are scheduled for every Wednesday at 7pm and Friday at 3pm Pacific Time. They will take place in #nbpy on the Freenode IRC network. IRC is a web chat protocol and you can use this IRC web client to connect. + Wednesday, August 23 at 7pm + Friday, August 25 at 3pm + Wednesday, August 30 at 7pm + Friday, September 1 at 3pm -+ Wednesday, September 6 at 7pm ++ Wednesday, September 6 at 7pm + Friday, September 8 at 3pm + Wednesday, September 13 at 7pm + Friday, September 15 at 3pm @@ -91,16 +91,16 @@ If you've given your talk before, links to video or slides would be excellent, o Your speaker profile includes a space for you to describe your prior experience giving talks—this is your chance to talk yourself up and explain how you're qualified to share your ideas, so take advantage of it!
- Submit a Proposal + Submit a Proposal
## Feedback and mentorship -**First time speakers are welcomed and encouraged; if you've never done this before but have an idea please contact the program committee to be connected with a mentor and receive guidance structuring your proposal and talk. Above all we want you to be successful and have a good time telling other attendees about your amazing ideas!** +**First time speakers are welcomed and encouraged; if you've never done this before but have an idea please contact the program committee to be connected with a mentor and receive guidance structuring your proposal and talk. Above all we want you to be successful and have a good time telling other attendees about your amazing ideas!** If you have an idea (or don't!) and want to speak, here's a very rough process of what you should do next: -+ Brainstorm or [mind map](https://en.wikipedia.org/wiki/Mind_map "Wikipedia Entry on Mind Mapping") to expand upon your ideas or knowledge in search of a general topic ++ Brainstorm or [mind map](https://en.wikipedia.org/wiki/Mind_map) to expand upon your ideas or knowledge in search of a general topic + Write a paragraph or two, or some bullet points, to outline the core concepts you want to communicate and what people might learn from your talk + Get someone you trust to read your notes and tell you what they think they'd learn + Attend our office hours to get help building up your submission diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 67671c159c576f031a0f91ab86b3a488bab12561..6f454a87254105804a59d8d28cdc7a81bdad52e5 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -5,9 +5,10 @@ from django.contrib.staticfiles.templatetags.staticfiles import static as _stati from django.views.generic import TemplateView from django.views.generic import RedirectView - from django.contrib import admin +from pinaxcon import views + import symposion.views @@ -78,3 +79,5 @@ urlpatterns = [ ] urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + +handler500 = views.server_error diff --git a/pinaxcon/views.py b/pinaxcon/views.py new file mode 100644 index 0000000000000000000000000000000000000000..433e3684b49a6d76a2d4f230a143b6b873bed7ea --- /dev/null +++ b/pinaxcon/views.py @@ -0,0 +1,9 @@ +from django.http import HttpResponseServerError +from django.template import RequestContext +from django.template import Template +from django.template.loader import get_template +from django.views import defaults + +def server_error(request, template_name=defaults.ERROR_500_TEMPLATE_NAME): + t = Template("{%% include '%s' %%}" % template_name) + return HttpResponseServerError(t.render(RequestContext(request))) diff --git a/static/scss/custom.scss b/static/scss/custom.scss index 131c533261e3adac7ed6552693eda482c4a5db20..06885fcaf3c1c4fd9796e3408b59b665624f3500 100644 --- a/static/scss/custom.scss +++ b/static/scss/custom.scss @@ -103,6 +103,19 @@ body.auth .panel-heading .panel-title span.pull-right { box-shadow: 0px 0px 2em $background-filter; //, inset 0px -5px 1em rgba(0, 0, 0, 0.8); } + +.hidden-accessible { + border:0 none; + clip:rect(0px,0px,0px,0px); + height:1px; + margin:-1px; + overflow:hidden; + padding:0; + position:absolute; + width:1px +} + + $homepage-block-min-height: 480px; .homepage-block { @@ -362,3 +375,11 @@ footer .footer-copy { margin-top: 22px; } } + +.homepage-subtitle { + font-size: $font-size-h3; +} + +.navbar-toggle { + background-color: $gray-lighter; +}