News pages working.

Sponsorship ... getting there.

.gitignore

@@ -4,7 +4,11 @@ node_modules/
 _build/
 .DS_Store
 dev.db
+*.pg
 .coverage
 pinaxcon/site_media/
 local_settings.py
 log
+
+\.#*
+*#*#

pinaxcon/settings.py

@@ -245,13 +245,9 @@ DEBUG_TOOLBAR_PANELS = [
     'debug_toolbar.panels.redirects.RedirectsPanel',
 ]
 
-# To use the debug toolbar on a "remote" site (i.e., not on localhost) change 
-# SHOW_TOOLBAR_CALLBACK's definition, below, to return True, rather than False.
-# If you're using this on a local(host) for development, there's no need to
-# change it so long as DEBUG (above) is defined as True.
 DEBUG_TOOLBAR_CONFIG = {
     'INTERCEPT_REDIRECTS': False,
-    'SHOW_TOOLBAR_CALLBACK': lambda x: False,
+    'SHOW_TOOLBAR_CALLBACK': lambda x: True,
 }
 
 LOGGING = {

pinaxcon/templates/cms_pages/abstract_content_page.html

@@ -19,22 +19,12 @@
 {% block header_inset_image %}{% endblock %}
 
 {% block content %}
-<div class="container">
+    <div id="announcements" class="jumbotron-white">
-    <div class="row">
+        <h1>{{ page.title }}</h1>
-        <div class="col-md-1">xxx</div>
+        <p>{{ page.intro }}</p>
-        <div class="col-md-10" >
+        <span>{{ page.body }}</span>
-            <div id="announcements" class="jumbotron-white">
-                <h1>{{ page.title }}</h1>
-                <p>{{ page.intro }}</p>
-                <span>{{ page.body }}</span>
-            </div>
-        </div>
-        <div class="col-md-1">
-            <div id="sponsors" class="wrapper jumbotron-white">
-                <h4>Sponsors</h4>
-                {% include "symposion/sponsorship/_vertical_by_level.html" %}
-            </div>
-        </div>
     </div>
-</div>
+    {% block content_base %}
+    {% endblock %}
 {% endblock %}
+

pinaxcon/templates/cms_pages/news_index_page.html

@@ -17,14 +17,16 @@
 {% block content_base %}
   {% if page.child_pages %}
     {% for item in page.child_pages %}
-      <div class="panel panel__compact">
+      <div class="panel panel__compact jumbotron-white">
         <div class="panel--content">
+        {% comment %}
           <div class="panel--1-3">
             <div class="portrait">
               {% image item.portrait_image width-640 as portrait_image %}
               <div style="background-image: url('{{ portrait_image.url }}');" class="portrait--img"></div>
             </div>
           </div>
+          {% endcomment %}
           <div class="panel--2-3">
             <h2>{{ item.title }}</h2>
             <p class="lede"><em>{{ item.date|date:"j F Y" }}</em> – {{ item.intro }}</p>
@@ -36,7 +38,7 @@
     <div class="panel panel__compact"></div>
   {% endif %}
 
-  <div class="panel panel__compact">
+  <div class="panel panel__compact jumbotron">
     <div class="panel--content">
       <h3>Subscribe</h3>
       <p><a class="btn" href="rss">View as RSS</a></p>

pinaxcon/templates/cms_pages/news_page.html

@@ -15,6 +15,9 @@
 {% endif %}
 
 {% block content %}
+    <div id="announcements" class="jumbotron-white">
+
   <p><em>{{ page.date|date:"j F Y" }}</em></p>
   {{ page.body }}
+  </div>
 {% endblock %}

pinaxcon/templates/dashboard.html

@@ -23,7 +23,7 @@
 {% available_categories as categories %}
 {% if categories %}
   <div class="panel panel__compact panel__bg panel__last">
-    <div style="background-image: url('{% static "pyconau2017/images/wp_bg_optimised.jpg" %}');" class="panel--bg"></div>
+    <!-- div style="background-image: url('{% static "pyconau2017/images/wp_bg_optimised.jpg" %}');" class="panel--bg"></div -->
     <div class="panel--content">
       <div >
         <h2>{% trans "Attend" %} {% conference_name %}</h2>
@@ -115,7 +115,7 @@
 
 
 <div class="panel panel__compact panel__bg panel__last">
-  <div style="background-image: url('{% static "pyconau2017/images/hobart_bg_optimised.jpg" %}');" class="panel--bg"></div>
+  <!-- div style="background-image: url('{% static "pyconau2017/images/hobart_bg_optimised.jpg" %}');" class="panel--bg"></div-->
   <div class="panel--content">
     <div class="panel--2-3">
       <h2>{% trans "Speaking and Miniconfs" %}</h2>
@@ -204,7 +204,7 @@
 {% if review_sections %}
 
   <div class="panel panel__compact panel__bg panel__last">
-    <div style="background-image: url('{% static "pyconau2017/images/conference_bg_optimised.jpg" %}');" class="panel--bg"></div>
+    <!-- div style="background-image: url('{% static "pyconau2017/images/conference_bg_optimised.jpg" %}');" class="panel--bg"></div-->
     <div class="panel--content">
       <div class="panel--2-3">
         <h2>{% trans "Reviews" %}</h2>
@@ -232,8 +232,8 @@
 
 {% available_teams as available_teams %}
 {% if user.memberships.exists or available_teams %}
-    <div class="panel panel__compact panel__bg">
+    <!-- div class="panel panel__compact panel__bg">
-      <div style="background-image: url('{% static "pyconau2017/images/hobart_bg_optimised.jpg" %}');" class="panel--bg"></div>
+      <div style="background-image: url('{% static "pyconau2017/images/hobart_bg_optimised.jpg" %}');" class="panel--bg"></div-->
       <div class="panel--content">
         <div class="panel--2-3">
           <h2>{% trans "Teams" %}</h2>

pinaxcon/templates/site_base.html

@@ -5,7 +5,7 @@
 {% load sitetree %}
 {# <!-- https://gist.github.com/geedmo/5682742--> #}
 <!DOCTYPE html>
-<html lang="en" class="no-js" manifest="{% static 'pyconau2017/manifest.appcache' %}">
+<html lang="en" class="no-js" manifest="{% static 'manifest.appcache' %}">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -21,7 +21,7 @@
       <link rel="stylesheet" href="{% static 'pyconau2017/css/app.css' %}">
       <link rel="stylesheet" href="{% static 'pyconau2017/css/print.css' %}" media="print">
       <link href="{% static 'pyconau2017/css/pyconau.css' %}" rel="stylesheet">
-      <link href="{% static 'pyconau2017/css/pyconau2016.css' %}" rel="stylesheet">
+      <!-- link href="{% static 'pyconau2017/css/pyconau2016.css' %}" rel="stylesheet" -->
 
       <link rel="icon" href="{% static 'pyconau2017/images/favicon.png' %}">
 
@@ -66,8 +66,21 @@
         <!--main role="main"-->
         <!-- site_base block body -->
         {% block body %}
-          {% block content %}
+          <div class="container">
-          {% endblock %}
+              <div class="row">
+                  <div class="col-md-1"></div>
+                  <div class="col-md-10" >
+                    {% block content %}
+                    {% endblock %}
+                  </div>
+                  <div class="col-md-1">
+                      <div id="sponsors" class="wrapper jumbotron-white">
+                          <h4>Sponsors</h4>
+                          {% include "symposion/sponsorship/_vertical_by_level.html" %}
+                      </div>
+                  </div>
+              </div>
+          </div>
         {% endblock %}
         <!-- site_base endblock body -->
         <!--/main-->

pinaxcon/templates/site_base_wagtail.html

@@ -2,10 +2,11 @@
 {% extends "site_base.html" %}
 {% load staticfiles %}
 {% block extra_style %}{% endblock %}
+
+{% comment %}
 {% block body_base %}
-   {% comment %}
     {% include "_messages.html" %}
-    {% endcomment %}
+
     <!-- site_base_wagtail.html block body -->
     {% block body %}
       <!-- begin content -->
@@ -15,6 +16,7 @@
     {% endblock %}
     <!-- site_base_wagtail.html enblock body -->
 {% endblock %}
+{% endcomment %}
 
 {% block scripts %}
 

pinaxcon/templates/symposion/sponsorship/apply.html

@@ -20,7 +20,12 @@
             <input class="btn btn-primary" type="submit" value="Apply" />
             <a class="btn btn-default" href="{% url "dashboard" %}">Cancel</a>
             <p class="help-block">
-                <small>By submitting this sponsor application you are agreeing to the <a href="{% url "pages_page" "sponsor/terms/" %}" target="_blank">terms and conditions</a>.</small>
+                <small>By submitting this sponsor application you are agreeing to the
+ {% comment %}
+                 <a href="{% url "pages_page" "sponsor/terms/" %}" target="_blank">terms and conditions</a>.
+            {% endcomment %}
+            </small>
+
             </p>
         </div>
     </form>

pinaxcon/templates/symposion/sponsorship/list.html

@@ -1,16 +1,19 @@
 {% extends "site_base.html" %}
 
 {% load sponsorship_tags %}
-{% load thumbnail %}
+{% load pyconau2017_tags %}
 {% load i18n %}
 
 {% block head_title %}{% trans "About Our Sponsors" %}{% endblock %}
 
 {% block body_class %}sponsorships{% endblock %}
 
-{% block body_outer %}
+{% block content %}
+    <div class="jumbotron-white" id="sponsors" style="width: 100%;">
     <h1>{% trans "About Our Sponsors" %}</h1>
+    {% comment %}
     <a href="{% url "pages_page" "sponsors/prospectus/" %}" class="btn">Learn how to become a sponsor <span class="arrow"></span></a>
+    {% endcomment %}
 
     {% sponsor_levels as levels %}
     {% for level in levels %}
@@ -18,16 +21,16 @@
             <h3>{{ level.name }}</h3>
 
             {% for sponsor in level.sponsors %}
-                {% if sponsor.website_logo %}
+                {% if sponsor.sponsor_logo %}
                     <div class="row">
                         <div class="col-md-2">
                             <h2>
                                 <a href="{{ sponsor.external_url }}">
-                                    <img src="{% thumbnail sponsor.website_logo '150x80' %}" alt="{{ sponsor.name }}" />
+                                    <img src="{% sponsor_thumbnail sponsor.sponsor_logo %}" alt="{{ sponsor.name }}" class="thumbnail"/>
                                 </a>
                             </h2>
                         </div>
-                        <div class="col-md-10">
+                        <div class="col-md-7">
                             <h5>{{ sponsor.name }}</h5>
                             <p><a href="{{ sponsor.external_url }}">{{ sponsor.external_url }}</a></p>
                             <p>{{ sponsor.listing_text|urlize|linebreaks }}</p>
@@ -37,4 +40,5 @@
             {% endfor %}
         {% endif %}
     {% endfor %}
+    </div> <!-- jumbotron-white -->
 {% endblock %}

pinaxcon/urls.py

@@ -21,10 +21,9 @@ import sys
 urlpatterns = [
     url(r"^admin/", include(admin.site.urls)),
 
-    # Debug toolbar
-
     url(r"^account/", include("account.urls")),
 
+    url(r'^__debug__', include(debug_toolbar.urls)),
     url(r"^dashboard/", symposion.views.dashboard, name="dashboard"),
 
     url(r"^speaker/", include("symposion.speakers.urls")),
@@ -59,9 +58,9 @@ urlpatterns = [
 
 ]
 
-if settings.DEBUG:
+#if settings.DEBUG:
-   import debug_toolbar
+#   import debug_toolbar
-   urlpatterns += [ url(r'^__debug__/', include(debug_toolbar.urls)), ]
+#   urlpatterns += [ url(r'^__debug__/', include(debug_toolbar.urls)), ]
 
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

static/src/pyconau2017/css/app.css

@@ -606,25 +606,25 @@ body {
 .lede {
   margin: 30px 0;
   margin: 1.875rem 0;
-  font-size: 4.2vw;
+  font-size: 2.2vw;
 }
 
 @media (min-width: 25em) {
   .lede {
-    font-size: 3vw;
+    font-size: 1.5vw;
   }
 }
 
 @media (min-width: 64em) {
   .lede {
     font-size: 2vw;
-    margin: 3.375rem 0;
+    margin: 3rem 0;
   }
 }
 
 @media (min-width: 80em) {
   .lede {
-    font-size: 28px;
+    font-size: 14px;
   }
 }