From 2f43a3b9e6689038e77d7d3a2fabc7dac2ba46f4 2017-02-04 22:49:50
From: Nick Seidenman (N6) <n6151h@gmail.com>
Date: 2017-02-04 22:49:50
Subject: [PATCH] Merge branch 'develop'

---

diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index 0637dd2c21590efea5826b0d21e52e779e0949fb..efd4821625a078dbd24a26f8ca5a8b112c8be616 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -268,6 +268,11 @@ LOGGING = {
             'level': 'DEBUG',
             'propagate': True,
         },
+        'symposion.request': {
+            'handlers': ['mail_admins'],
+            'level': 'DEBUG',
+            'propagate': True,
+        },
         'apps': { # I keep all my of apps under 'apps' folder, but you can also add them one by one, and this depends on how your virtualenv/paths are set
             'handlers': ['log_file'],
             'level': 'DEBUG',
@@ -276,7 +281,7 @@ LOGGING = {
     },
     # you can also shortcut 'loggers' and just configure logging for EVERYTHING at once
     'root': {
-        'handlers': ['console', 'mail_admins'],
+        'handlers': ['console', 'log_file'], #'mail_admins'],
         'level': 'DEBUG'
     },
 }
diff --git a/pinaxcon/templates/pyconau2017/content_page.html b/pinaxcon/templates/pyconau2017/content_page.html
index 63226670661e9ce0545dc60bd8debde5e1d76f7b..e3c2d8b82f85298088893c26cf614c4a7d9e302a 100644
--- a/pinaxcon/templates/pyconau2017/content_page.html
+++ b/pinaxcon/templates/pyconau2017/content_page.html
@@ -17,17 +17,6 @@
   {% block heading_panel %}
     <!-- div style="background-image: url('{% block header_background_image %}{% endblock %}');" class="panel--bg"></div -->
 
-    <div class="panel--content">
-    {% comment %}
-      <div class="panel--2-3">
-        {% block header_title %}{% endblock %}
-        <p class="lede">{% block header_paragraph %}{% endblock %}</p>
-      </div>
-      {% block header_inset_image_base %}
-      {% endblock %}
-    {% comment %}
-    </div>
-
 
     {% block topbar_base %}
     {% endblock %}
diff --git a/pinaxcon/templates/symposion/schedule/base.html b/pinaxcon/templates/symposion/schedule/base.html
index d15f1a798ff1ead72e22bb7164beb87a54ff985b..f887b7b32a994de0ab6fabc0259f7d54d8e72da6 100755
--- a/pinaxcon/templates/symposion/schedule/base.html
+++ b/pinaxcon/templates/symposion/schedule/base.html
@@ -14,7 +14,7 @@
     {% endblock %}
 {% endblock %}
 {% block scripts %}
-    <script src="{% static 'lca2017/js/app.js' %}"></script>
+    <script src="{% static 'pyconau2017/js/app.js' %}"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script>
         {% include "_scripts.html" %}
     <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script>
diff --git a/pinaxcon/templates/symposion/schedule/public_base.html b/pinaxcon/templates/symposion/schedule/public_base.html
index b2ae87e2e7b112d505fb2a274cd3c25103bbea7c..6b6bea9119f9e8a4852ba590ccb7041af2d245cb 100644
--- a/pinaxcon/templates/symposion/schedule/public_base.html
+++ b/pinaxcon/templates/symposion/schedule/public_base.html
@@ -1,5 +1,7 @@
-{% extends "lca2017/content_page.html" %}
+{% extends "pyconau2017/content_page.html" %}
 
 {% load staticfiles %}
 
-{% block header_background_image %}{% static "lca2017/images/hobart_bg_optimised.jpg" %}{% endblock %}
+{% comment %}
+{% block header_background_image %}{% static "pyconau2017/images/hobart_bg_optimised.jpg" %}{% endblock %}
+{% endcomment %}
\ No newline at end of file