CopyleftConf/copyleftconf-website Changeset - bc95ecb17f3b

Changeset - bc95ecb17f3b

Parent rev.

Child rev.

[Not reviewed]

Merge

0 6 1

Josh Simmons - 6 years ago 2018-07-04 20:18:56
joshuasimmons@google.com

Merge branch 'master' of github.com:northbaypython/website

3 files changed with 6 insertions and 6 deletions:

pinaxcon/templates/site_base.html

pinaxcon/templates/symposion/sponsorship/list.html

pinaxcon/urls.py

0 comments (0 inline, 0 general)

pinaxcon/templates/site_base.html

➞

Show inline comments

 {% extends "override_bootstrap_theme_base.html" %}
 {% load staticfiles %}
 {% load metron_tags %}
 {% load i18n %}
 {% load sitetree %}
 {% block styles %}
     {% include "_styles.html" %}
 {% endblock %}
 {% block extra_head_base %}
     {% block extra_head %}
       <meta property="twitter:card" content="summary">
       <meta property="og:type" content="website">
       <meta property="og:title" content="{% block head_title %}{% endblock %} | {{ SITE_NAME }}">
       <meta property="twitter:title" content="{{ SITE_NAME }}">
       <meta property="og:site_name" content="North Bay Python">
       <meta property="og:image" content="http://{{ request.META.HTTP_HOST }}{% static "images/square_icon.png" %}">
       <meta property="og:url" content="{{ request.build_absolute_uri }}">
       <meta property="og:description" content="North Bay Python, a community-organized conference, comes to Petaluma, California on December 2 and 3, 2017.">
       <meta property="twitter:description" content="North Bay Python, a community-organized conference, comes to Petaluma, California on December 2 and 3, 2017.">
       <meta name="description" content="North Bay Python, a community-organized conference, comes to Petaluma, California on December 2 and 3, 2017.">
       <meta property="og:description" content="North Bay Python, a community-organized conference, returns to Petaluma, California on November 3 and 4, 2018.">
       <meta property="twitter:description" content="North Bay Python, a community-organized conference, returns to Petaluma, California on November 3 and 4, 2018.">
       <meta name="description" content="North Bay Python, a community-organized conference, returns to Petaluma, California on November 3 and 4, 2018.">
       <meta name="google-site-verification" content="sTU0G4IghY_jV9iPgCVD1WZuk4C_MSWY2QzxQUjDcC4">
     {% endblock %}
 {% endblock %}
 {% block nav %}
     {% sitetree_menu from "main" include "trunk" template "sitetree/menu_bootstrap3.html" %}
 {% endblock %}
 {% block body_base %}
   <div class="homepage-background-opacity website-background"></div>
   <div class="clouds hdr"></div>
   <div id="background-filter">
     <section id="content_body">
         <div class="container">
             {% include "_messages.html" %}
             <div class="row">
                 <div class="col-md-9">
                     {% block body %}
                     {% endblock %}
                 </div>
                 <div class="col-md-3">
                     {% block sidebar %}

pinaxcon/templates/symposion/sponsorship/list.html

➞

Show inline comments

 {% extends "symposion/sponsorship/list_.html" %}
 {% block lede %}
-  We're grateful to the following organizations, who've made a substantial contribution to North Bay Python 2017. Learn how you can join us on the <a href="/sponsors/become-a-sponsor" title="Become a North Bay Python Sponsor">Become a Sponsor</a> page.
+  We're grateful to the following organizations, who've made a substantial contribution to North Bay Python 2018. Learn how you can join us on the <a href="/sponsors/become-a-sponsor" title="Become a North Bay Python Sponsor">Become a Sponsor</a> page.
 {% endblock %}

pinaxcon/urls.py

➞

Show inline comments

