Changeset - 9329cdbaf5a9
[Not reviewed]
pinaxcon/templates/static_pages/about/colophon.html
Show inline comments
...
 
@@ -29,2 +29,4 @@
 
  <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>
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
...
 
@@ -74,3 +74,3 @@
 
        <div class="callout-image">
 
          <h3 class="txt">Fly</h3>
 
          <h3 class="txt"><a href="/go/fly">Fly</a></h3>
 
          <div class="filter"></div>
...
 
@@ -87,5 +87,5 @@
 
        <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>
...
 
@@ -100,3 +100,3 @@
 
        <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>
...
 
@@ -123,3 +123,3 @@
 
        <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>
...
 
@@ -132,5 +132,5 @@
 
        <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>
...
 
@@ -141,5 +141,5 @@
 
        <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>
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
...
 
@@ -4,5 +4,5 @@
 

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

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

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

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

	
pinaxcon/urls.py
Show inline comments
...
 
@@ -41,7 +41,9 @@ urlpatterns = [
 
    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"),
...
 
@@ -57,5 +59,5 @@ urlpatterns = [
 
    # 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`"),
 

	
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
...
 
@@ -242,2 +242,6 @@ $homepage-block-smaller-min-height: 360px;
 
  }
 

	
 
  a {
 
    color: $logo-sky-blue;
 
  }
 
}
0 comments (0 inline, 0 general)