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

@@ ... / @@ -265,21 +265,26 @@ LOGGING = { @@
     'loggers': {
         'django.request': {
             'handlers': ['mail_admins'],
             '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',
             'propagate': True,
         },
     },
     # 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'
     },
+}
 FIXTURE_DIRS = [
     os.path.join(PROJECT_ROOT, "fixtures"),
+]

pinaxcon/templates/pyconau2017/content_page.html

➞

Show inline comments

@@ ... / @@ -14,23 +14,12 @@ @@
 {% block body %}
   {% 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 %}
   {% endblock %}
   {% block content_base %}

pinaxcon/templates/symposion/schedule/base.html

➞

Show inline comments

@@ ... / @@ -11,13 +11,13 @@ @@
     {% block body %}
       {% block content %}
       {% endblock %}
     {% 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>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
     {% block extra_script %}{% endblock %}
 {% endblock %}

pinaxcon/templates/symposion/schedule/public_base.html

➞

Show inline comments

-{% 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 @@

0 comments (0 inline, 0 general)