diff --git a/cms_pages/migrations/0018_auto_20170116_1050.py b/cms_pages/migrations/0018_auto_20170116_1050.py new file mode 100644 index 00000000..025bb864 --- /dev/null +++ b/cms_pages/migrations/0018_auto_20170116_1050.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-01-15 23:50 +from __future__ import unicode_literals + +import cms_pages.models +from django.db import migrations, models +import wagtail.wagtailcore.blocks +import wagtail.wagtailcore.fields +import wagtail.wagtailimages.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('cms_pages', '0017_auto_20160918_0945_squashed_0018_auto_20160919_0125_squashed_0018_auto_20160919_0134'), + ] + + operations = [ + migrations.AlterField( + model_name='contentpage', + name='inset_illustration', + field=models.CharField(choices=[('antarctica.svg', 'Antarctica'), ('bridge.svg', 'Bridge'), ('casino.svg', 'Casino'), ('cradle.svg', 'Cradle Mountain'), ('devil.svg', 'Tasmanian Devil'), ('falls.svg', 'Waterfall'), ('hobart.svg', 'Hobart'), ('lavender.svg', 'Lavender'), ('logo-mel.png', 'Pycon AU'), ('Python-logo-notext.svg', 'Python'), ('tuz.svg', 'Tuz'), ('wineglass.svg', 'Wineglass')], max_length=256), + ), + migrations.AlterField( + model_name='homepage', + name='body', + field=wagtail.wagtailcore.fields.StreamField([('basic_content', wagtail.wagtailcore.blocks.StructBlock([(b'panel_type', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('blue_left', 'Left-aligned image, blue-filtered image BG'), ('white_right', 'Right-aligned image, white background')])), (b'heading', wagtail.wagtailcore.blocks.CharBlock(required=True)), (b'inset_illustration', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('antarctica.svg', 'Antarctica'), ('bridge.svg', 'Bridge'), ('casino.svg', 'Casino'), ('cradle.svg', 'Cradle Mountain'), ('devil.svg', 'Tasmanian Devil'), ('falls.svg', 'Waterfall'), ('hobart.svg', 'Hobart'), ('lavender.svg', 'Lavender'), ('logo-mel.png', 'Pycon AU'), ('Python-logo-notext.svg', 'Python'), ('tuz.svg', 'Tuz'), ('wineglass.svg', 'Wineglass')])), (b'background_image', wagtail.wagtailimages.blocks.ImageChooserBlock(help_text="This is used as the background image of a blue-left block. It's not used for white-right.", required=False)), (b'body', wagtail.wagtailcore.blocks.RawHTMLBlock(required=True)), (b'link', wagtail.wagtailcore.blocks.StructBlock([(b'page', wagtail.wagtailcore.blocks.PageChooserBlock(help_text='You must specify either this, or the URL.', required=False)), (b'url', wagtail.wagtailcore.blocks.CharBlock(help_text='You must specify either this, or the URL.', required=False)), (b'title', wagtail.wagtailcore.blocks.CharBlock(required=True))])), (b'external_links', wagtail.wagtailcore.blocks.ListBlock(cms_pages.models.ExternalLinksBlock)), (b'compact', wagtail.wagtailcore.blocks.BooleanBlock(help_text="True if this block is to be displayed in 'compact' mode", required=False))])), ('keynotes', wagtail.wagtailcore.blocks.StructBlock([(b'heading', wagtail.wagtailcore.blocks.CharBlock(required=True)), (b'speakers', wagtail.wagtailcore.blocks.ListBlock(cms_pages.models.KeynoteSpeakerBlock))]))]), + ), + ] diff --git a/cms_pages/migrations/0019_auto_20170116_1334.py b/cms_pages/migrations/0019_auto_20170116_1334.py new file mode 100644 index 00000000..590622f8 --- /dev/null +++ b/cms_pages/migrations/0019_auto_20170116_1334.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-01-16 02:34 +from __future__ import unicode_literals + +import cms_pages.models +from django.db import migrations +import wagtail.wagtailcore.blocks +import wagtail.wagtailcore.fields +import wagtail.wagtailimages.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('cms_pages', '0018_auto_20170116_1050'), + ] + + operations = [ + migrations.AlterField( + model_name='homepage', + name='body', + field=wagtail.wagtailcore.fields.StreamField([('basic_content', wagtail.wagtailcore.blocks.StructBlock([(b'panel_type', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('simple', 'Simple panel, no image.'), ('blue_left', 'Left-aligned image, blue-filtered image BG'), ('white_right', 'Right-aligned image, white background')])), (b'heading', wagtail.wagtailcore.blocks.CharBlock(required=True)), (b'inset_illustration', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('antarctica.svg', 'Antarctica'), ('bridge.svg', 'Bridge'), ('casino.svg', 'Casino'), ('cradle.svg', 'Cradle Mountain'), ('devil.svg', 'Tasmanian Devil'), ('falls.svg', 'Waterfall'), ('hobart.svg', 'Hobart'), ('lavender.svg', 'Lavender'), ('logo-mel.png', 'Pycon AU'), ('Python-logo-notext.svg', 'Python'), ('tuz.svg', 'Tuz'), ('wineglass.svg', 'Wineglass')])), (b'background_image', wagtail.wagtailimages.blocks.ImageChooserBlock(help_text="This is used as the background image of a blue-left block. It's not used for white-right.", required=False)), (b'body', wagtail.wagtailcore.blocks.RawHTMLBlock(required=True)), (b'link', wagtail.wagtailcore.blocks.StructBlock([(b'page', wagtail.wagtailcore.blocks.PageChooserBlock(help_text='You must specify either this, or the URL.', required=False)), (b'url', wagtail.wagtailcore.blocks.CharBlock(help_text='You must specify either this, or the URL.', required=False)), (b'title', wagtail.wagtailcore.blocks.CharBlock(required=True))])), (b'external_links', wagtail.wagtailcore.blocks.ListBlock(cms_pages.models.ExternalLinksBlock)), (b'compact', wagtail.wagtailcore.blocks.BooleanBlock(help_text="True if this block is to be displayed in 'compact' mode", required=False))])), ('keynotes', wagtail.wagtailcore.blocks.StructBlock([(b'heading', wagtail.wagtailcore.blocks.CharBlock(required=True)), (b'speakers', wagtail.wagtailcore.blocks.ListBlock(cms_pages.models.KeynoteSpeakerBlock))]))]), + ), + ] diff --git a/cms_pages/models.py b/cms_pages/models.py index 90e71767..ba46acf3 100644 --- a/cms_pages/models.py +++ b/cms_pages/models.py @@ -106,9 +106,11 @@ class BasicContentBlock(blocks.StructBlock): class Meta: template = "cms_pages/home_page_blocks/basic_content.html" + PANEL_SIMPLE = "simple" PANEL_BLUE_LEFT = "blue_left" PANEL_WHITE_RIGHT = "white_right" PANEL_TYPES = ( + (PANEL_SIMPLE, "Simple panel, no image."), (PANEL_BLUE_LEFT, "Left-aligned image, blue-filtered image BG"), (PANEL_WHITE_RIGHT, "Right-aligned image, white background"), ) @@ -127,7 +129,8 @@ class BasicContentBlock(blocks.StructBlock): help_text="This is used as the background image of a " "blue-left block. It's not used for white-right." ) - body = blocks.RichTextBlock(required=True) + #body = blocks.RichTextBlock(required=True) + body = blocks.RawHTMLBlock(required=True) link = BasicContentLink() external_links = blocks.ListBlock(ExternalLinksBlock) compact = blocks.BooleanBlock( diff --git a/pinaxcon/templates/cms_pages/home_page_blocks/basic_content.html b/pinaxcon/templates/cms_pages/home_page_blocks/basic_content.html index 304035b2..502d3113 100644 --- a/pinaxcon/templates/cms_pages/home_page_blocks/basic_content.html +++ b/pinaxcon/templates/cms_pages/home_page_blocks/basic_content.html @@ -9,8 +9,15 @@ {% define "" as compact %} {% endif %} +{% if value.panel_type == "simple" %} -{% if value.panel_type == "blue_left" %} + {% comment %} + {% include "cms_pages/home_page_blocks/basic_content_text_and_links.html" %} + {% endcomment %} + + {{ value.body }} + +{% elif value.panel_type == "blue_left" %}
{% image value.background_image width-2000 as background_image %} diff --git a/pinaxcon/templates/cms_pages/home_page_blocks/basic_content_text_and_links.html b/pinaxcon/templates/cms_pages/home_page_blocks/basic_content_text_and_links.html index 58b689f6..e6848003 100644 --- a/pinaxcon/templates/cms_pages/home_page_blocks/basic_content_text_and_links.html +++ b/pinaxcon/templates/cms_pages/home_page_blocks/basic_content_text_and_links.html @@ -7,8 +7,8 @@ {% endif %}
-

