Changeset - 9329cdbaf5a9
[Not reviewed]
pinaxcon/templates/static_pages/about/colophon.html
Show inline comments
...
 
@@ -27,6 +27,8 @@
 
<ul>
 
  <li>Photo of <a href="https://www.instagram.com/p/BcOVJJRFWfF">Mystic Theatre</a> used on the home page by Esten Hurtle under the <a href="https://creativecommons.org/licenses/by-sa/2.0/" >Creative Commons Attribute Share Alike 2.0 Generic</a> license.</li>
 
  <li>Photo of <a href="https://www.flickr.com/photos/richard_jones/14638274749">DjangoGirls Brisbane 2014</a> used on the home page by Richard Jones under the <a href="https://creativecommons.org/licenses/by/2.0/">Creative Commons Attribution 2.0 Generic</a> license.</li>
 
  <li>Photo of <a href="https://en.wikipedia.org/wiki/Golden_Gate_Bridge#/media/File:GG-ftpoint-bridge-2.jpg">Golden Gate Bridge</a> used on the home page by David Ball under the <a href="https://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 Generic</a> license.</li>
 

	
 
</ul>
 

	
 
<h2>Python</h2>
pinaxcon/templates/static_pages/go/day-trip.html
Show inline comments
 
file renamed from pinaxcon/templates/static_pages/attend/day-trip.html to pinaxcon/templates/static_pages/go/day-trip.html
pinaxcon/templates/static_pages/go/fly.html
Show inline comments
 
file renamed from pinaxcon/templates/static_pages/attend/fly.html to pinaxcon/templates/static_pages/go/fly.html
pinaxcon/templates/static_pages/go/stay.html
Show inline comments
 
file renamed from pinaxcon/templates/static_pages/attend/stay.html to pinaxcon/templates/static_pages/go/stay.html
pinaxcon/templates/static_pages/homepage.html
Show inline comments
...
 
@@ -72,7 +72,7 @@
 

	
 
      <div class="homepage-callout">
 
        <div class="callout-image">
 
          <h3 class="txt">Fly</h3>
 
          <h3 class="txt"><a href="/go/fly">Fly</a></h3>
 
          <div class="filter"></div>
 
          <div class="bg" style="background-image: url('{% static "images/homepage/snoopy.jpg" %}');"></div>
 
          <p>
...
 
@@ -85,9 +85,9 @@
 

	
 
      <div class="homepage-callout">
 
        <div class="callout-image">
 
          <h3 class="txt">Stay</h3>
 
          <h3 class="txt"><a href="/go/stay">Stay</a></h3>
 
          <div class="filter"></div>
 
          <div class="bg" style="background-image: url('{% static "images/homepage/snoopy.jpg" %}');"></div>
 
          <div class="bg" style="background-image: url('{% static "images/homepage/golden-gate.jpg" %}');"></div>
 
          <p>
 
            Drive 35 miles North of the Golden Gate Bridge, or take transit from
 
            downtown San Francisco, and spend the night.
...
 
@@ -98,7 +98,7 @@
 

	
 
      <div class="homepage-callout">
 
        <div class="callout-image">
 
          <h3 class="txt">Day Trip</h3>
 
          <h3 class="txt"><a href="/go/day-trip">Day Trip</a></h3>
 
          <div class="filter"></div>
 
          <div class="bg" style="background-image: url('{% static "images/homepage/snoopy.jpg" %}');"></div>
 
          <p>Enjoy free all-day parking close to the venue, or take regular buses from San Francisco, Marin County, and Sonoma County</p>
...
 
@@ -121,7 +121,7 @@
 

	
 
      <div class="homepage-callout">
 
        <div class="callout-image">
 
          <h3 class="txt">Attendee Safety</h3>
 
          <h3 class="txt"><a href="/code-of-conduct">Attendee Safety</a></h3>
 
          <div class="filter"></div>
 
          <div class="bg" style="background-image: url('{% static "images/homepage/snoopy.jpg" %}');"></div>
 
          <p>We take our code of conduct serioiusly: our staff have taken enforcement training.</p>
...
 
@@ -130,18 +130,18 @@
 

	
 
      <div class="homepage-callout">
 
        <div class="callout-image">
 
          <h3 class="txt">Opportunity Grants</h3>
 
          <h3 class="txt"><a href="/opportunity-grant">Opportunity Grants</a></h3>
 
          <div class="filter"></div>
 
          <div class="bg" style="background-image: url('{% static "images/homepage/snoopy.jpg" %}');"></div>
 
          <div class="bg" style="background-image: url('{% static "images/homepage/django-girls-2014.jpg" %}');"></div>
 
          <p>If you live out of town, we want to make sure you can attend.</p>
 
        </div>
 
      </div>
 

	
 
      <div class="homepage-callout">
 
        <div class="callout-image">
 
          <h3 class="txt">Diversity Targets</h3>
 
          <h3 class="txt"><a href="/program/selection-process">Diversity Targets</a></h3>
 
          <div class="filter"></div>
 
          <div class="bg" style="background-image: url('{% static "images/homepage/snoopy.jpg" %}');"></div>
 
          <div class="bg" style="background-image: url('{% static "images/homepage/mystic-marquee.jpg" %}');"></div>
 
          <p>We want to look like the  Bay Area. We have diversity targets for our speakers and audience.</p>
 
        </div>
 
      </div>
