diff --git a/.gitignore b/.gitignore index d22a5f62..23cbe9fd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,11 @@ node_modules/ _build/ .DS_Store dev.db +*.pg .coverage pinaxcon/site_media/ local_settings.py log + +\.#* +*#*# diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 7b5bb7ce..71eb4c68 100644 --- a/pinaxcon/settings.py +++ b/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 = { diff --git a/pinaxcon/templates/cms_pages/abstract_content_page.html b/pinaxcon/templates/cms_pages/abstract_content_page.html index eade8615..4e8f616e 100644 --- a/pinaxcon/templates/cms_pages/abstract_content_page.html +++ b/pinaxcon/templates/cms_pages/abstract_content_page.html @@ -19,22 +19,12 @@ {% block header_inset_image %}{% endblock %} {% block content %} -
-
-
xxx
-
-
-

{{ page.title }}

-

{{ page.intro }}

- {{ page.body }} -
-
-
-
-

Sponsors

- {% include "symposion/sponsorship/_vertical_by_level.html" %} -
-
+
+

{{ page.title }}

+

{{ page.intro }}

+ {{ page.body }}
-
+ {% block content_base %} + {% endblock %} {% endblock %} + diff --git a/pinaxcon/templates/cms_pages/news_index_page.html b/pinaxcon/templates/cms_pages/news_index_page.html index b1b0f61b..b3742809 100644 --- a/pinaxcon/templates/cms_pages/news_index_page.html +++ b/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 %} -
+
+ {% comment %}
{% image item.portrait_image width-640 as portrait_image %}
+ {% endcomment %}

{{ item.title }}

{{ item.date|date:"j F Y" }} – {{ item.intro }}

@@ -36,7 +38,7 @@
{% endif %} -
+

Subscribe

View as RSS

diff --git a/pinaxcon/templates/cms_pages/news_page.html b/pinaxcon/templates/cms_pages/news_page.html index 0d95b02c..d65124fc 100644 --- a/pinaxcon/templates/cms_pages/news_page.html +++ b/pinaxcon/templates/cms_pages/news_page.html @@ -15,6 +15,9 @@ {% endif %} {% block content %} +
+

{{ page.date|date:"j F Y" }}

{{ page.body }} +
{% endblock %} diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html index 4a6b85f2..82e94244 100644 --- a/pinaxcon/templates/dashboard.html +++ b/pinaxcon/templates/dashboard.html @@ -23,7 +23,7 @@ {% available_categories as categories %} {% if categories %}
-
+

{% trans "Attend" %} {% conference_name %}

@@ -115,7 +115,7 @@
-
+

{% trans "Speaking and Miniconfs" %}

@@ -204,7 +204,7 @@ {% if review_sections %}
-
+

{% trans "Reviews" %}

@@ -232,8 +232,8 @@ {% available_teams as available_teams %} {% if user.memberships.exists or available_teams %} -
-
+

{% trans "Teams" %}

diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index ff2d72a0..c826803b 100755 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -5,7 +5,7 @@ {% load sitetree %} {# #} - + @@ -21,7 +21,7 @@ - + @@ -66,8 +66,21 @@ {% block body %} - {% block content %} - {% endblock %} +
+
+
+
+ {% block content %} + {% endblock %} +
+
+
+

Sponsors

+ {% include "symposion/sponsorship/_vertical_by_level.html" %} +
+
+
+
{% endblock %} diff --git a/pinaxcon/templates/site_base_wagtail.html b/pinaxcon/templates/site_base_wagtail.html index d5aec5f8..4d6ad640 100644 --- a/pinaxcon/templates/site_base_wagtail.html +++ b/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 %} + {% block body %} @@ -15,6 +16,7 @@ {% endblock %} {% endblock %} +{% endcomment %} {% block scripts %} diff --git a/pinaxcon/templates/symposion/sponsorship/apply.html b/pinaxcon/templates/symposion/sponsorship/apply.html index f717fb9c..6a1a186d 100644 --- a/pinaxcon/templates/symposion/sponsorship/apply.html +++ b/pinaxcon/templates/symposion/sponsorship/apply.html @@ -20,7 +20,12 @@ Cancel

- By submitting this sponsor application you are agreeing to the terms and conditions. + By submitting this sponsor application you are agreeing to the + {% comment %} + terms and conditions. + {% endcomment %} + +

diff --git a/pinaxcon/templates/symposion/sponsorship/list.html b/pinaxcon/templates/symposion/sponsorship/list.html index 9d23ae92..cb5d1c5a 100644 --- a/pinaxcon/templates/symposion/sponsorship/list.html +++ b/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 %} +

{% trans "About Our Sponsors" %}

+ {% comment %} Learn how to become a sponsor + {% endcomment %} {% sponsor_levels as levels %} {% for level in levels %} @@ -18,16 +21,16 @@

{{ level.name }}

{% for sponsor in level.sponsors %} - {% if sponsor.website_logo %} + {% if sponsor.sponsor_logo %}

- {{ sponsor.name }} + {{ sponsor.name }}

-
+
{{ sponsor.name }}

{{ sponsor.external_url }}

{{ sponsor.listing_text|urlize|linebreaks }}

@@ -37,4 +40,5 @@ {% endfor %} {% endif %} {% endfor %} +
{% endblock %} diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 82dea90c..6577e9c0 100644 --- a/pinaxcon/urls.py +++ b/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: - import debug_toolbar - urlpatterns += [ url(r'^__debug__/', include(debug_toolbar.urls)), ] +#if settings.DEBUG: +# import debug_toolbar +# 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/app.css b/static/src/pyconau2017/css/app.css index 13639978..60cff120 100644 --- a/static/src/pyconau2017/css/app.css +++ b/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; } }