{{ value.heading }}

-

{{ value.body }}

+ +

{% if value.panel_type == "blue_left" %} {{ value.link.title }} diff --git a/pinaxcon/templates/lca2017/content_page.html b/pinaxcon/templates/lca2017/content_page.html index cf3b8fcd..0f3e05b1 100644 --- a/pinaxcon/templates/lca2017/content_page.html +++ b/pinaxcon/templates/lca2017/content_page.html @@ -18,6 +18,7 @@
+

Or is it here?

{% block header_title %}{% endblock %}

diff --git a/pinaxcon/templates/pyconau2017-homepage.html b/pinaxcon/templates/pyconau2017-homepage.html index 03028eb1..3c35e5b5 100644 --- a/pinaxcon/templates/pyconau2017-homepage.html +++ b/pinaxcon/templates/pyconau2017-homepage.html @@ -13,6 +13,9 @@ + + + diff --git a/pinaxcon/templates/pyconau2017/content_page.html b/pinaxcon/templates/pyconau2017/content_page.html index cf3b8fcd..63226670 100644 --- a/pinaxcon/templates/pyconau2017/content_page.html +++ b/pinaxcon/templates/pyconau2017/content_page.html @@ -13,38 +13,35 @@ {% block head_title %}{% endblock %} {% block body %} + {% block heading_panel %} -
+ -
- -
-
-

