From 6fd8c37c3bb329847b43e64e680057229ff2e66c Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Tue, 15 Aug 2017 14:52:51 -0700 Subject: [PATCH 1/6] REVERT FOR CFP LAUNCH #52 remove CFP references --- fixtures/sitetree.json | 2 +- pinaxcon/templates/static_pages/homepage.html | 3 +-- pinaxcon/templates/static_pages/news.html | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fixtures/sitetree.json b/fixtures/sitetree.json index 3565ad3..a758398 100644 --- a/fixtures/sitetree.json +++ b/fixtures/sitetree.json @@ -64,7 +64,7 @@ "url": "/program/call-for-proposals", "urlaspattern": false, "tree": 1, - "hidden": false, + "hidden": true, "alias": null, "description": "", "inmenu": true, diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index 58e3171..c6a2046 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -28,7 +28,7 @@

2017 conference: December 2 & 3
- Talk submissions close September 29 + Talk submissions open August 21

@@ -64,7 +64,6 @@
- Submit a Proposal Twitter Facebook
diff --git a/pinaxcon/templates/static_pages/news.html b/pinaxcon/templates/static_pages/news.html index ec4407c..407e8ff 100644 --- a/pinaxcon/templates/static_pages/news.html +++ b/pinaxcon/templates/static_pages/news.html @@ -10,6 +10,8 @@ {% block content %} +{% comment %} +

Now accepting talk proposals for North Bay Python 2017

Monday, August 21, 2017—The North Bay Python team is excited to announce that the call for proposals (CFP) is now open! We are seeking speakers of all experience levels to contribute to our inaugural conference. The CFP will close on September 29, 2017.

@@ -22,6 +24,8 @@

Feel free to reach out with any questions, comments, or ideas you have. You can find us on Twitter, Facebook, and IRC, or you can email us. Please, get started today! The call for proposals closes on September 29, 2017.

+{% endcomment %} +

North Bay Python joins Software Freedom Conservancy

From dff5b27042eb74b18e079a74a772c20ddad41f95 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Tue, 15 Aug 2017 14:54:47 -0700 Subject: [PATCH 2/6] Splits the |-separated footer links into individual lines --- pinaxcon/templates/_footer.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html index 8813d93..365bdfb 100644 --- a/pinaxcon/templates/_footer.html +++ b/pinaxcon/templates/_footer.html @@ -10,7 +10,12 @@

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

-

Facebook | Twitter | Code of Conduct | Terms and Conditions | Colophon

+

+ Facebook + | Twitter + | Code of Conduct + | Terms and Conditions + | Colophon

From 5fde6fce5a770b7e8b66c26dc62f8af67e9bd5ab Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Tue, 15 Aug 2017 14:55:13 -0700 Subject: [PATCH 3/6] REVERT WHEN T&Cs AVAILABLE #52 removes T&C link from footer --- pinaxcon/templates/_footer.html | 1 - 1 file changed, 1 deletion(-) diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html index 365bdfb..07550d6 100644 --- a/pinaxcon/templates/_footer.html +++ b/pinaxcon/templates/_footer.html @@ -14,7 +14,6 @@ Facebook | Twitter | Code of Conduct - | Terms and Conditions | Colophon

From fe1e2bdd71d174460437686de5122ba561393b43 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Tue, 15 Aug 2017 14:57:09 -0700 Subject: [PATCH 4/6] =?UTF-8?q?Removes=20the=20LA-originated=20T&Cs,=20rem?= =?UTF-8?q?oves=20reference=20to=20LA=E2=80=99s=20T&Cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static_pages/about/colophon.html | 5 +- .../static_pages/terms_and_conditions.html | 4 + .../static_pages/terms_and_conditions.md | 118 ------------------ 3 files changed, 7 insertions(+), 120 deletions(-) diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index 2e962de..e11a262 100644 --- a/pinaxcon/templates/static_pages/about/colophon.html +++ b/pinaxcon/templates/static_pages/about/colophon.html @@ -35,7 +35,8 @@

Terms and Conditions

-

Our Terms and Conditions were forked from the Linux Australia Event Terms and Conditions under the GNU General Public License v3.0. 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

