From dbf42d26896253620069e965fa862b705549affd Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Tue, 15 Aug 2017 17:02:58 -0700 Subject: [PATCH 1/9] add font weight to dates on news page, call out what our advisors have helped with --- pinaxcon/templates/static_pages/about/team.html | 5 +++-- static/scss/custom.scss | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pinaxcon/templates/static_pages/about/team.html b/pinaxcon/templates/static_pages/about/team.html index fc63523..8b2c1b2 100644 --- a/pinaxcon/templates/static_pages/about/team.html +++ b/pinaxcon/templates/static_pages/about/team.html @@ -27,6 +27,7 @@ Our team of North Bay and Bay Area locals has years of experience building commu @@ -53,8 +54,8 @@ 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.

diff --git a/static/scss/custom.scss b/static/scss/custom.scss index ccdfac1..4611c4d 100644 --- a/static/scss/custom.scss +++ b/static/scss/custom.scss @@ -299,3 +299,7 @@ body:not(.home) { text-decoration: underline; } } + +span.date { + font-weight: 900; +} From 2c58e047e6574da059004a3ff586f6155ab5d366 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Tue, 15 Aug 2017 17:11:19 -0700 Subject: [PATCH 2/9] add pypy to list of conservancy projects --- pinaxcon/templates/static_pages/news.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinaxcon/templates/static_pages/news.html b/pinaxcon/templates/static_pages/news.html index 099cdc1..e21bb60 100644 --- a/pinaxcon/templates/static_pages/news.html +++ b/pinaxcon/templates/static_pages/news.html @@ -30,7 +30,7 @@

Wednesday, August 16, 2017—We are proud to announce that North Bay Python is now a member project of Software Freedom Conservancy, a 501(c)(3) charity dedicated to ethical technology and the development and promotion free and open source software. Conservancy will act as our fiscal sponsor, allowing our team to operate without managing our own corporate structure and administrative services.

-

Conservancy is home to many popular free and open source software projects, like Selenium, phpMyAdmin, Twisted, and Outreachy, some of which run their own events. North Bay Python has the distinct honor of being the first member project that is exclusively focused on organizing community events.

+

Conservancy is home to many popular free and open source software projects, like Selenium, PyPy, phpMyAdmin, Twisted, and Outreachy, some of which run their own events. North Bay Python has the distinct honor of being the first member project that is exclusively focused on organizing community events.

We couldn't be more excited. We're celebrating by donating five free tickets to Outreachy participants and will be promoting member projects relevant to the Python community at the conference. Interested Outreachy alums (past or present) should contact us. We'll also have discounted tickets available for active financial supporters of Software Freedom Conservancy.

From 561a9c1e85fd5bf42b45eae1d7bd91ee72885482 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Tue, 15 Aug 2017 17:13:25 -0700 Subject: [PATCH 3/9] rephrase what vm is helping with --- pinaxcon/templates/static_pages/about/team.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinaxcon/templates/static_pages/about/team.html b/pinaxcon/templates/static_pages/about/team.html index 8b2c1b2..ebc2c36 100644 --- a/pinaxcon/templates/static_pages/about/team.html +++ b/pinaxcon/templates/static_pages/about/team.html @@ -55,7 +55,7 @@ Our team of North Bay and Bay Area locals has years of experience building commu
  • Nicolas Steenhout who is helping us with accessibility and inclusion of people with disabilities.
    • -
  • VM (Vicky) Brasseur who is helping us run an excellent call for proposals and support new speakers with regular office hours and speaker training.
    • +
  • VM (Vicky) Brasseur who is helping us run an excellent call for proposals, design our office hours program, and support new speakers with speaker training.
From f4ab6d687404f27cbf9b3a3b42c0867a70eb7f21 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Tue, 15 Aug 2017 19:58:54 -0700 Subject: [PATCH 4/9] Time Zone --- pinaxcon/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index f403c4b..93e0f9b 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -29,7 +29,7 @@ ALLOWED_HOSTS = ["localhost", ".herokuapp.com", ".northbaypython.org"] # timezone as the operating system. # If running in a Windows environment this must be set to the same as your # system time zone. -TIME_ZONE = "UTC" +TIME_ZONE = os.environ.get("TZ", "America/Los_Angeles") # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html From 0a88ccce181067a3e7ff2e9dd8e6387a5b5f452d Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Tue, 15 Aug 2017 20:07:45 -0700 Subject: [PATCH 5/9] Adds environment variables to always serve over HTTPS --- pinaxcon/settings.py | 7 +++++++ requirements/base.txt | 1 + 2 files changed, 8 insertions(+) diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 93e0f9b..67541dd 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -31,6 +31,11 @@ ALLOWED_HOSTS = ["localhost", ".herokuapp.com", ".northbaypython.org"] # system time zone. TIME_ZONE = os.environ.get("TZ", "America/Los_Angeles") + +# Use SSLRedirectMiddleware +SSL_ON = os.environ.get("DJANGO_SSL_ON", True) +SSL_ALWAYS = os.environ.get("DJANGO_SSL_ALWAYS", False) + # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html LANGUAGE_CODE = "en-us" @@ -118,6 +123,8 @@ MIDDLEWARE_CLASSES = [ "django.contrib.messages.middleware.MessageMiddleware", "reversion.middleware.RevisionMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", + "ssl_redirect.middleware.SSLRedirectMiddleware", + ] ROOT_URLCONF = "pinaxcon.urls" diff --git a/requirements/base.txt b/requirements/base.txt index 36a1dc5..d687314 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -7,6 +7,7 @@ dj-static==0.0.6 dj-database-url==0.4.0 pinax-pages==0.4.2 pinax-boxes==2.1.2 +django-ssl-redirect==2.0 django-libsass==0.7 django-markdown-deux==1.0.5 django-sitetree==1.8.0 From 0de08369d70363bf9e62e44948ec25a27be9f3d3 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Tue, 15 Aug 2017 20:36:15 -0700 Subject: [PATCH 6/9] responsive tooth pulling --- pinaxcon/templates/_account_bar.html | 3 - pinaxcon/templates/_footer.html | 9 +-- pinaxcon/templates/static_pages/homepage.html | 10 ++-- static/scss/custom.scss | 59 +++++++++++++++++++ 4 files changed, 67 insertions(+), 14 deletions(-) diff --git a/pinaxcon/templates/_account_bar.html b/pinaxcon/templates/_account_bar.html index 8da3432..042e13f 100644 --- a/pinaxcon/templates/_account_bar.html +++ b/pinaxcon/templates/_account_bar.html @@ -6,9 +6,6 @@
  • {% trans "Dashboard" %}
    • -
  • - {% trans "Log out" %} -
    • {% else %}
  • {% trans "Log in" %}
    • {% if ACCOUNT_OPEN_SIGNUP %} diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html index 07550d6..a05b171 100644 --- a/pinaxcon/templates/_footer.html +++ b/pinaxcon/templates/_footer.html @@ -1,13 +1,13 @@ {% load staticfiles %}
    -
    + -
    +

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

    @@ -15,10 +15,7 @@ | 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/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index c6a2046..45f9164 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -27,14 +27,14 @@

    - 2017 conference: December 2 & 3
    + December 2 & 3, 2017
    Talk submissions open August 21

    -
    +