diff --git a/2017.pycon-au.org.conf b/2017.pycon-au.org.conf
index b2ce7aa1..a0ccb66f 100644
--- a/2017.pycon-au.org.conf
+++ b/2017.pycon-au.org.conf
@@ -34,6 +34,8 @@ WSGIPythonPath /srv/http/uat.2017.pycon-au.org/symposion/website:/srv/http/uat.2
Alias /robots.txt /srv/http/uat.2017.pycon-au.org/symposion/website/robots.txt
Alias /site_media/static/pyconau2017/ /srv/http/uat.2017.pycon-au.org/symposion/website/static/dist/pyconau2017/
+
+ Alias /fonts/ /srv/http/uat.2017.pycon-au.org/symposion/website/static/dist/pyconau2017/css/fonts/
Alias /site_media/static/admin/ /srv/http/uat.2017.pycon-au.org/symposion/lib/python2.7/site-packages/django/contrib/admin/static/admin/
@@ -45,6 +47,14 @@ WSGIPythonPath /srv/http/uat.2017.pycon-au.org/symposion/website:/srv/http/uat.2
# Require all granted
+ Alias /site_media/media/ /srv/http/uat.2017.pycon-au.org/symposion/website/pinaxcon/site_media/media/
+
+
+ Order allow,deny
+ Allow from all
+ # Require all granted
+
+
WSGIDaemonProcess uat2017.pycon-au.org python-path="/srv/http/uat.2017.pycon-au.org/symposion/website:/srv/http/uat.2017.pycon-au.org/symposion/lib/python2.7/site-packages:/srv/http/uat.2017.pycon-au.org/symposion/lib/python2.7" home=/srv/http/uat.2017.pycon-au.org/symposion/website user=nicks group=www-data
WSGIProcessGroup uat2017.pycon-au.org
diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index d82767b0..6ecb1a75 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -243,6 +243,10 @@ 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,
diff --git a/pinaxcon/templates/cms_pages/abstract_content_page.html b/pinaxcon/templates/cms_pages/abstract_content_page.html
index ffe54647..eade8615 100644
--- a/pinaxcon/templates/cms_pages/abstract_content_page.html
+++ b/pinaxcon/templates/cms_pages/abstract_content_page.html
@@ -32,9 +32,9 @@
-
+
{% endblock %}
diff --git a/pinaxcon/templates/symposion/sponsorship/_sponsor_link.html b/pinaxcon/templates/symposion/sponsorship/_sponsor_link.html
index 5c09e910..0b9bcd8d 100644
--- a/pinaxcon/templates/symposion/sponsorship/_sponsor_link.html
+++ b/pinaxcon/templates/symposion/sponsorship/_sponsor_link.html
@@ -1,11 +1,7 @@
-{% load thumbnail %}
+{% load pyconau2017_tags %}
{% spaceless %}
- {% if dimensions %}
-
- {% else %}
-
- {% endif %}
+
{% endspaceless %}
diff --git a/pinaxcon/templates/symposion/sponsorship/_vertical_by_level.html b/pinaxcon/templates/symposion/sponsorship/_vertical_by_level.html
index 78dd052b..c9730e68 100644
--- a/pinaxcon/templates/symposion/sponsorship/_vertical_by_level.html
+++ b/pinaxcon/templates/symposion/sponsorship/_vertical_by_level.html
@@ -6,7 +6,7 @@
{% for level in levels %}
{{ level.name }}
{% for sponsor in level.sponsors %}
-
+
{% endfor %}
diff --git a/pinaxcon/templatetags/pyconau2017_tags.py b/pinaxcon/templatetags/pyconau2017_tags.py
index 2bc42a80..1e8e0d52 100644
--- a/pinaxcon/templatetags/pyconau2017_tags.py
+++ b/pinaxcon/templatetags/pyconau2017_tags.py
@@ -2,6 +2,8 @@ import cms_pages
import hashlib
import urllib
+import os
+
from decimal import Decimal
from django import template
from django.conf import settings
@@ -101,3 +103,12 @@ def trackname(room, day):
except Track.DoesNotExist:
track_name = None
return track_name
+
+@register.simple_tag()
+def sponsor_thumbnail(sponsor_logo):
+ if sponsor_logo is not None:
+ if sponsor_logo.upload:
+ logo_file = os.path.join(settings.MEDIA_URL, str(sponsor_logo.upload))
+ return logo_file
+
+ return ""
\ No newline at end of file
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 61874d80..dbe41927 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -23,7 +23,6 @@ urlpatterns = [
url(r"^admin/", include(admin.site.urls)),
# Debug toolbar
- url(r'^__debug__/', include(debug_toolbar.urls)),
url(r"^account/", include("account.urls")),
@@ -63,7 +62,7 @@ urlpatterns = [
if settings.DEBUG:
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)
diff --git a/static/src/pyconau2017/css/pyconau.css b/static/src/pyconau2017/css/pyconau.css
index e9c38185..642448ef 100644
--- a/static/src/pyconau2017/css/pyconau.css
+++ b/static/src/pyconau2017/css/pyconau.css
@@ -90,3 +90,18 @@ nav {
width: 150px; /* this is a hack. need to figure out exactly where (else) it's being set. */
}
+.thumbnail {
+ width: auto;
+ height: auto;
+ max-width: 100px;
+ max-height: 100px;
+ border: 0;
+
+}
+
+div.sponsor-list {
+ min-width: 100px;
+ display: block;
+ margin: 0 auto;
+}
+