@@ -48,4 +49,4 @@
  • Inkscape is used to create most of our graphics.
    • -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/pinaxcon/templates/static_pages/terms_and_conditions.html b/pinaxcon/templates/static_pages/terms_and_conditions.html index 6bc5cd6..ffcba16 100644 --- a/pinaxcon/templates/static_pages/terms_and_conditions.html +++ b/pinaxcon/templates/static_pages/terms_and_conditions.html @@ -9,10 +9,14 @@ {% block body_class %}terms-and-conditions{% endblock %} +{% block lede %}Terms and Conditions will be available when tickets are on sale.{% endblock %} + {% block content %} {% markdown %} +{% comment %} {% include "static_pages/terms_and_conditions.md" %} +{% endcomment %} {% endmarkdown %} {% endblock %} diff --git a/pinaxcon/templates/static_pages/terms_and_conditions.md b/pinaxcon/templates/static_pages/terms_and_conditions.md index 49fad46..e69de29 100644 --- a/pinaxcon/templates/static_pages/terms_and_conditions.md +++ b/pinaxcon/templates/static_pages/terms_and_conditions.md @@ -1,118 +0,0 @@ -These Terms and Conditions apply to all attendees who have registered for North Bay Python. This doucment was forked from the [Linux Australia Event Terms and Conditions](https://github.com/linuxaustralia/constitution_and_policies/blob/master/terms_and_conditions.md "Linux Australia Event Terms and Conditions Template") under the [GNU General Public License v3.0](https://github.com/linuxaustralia/constitution_and_policies/blob/master/LICENCE.md "GNU General Public License v3.0"). - - - -Registration ------------- - -Registering for the event does not guarantee your ticket until it has been paid for in full. So to secure your ticket, pay the registration invoice as soon as possible. - -Security and Credit Cards -------------------------- - -All transactions are performed through a payment gateway facility and use SSL encryption. The facility accepts MasterCard, Visa, and may accept other cards as well. All transactions are performed by the event organizers on behalf of Software Freedom Conservancy. - -Cancellation Policy -------------------- - -**Cancellations made prior to November 2, 2017**: Incur a cancellation fee of $25 or 15% of the ticket cost, whichever is greater, which will be deducted from any registration fee paid. The balance will be refunded. - -**Cancellations made after November 2, 2017**: No refund. - -Substitutions -------------- - -You may substitute another person, however you must contact us with this person's details. If you wish to substitute after November 2, 2017 please note that we will not be able to provide any personalized items. - -Privacy Notice --------------- - -In the course of registering for the event and related events, personal information will be collected about attendees such as their name, contact details, etc. This information is required to facilitate registration to the event, for catering requirements, and for organizers or their agents to contact particular attendees as and when required in respect of the event. Attendees who do not disclose this personal information will be unable to complete registration at the event and will therefore not be able to attend. - -Personal information will only be disclosed to North Bay Python, Software Freedom Conservancy, and to Government agencies where organizers believe disclosure is appropriate for legal compliance and law enforcement; to facilitate court proceedings; to enforce our terms and conditions; or to protect the rights, property, or safety of the event, our attendees, or others. North Bay Python and Software Freedom Conservancy will not sell your personal information to third parties and will not use your personal information to send promotional material from any of our affiliated partners and/or sponsors. - -As part of the registration process attendees will be asked if they would like to subscribe to the event mailing lists and/or the event announcement mailing list. Attendees who subscribe to one or more of these lists will be sent emails from the event organizers and other subscribers to the mailing lists. If at any time, attendees wish to unsubscribe from any of these mailing lists, please follow the 'how to unsubscribe' directions on the bottom of any message you receive from these mailing lists. - -From time to time event organizers update their information and website practices. Please regularly review this page for the most recent information about the event privacy practices. - -All personal information will be kept private and used only for event registration purposes, statistics for future events, and convenience for future event registration. - -Network -------- - -The event may provide attendees with access to a wired and/or wireless network. Access to this network is a privilege and not an entitlement, and must be used appropriately. Inappropriate use includes, but is not limited to: unlawful activities, interfering with the equipment or network access of others and not respecting the reasonable expectations of privacy that attendees have for traffic flowing through the network. - -If any attendees use the network inappropriately, then the event organisers will take any enforcement action they consider appropriate. Enforcement action includes but is not limited to: - -* suspending access to the network -* disconnecting the network permanently -* the alleged offender may be asked to immediately leave the venue and/or will be prohibited from continuing to attend the event (without reimbursement) -* the incident may be reported to the police -* any other measure the event organizers see fit - -Be aware that for security and operational reasons the event organizers may both monitor and log network traffic. - -Discrimination and Anti-Social Behaviour ----------------------------------------- - -North Bay Python is proud to support people from all walks of life, especially underrepresented groups like women and people of color, and will not tolerate in any fashion any intimidation, harassment, and/or any abusive, discriminatory or derogatory behaviour by any attendees of the event and/or related events. - -Examples of these behaviors and measures the event organizers may take are set out in the [Code of Conduct](/code-of-conduct "North Bay Python Code of Conduct"). By registering for and attending North Bay Python, you agree to this Code of Conduct. - -Talk Recordings ---------------- - -Event organizers may provide recordings of talks (audio and/or video) given at the event. This service is provided on a best-effort basis only. Any recordings will be released as and when they are ready, which may be some time after the conclusion of the event, and the recordings may be of varying quality. - -Photography and Audio Video Recording -------------------------------------- - -This applies to all attendees of North Bay Python and related events, including staff who are designated as official photographers and audio and video recorders. - -Do not photograph, video or audio record anyone without their express permission. - -Attendees will have a way to visibly signal their preference for photography at the conference. You agree to consider and act according to these preferences: - -* Opt-in: Photography always okay -* Permission required: Ask before photographing -* Opt-out: Photographs are never okay, don't ask - -There is no prior opt-in for audio or video recordings. You must always ask before recording. - -The event may have one or more staff taking photographs and/or audio or video recordings during the -event. These staff will respect attendees' preferences regarding photography and recordings. - -The only exception is for recordings of talks given at the event where attendees who ask questions of the presenter may be included in the talk recording. - -If Software Freedom Conservancy or North Bay Python organizers chooses to publish photographs and recordings taken by event staff, we will publish them under a Creative Commons license. Conservancy and North Bay Python further reserve the right to use those photographs and recordings in promotional materials to promote North Bay Python and/or the use of free and open source software. - -If there is a violation of this policy, event organizers will request that the photograph be removed from any sites where it was posted and deleted from the devices. In the event that this request is ignored or further violations occur, the participants violating this policy may be sanctioned or expelled from the conference without a refund or banned from future North Bay Python events. - -Media ------ - -There are a limited number of Media Passes available to media personnel. Media Passes are free of charge, and entitle media personnel to attend the event with all the entitlements of a Corporate registration. Please note, due to the limited numbers of Media Passes available, all Media Passes will need to be approved by the event organizers. - -Any media attending the event are required to identify themselves as "media" to attendees prior to speaking on the record with any attendees of the event. It is the responsibility of the media to introduce themselves to the persons they wish to interview and to arrange any interviews with those persons. The event organizers will not make introductions or arrange interviews on behalf of media. - -Students --------- - -Students who register for a student ticket (if available) to attend the event may be required to provide event organizers with proof that they are eligible for registration as a student, such as providing a valid student ID card. - -Smoke-free ----------- - -All event venues including the social event venues are smoke-free. If attendees wish to smoke during the event and/or related events, they must do so in signed areas. Please consider others and refrain from smoking directly outside the venues' entrances. - -Health and Safety ------------------ - -If you are attending the event as a presenter, it is your responsibility to ensure that your talk meets health and safety requirements under United States and California law. If you are unsure about what this means, please contact the event organizers. - -Immigration/Entry Requirements ------------------------------- - -Anyone who lives outside the United States will need a passport and may require a visa to gain entry into the United States. Please contact your local United States embassy to determine your travel needs. You should take into account the Cancellation Policy above and do this well in advance of the event. - -Where a letter of invitation is required, one will be issued by event organizers for presenters whose submissions have been accepted. \ No newline at end of file From 27e1edfdd91879d329d4009008e639c09fa2be80 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Tue, 15 Aug 2017 15:01:21 -0700 Subject: [PATCH 5/6] Updates news page --- pinaxcon/templates/static_pages/news.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pinaxcon/templates/static_pages/news.html b/pinaxcon/templates/static_pages/news.html index 407e8ff..099cdc1 100644 --- a/pinaxcon/templates/static_pages/news.html +++ b/pinaxcon/templates/static_pages/news.html @@ -28,12 +28,11 @@

    North Bay Python joins Software Freedom Conservancy

    - -

    Bloop, August Bleep, 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.

    +

    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.

    -

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

    +

    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.

    We look forward to working with Conservancy to advance software freedom and expand the community of Python developers. If this is the first time you've heard of Conservancy, we encourage you to check out their website and give them your support.

    From 4eba653ecffb01611ba57dc76dee4a683b0998ce Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Tue, 15 Aug 2017 15:07:44 -0700 Subject: [PATCH 6/6] =?UTF-8?q?Increases=20margin=20on=20tight-headings=20?= =?UTF-8?q?so=20that=20there=20isn=E2=80=99t=20interaction=20between=20two?= =?UTF-8?q?=20adjacent=20H1/H2=20blocks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/scss/custom.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/scss/custom.scss b/static/scss/custom.scss index 58afacb..ccdfac1 100644 --- a/static/scss/custom.scss +++ b/static/scss/custom.scss @@ -152,7 +152,7 @@ $homepage-block-min-height: 480px; color: white; text-shadow: 1px 1px $gray-dark; - a:not(.btn) { + a:not(.btn) { color: lighten($brand-primary, 20%); &:hover, @@ -179,7 +179,7 @@ $homepage-block-min-height: 480px; .tight-headings { h1, h2, h3, h4, h5, h6 { - margin: 0; + margin: 0.05em; } }