{% block header_title %}{% endblock %}

-

{% block header_paragraph %}{% endblock %}

-
- {% block header_inset_image_base %} -
-
-
-
-
- {% endblock %} +
+ {% comment %} +
+ {% block header_title %}{% endblock %} +

{% block header_paragraph %}{% endblock %}

- + {% block header_inset_image_base %} + {% endblock %} + {% comment %}
+ + + {% block topbar_base %} + {% endblock %} {% endblock %} {% block content_base %} -
-
+ {% block content %} {% endblock %} -
-
+ {% endblock %} {% endblock %} {% block extra_script %} - + {% endblock %} + diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index 2e6de97a..f0b6b822 100755 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -9,22 +9,30 @@ -{% block viewport %} - -{% endblock %} - {% block head_title_base %}{% if SITE_NAME %}{{ SITE_NAME }} | {% endif %}{% block head_title %}{% endblock %}{% endblock %} -{% block styles %} - - - - - - - {% block extra_style %} - + + + + + + + + {% block viewport %} + {% endblock %} -{% endblock %} + {% block head_title_base %}{% if SITE_NAME %}{{ SITE_NAME }} | {% endif %}{% block head_title %}{% endblock %}{% endblock %} + + {% block styles %} + + + + + + + + {% endblock %} + @@ -34,102 +42,61 @@ - + - {% block extra_head_base %} - {% block extra_head %}{% endblock %} - {% endblock %} - - -{% block topbar_base %} - - {% sitetree_menu from "main" include "trunk" template "sitetree_opener.html" %} - {% endblock %} -{% endblock %} -{% block body_base %} -
-
-
-
-
- {% include "_messages.html" %} -
-
- {% block body %} - {% block content %} + {% block extra_head_base %} + {% block extra_head %}{% endblock %} + {% endblock %} + + + {% block topbar_base %} + + {% block nav %} + {% comment %} + {% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %} + + {% sitetree_menu from "main" include "trunk" template "sitetree_opener.html" %} + {% endcomment %} + {% endblock %} + + {% endblock %} + + {% block body_base %} + + + {% block body %} + {% block content %} + {% endblock %} + {% endblock %} + + + {% endblock %} + + {% block footer_base %} + + + {% block footer %} + {% endblock %} + + {% endblock %} + + {% block scripts %} + {% block extra_script %} {% endblock %} {% endblock %} -
-
- {% block sidebar %} - {% include "_default_sidebar.html" %} - {% endblock %} -
-
-
-
-
-{% endblock %} -{% block footer_base %} - -
- {% block footer %} - - - -