pinaxcon/templates/static_pages/opportunity-grant.html
Show inline comments
 
file renamed from pinaxcon/templates/static_pages/attend/finaid.html to pinaxcon/templates/static_pages/opportunity-grant.html
...
 
@@ -2,9 +2,9 @@
 

	
 
{% load i18n %}
 

	
 
{% block head_title %}Financial Aid{% endblock %}
 
{% block head_title %}Opportunity Grants{% endblock %}
 

	
 
{% block heading %}Financial Aid{% endblock %}
 
{% block heading %}Opportunity Grants{% endblock %}
 

	
 
{% block body_class %}attend{% endblock %}
 

	
...
 
@@ -18,7 +18,7 @@ Part of the Python community spirit is making knowledge &ndash; and access to th
 

	
 
<p>Our mission is to provide an accessible Python conference to everyone in Northern California. We understand that some people will need to travel for 2 or more hours to get to Petaluma, and that the costs of transport and lodging can add up. Our grants are intended to make your weekend at North Bay Python cost about as much as a weekend at home would cost.</p>
 

	
 
<p>If you're selected to receive financial aid, we'll cover the following for you:</p>
 
<p>If you're selected to receive an opportunity grant, we'll cover the following for you:</p>
 

	
 
<ul>
 
  <li><strong>Ground transportation</strong>, up to $70 return: including public transit, including reasonable cab/rideshare fares between the venue and accommodation in Petaluma.</li>
pinaxcon/urls.py
Show inline comments
...
 
@@ -40,10 +40,12 @@ urlpatterns = [
 
    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"^opportunity-grant$", TemplateView.as_view(template_name="static_pages/attend/finaid.html"), name="opportunity-grant"),
 
    url(r"^opportunity-grant$", TemplateView.as_view(template_name="static_pages/opportunity-grant.html"), name="opportunity-grant"),
 
    url(r"^attend/finaid$", RedirectView.as_view(url="/opportunity-grant")),
 
    url(r"^attend/finaid$", RedirectView.as_view(url="/opportunity-grant")),
 
    url(r"^attend/financial-aid$", RedirectView.as_view(url="/opportunity-grant")),
 

	
 
    url(r"^attend/stay$", TemplateView.as_view(template_name="static_pages/attend/travel.html"), name="attend/travel"),
 
    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"),
...
 
@@ -55,9 +57,9 @@ urlpatterns = [
 
    url(r"^guide$", RedirectView.as_view(url="guides")),
 

	
 
    # go
 
    url(r"^go/fly$", TemplateView.as_view(template_name="static_pages/attend/fly.html"), name="go/fly"),
 
    url(r"^go/stay$", TemplateView.as_view(template_name="static_pages/attend/stay.html"), name="go/stay"),
 
    url(r"^go/day-trip$", TemplateView.as_view(template_name="static_pages/attend/day-trip.html"), name="go/day-trip`"),
 
    url(r"^go/fly$", TemplateView.as_view(template_name="static_pages/go/fly.html"), name="go/fly"),
 
    url(r"^go/stay$", TemplateView.as_view(template_name="static_pages/go/stay.html"), name="go/stay"),
 
    url(r"^go/day-trip$", TemplateView.as_view(template_name="static_pages/go/day-trip.html"), name="go/day-trip`"),
 

	
 
    url(r"^safety$", TemplateView.as_view(template_name="static_pages/safety.html"), name="safety"),
 
    url(r"^emergencies$", RedirectView.as_view(url="safety")),
static/images/brandon.jpg
Show inline comments
 
deleted file
 
binary diff not shown
Show images
static/images/cczona.jpg
Show inline comments
 
deleted file
 
binary diff not shown
Show images
static/images/homepage/django-girls-2014.jpg
Show inline comments
 
file renamed from static/images/django-girls-2014.jpg to static/images/homepage/django-girls-2014.jpg
Show images
static/images/homepage/golden-gate.jpg
Show inline comments
 
new file 100644
 
binary diff not shown
Show images
static/images/homepage/mystic-marquee.jpg
Show inline comments
 
file renamed from static/images/mystic-marquee.jpg to static/images/homepage/mystic-marquee.jpg
Show images
static/images/mariatta.jpg
Show inline comments
 
deleted file
 
binary diff not shown
Show images
static/images/r0ml.jpg
Show inline comments
 
deleted file
 
binary diff not shown
Show images
static/scss/custom.scss
Show inline comments
...
 
@@ -240,6 +240,10 @@ $homepage-block-smaller-min-height: 360px;
 

	
 
    }
 
  }
 

	
 
  a {
 
    color: $logo-sky-blue;
 
  }
 
}
 

	
 

	
0 comments (0 inline, 0 general)