@@ ... / @@ -21,50 +21,50 @@ urlpatterns = [ @@
     url(r"^about/north-bay-python$", TemplateView.as_view(template_name="static_pages/about/north_bay_python.html"), name="about/north-bay-python"),
     url(r"^about/petaluma$", TemplateView.as_view(template_name="static_pages/about/petaluma.html"), name="about/petaluma"),
     url(r"^about/team$", TemplateView.as_view(template_name="static_pages/about/team.html"), name="about/team"),
     url(r"^about/transparency$", TemplateView.as_view(template_name="static_pages/about/transparency/transparency.html"), name="about/transparency"),
     url(r"^about/program-transparency$", TemplateView.as_view(template_name="static_pages/about/transparency/program.html"), name="about/program-transparency"),
     url(r"^about/colophon$", TemplateView.as_view(template_name="static_pages/about/colophon.html"), name="about/colophon"),
     # program
     url(r"^program/events$", TemplateView.as_view(template_name="static_pages/program/events.html"), name="program/events"),
     url(r"^events$", RedirectView.as_view(url="program/events")),
     url(r"^program/call-for-proposals$", TemplateView.as_view(template_name="static_pages/program/call_for_proposals.html"), name="program/call-for-proposals"),
     url(r"^program/selection-process$", TemplateView.as_view(template_name="static_pages/program/selection_process.html"), name="program/selection-process"),
     url(r"^proposals$", RedirectView.as_view(url="program/call-for-proposals")),
     url(r"^cfp$", RedirectView.as_view(url="program/call-for-proposals")),
     # attend
 #    url(r"^attend$", TemplateView.as_view(template_name="static_pages/attend/attend.html"), name="attend/attend"),
 #    url(r"^tickets$", RedirectView.as_view(url="attend")),
 #    url(r"^tickets/buy$", views.buy_ticket, name="buy_ticket"),
 #    url(r"^attend/business-case$", TemplateView.as_view(template_name="static_pages/attend/business-case.html"), name="attend/business-case"),
 #    url(r"^attend/finaid$", TemplateView.as_view(template_name="static_pages/attend/finaid.html"), name="attend/finaid"),
     url(r"^attend/travel$", TemplateView.as_view(template_name="static_pages/attend/travel.html"), name="attend/travel"),
 #    url(r"^attend/hotels$", TemplateView.as_view(template_name="static_pages/attend/hotels.html"), name="attend/hotels"),
 #    url(r"^attend/tshirt$", TemplateView.as_view(template_name="static_pages/attend/tshirt.html"), name="attend/tshirt"),
 #    url(r"^attend/accessibility-and-accommodations$",TemplateView.as_view(template_name="static_pages/attend/accommodations.html"), name="attend/accessibility-and-accommodations"),
 #    url(r"^accessibility$", RedirectView.as_view(url="attend/accessibility-and-accommodations")),
     url(r"^attend/accessibility-and-accommodations$",TemplateView.as_view(template_name="static_pages/attend/accommodations.html"), name="attend/accessibility-and-accommodations"),
     url(r"^accessibility$", RedirectView.as_view(url="attend/accessibility-and-accommodations")),
 #    url(r"^guides$",TemplateView.as_view(template_name="static_pages/attend/guides.html"), name="attend/guides"),
 #    url(r"^guide$", RedirectView.as_view(url="guides")),
     url(r"^safety$", TemplateView.as_view(template_name="static_pages/safety.html"), name="safety"),
     url(r"^emergencies$", RedirectView.as_view(url="safety")),
     url(r"^emergency$", RedirectView.as_view(url="safety")),
 #    url(r"^attend/food$", TemplateView.as_view(template_name="static_pages/attend/food.html"), name="attend/food"),
 #    url(r"^food$", RedirectView.as_view(url="attend/food")),
 #    url(r"^attend/transit$", TemplateView.as_view(template_name="static_pages/attend/transit.html"), name="attend/transit"),
 #    url(r"^transit$", RedirectView.as_view(url="attend/transit")),
     url(r"^code-of-conduct$", TemplateView.as_view(template_name="static_pages/code_of_conduct/code_of_conduct.html"), name="code-of-conduct"),
     url(r"^code-of-conduct/harassment-incidents$", TemplateView.as_view(template_name="static_pages/code_of_conduct/harassment_procedure_attendee.html"), name="code-of-conduct/harassment-incidents"),
     url(r"^code-of-conduct/harassment-staff-procedures$", TemplateView.as_view(template_name="static_pages/code_of_conduct/harassment_procedure_staff.html"), name="code-of-conduct/harassment-staff-procedures"),
     url(r"^terms-and-conditions$", TemplateView.as_view(template_name="static_pages/terms_and_conditions.html"), name="terms-and-conditions"),
     url(r"^terms$", RedirectView.as_view(url="terms-and-conditions")),
     # sponsor
     url(r"^sponsors/prospectus$", RedirectView.as_view(url=_static("assets/northbaypython_prospectus.pdf")), name="sponsors/prospectus"),
     url(r"^northbaypython_prospectus.pdf$", RedirectView.as_view(url=_static("assets/northbaypython_prospectus.pdf")), name="northbaypython_prospectus.pdf"),
     url(r"^sponsors/become-a-sponsor$", TemplateView.as_view(template_name="static_pages/sponsors/become_a_sponsor.html"), name="sponsors/become-a-sponsor"),
     url(r"^sponsors/donate$", TemplateView.as_view(template_name="static_pages/sponsors/donate.html"), name="sponsors/donate"),
     url(r"^donate$", RedirectView.as_view(url="sponsors/donate")),

0 comments (0 inline, 0 general)