symposion_app Changeset - 2f43a3b9e668

Changeset - 2f43a3b9e668

Parent rev.

Child rev.

[Not reviewed]

Merge

0 10 1

Nick Seidenman (N6) - 7 years ago 2017-02-04 22:49:50
n6151h@gmail.com

Merge branch 'develop'

4 files changed with 11 insertions and 15 deletions:

pinaxcon/settings.py

pinaxcon/templates/pyconau2017/content_page.html

pinaxcon/templates/symposion/schedule/base.html

pinaxcon/templates/symposion/schedule/public_base.html

0 comments (0 inline, 0 general)

pinaxcon/settings.py

➞

Show inline comments

@@ ... / @@ -270,2 +270,7 @@ LOGGING = { @@
         },
         '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
@@ ... / @@ -278,3 +283,3 @@ LOGGING = { @@
     'root': {
         'handlers': ['console', 'mail_admins'],
+        'handlers': ['console', 'log_file'], #'mail_admins'],
         'level': 'DEBUG'

pinaxcon/templates/pyconau2017/content_page.html

➞

Show inline comments

@@ ... / @@ -19,13 +19,2 @@ @@
     <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>

pinaxcon/templates/symposion/schedule/base.html

➞

Show inline comments

@@ ... / @@ -16,3 +16,3 @@ @@
 {% 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>

pinaxcon/templates/symposion/schedule/public_base.html

➞

Show inline comments

-{% extends "lca2017/content_page.html" %}
+{% extends "pyconau2017/content_page.html" %}
@@ ... / @@ -4,2 +4,4 @@ @@
 {% 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 @@

0 comments (0 inline, 0 general)