©2016 Pycon Australia 2017. Linux is a registered trademark of Linus Torvalds. Site design by Takeflight. Image credits can be found on our Colophon.

+ {% block extra_body_base %} + {% block analytics %} + {% include "analytics.html" %} + {% endblock %} + {% block extra_body %} + {% endblock %} {% endblock %} -
-{% endblock %} -
- {% block scripts %} - {% comment%} - - {% include "_scripts.html" %} - - {% endcomment %} - {% block extra_script %}{% endblock %} - {% endblock %} -{% block extra_body_base %} -{% block analytics %} - {% include "analytics.html" %} -{% endblock %} - {% block extra_body %}{% endblock %} -{% endblock %} diff --git a/pinaxcon/templates/site_base_wagtail.html b/pinaxcon/templates/site_base_wagtail.html index b97e4987..4499797f 100644 --- a/pinaxcon/templates/site_base_wagtail.html +++ b/pinaxcon/templates/site_base_wagtail.html @@ -1,20 +1,24 @@ {% extends "site_base.html" %} {% load staticfiles %} {% block extra_style %}{% endblock %} +{% comment %} {% block body_base %} -
-
{% include "_messages.html" %} + {% endcomment %} {% block body %} {% block content %} {% endblock %} + {% endblock %} + {% comment %} {% endblock %} +{% endcomment %} {% block scripts %} - + + - + diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 95b94852..2822fa37 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -15,8 +15,8 @@ import symposion.views urlpatterns = [ - # matches homepage until we bring the CMS on-line. - url(r"^$", TemplateView.as_view(template_name="pyconau2017-homepage.html"), name="home"), + #url(r"^$", TemplateView.as_view(template_name="pyconau2017-homepage.html"), name="home"), + url(r"^admin/", include(admin.site.urls)), # url(r"^admin/", include(admin.site.urls)), diff --git a/static/src/lca2017/css/app.css b/static/src/lca2017/css/app.css index 19650250..679ce47b 100644 --- a/static/src/lca2017/css/app.css +++ b/static/src/lca2017/css/app.css @@ -1493,7 +1493,8 @@ table.alt tr:not(:last-of-type) { .l-footer__alt { - background-color: #0c486c; + /* background-color: #0c486c; */ + background-color: transparent; color: white; } diff --git a/static/src/pyconau2017/css/app.css b/static/src/pyconau2017/css/app.css index 19650250..74397faf 100644 --- a/static/src/pyconau2017/css/app.css +++ b/static/src/pyconau2017/css/app.css @@ -1464,6 +1464,7 @@ table.alt tr:not(:last-of-type) { padding: 50px 40px; padding: 3.125rem 40px; width: 100%; + opacity: 0.0; } .l-footer--logos { @@ -1493,7 +1494,8 @@ table.alt tr:not(:last-of-type) { .l-footer__alt { - background-color: #0c486c; + /*background-color: #0c486c; */ + background-color: #420045; color: white; } diff --git a/static/src/pyconau2017/css/pyconau.css b/static/src/pyconau2017/css/pyconau.css index bac8101d..93d2f33b 100644 --- a/static/src/pyconau2017/css/pyconau.css +++ b/static/src/pyconau2017/css/pyconau.css @@ -35,6 +35,7 @@ body { .jumbotron h1 { font-size: 3em; font-family: 'Flux Regular'; + background-color: #000; } #announcements {