diff --git a/.gitignore b/.gitignore index 6d002ed0..d22a5f62 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ dev.db .coverage pinaxcon/site_media/ local_settings.py +log diff --git a/2017.pycon-au.org.conf b/2017.pycon-au.org.conf index 89f51e39..3d645889 100644 --- a/2017.pycon-au.org.conf +++ b/2017.pycon-au.org.conf @@ -5,13 +5,44 @@ WSGIPythonPath /srv/http/2017.pycon-au.org/symposion/website:/srv/http/2017.pyco ServerName 2017.pycon-au.org ServerAlias 2017.pycon-au.org + # We need this bit of confignation when we generate site certs at sslforfree.com. + # So please don't get rid of it, and don't uncomment it unless you know wtf you're doing. + #Alias /.well-known/acme-challenge/ /srv/http/2017.pycon-au.org/.well-known/acme-challenge/ + # + # Order allow,deny + # Allow from all + # + + Redirect permanent "/" "https:/uat2017.pycon-au.org/" + + ErrorLog /srv/http/2017.pycon-au.org/log/error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel debug + + CustomLog /srv/http/2017.pycon-au.org/log/access.log combined + ServerSignature On + + + + ServerAdmin webmaster@pycon-au.org + ServerName uat2017.pycon-au.org + ServerAlias uat2017.pycon-au.org + Alias /favicon.ico /srv/http/2017.pycon-au.org/symposion/website/static/dist/pyconau2017/images/favicon.ico + Alias /robots.txt /srv/http/2017.pycon-au.org/symposion/website/robots.txt + Alias /site_media/static/pyconau2017/ /srv/http/2017.pycon-au.org/symposion/website/static/dist/pyconau2017/ + + Alias /fonts/ /srv/http/2017.pycon-au.org/symposion/website/static/dist/pyconau2017/css/fonts/ Alias /site_media/static/admin/ /srv/http/2017.pycon-au.org/symposion/lib/python2.7/site-packages/django/contrib/admin/static/admin/ Alias /site_media/static/wagtailadmin/ /srv/http/2017.pycon-au.org/symposion/lib/python2.7/site-packages/wagtail/wagtailadmin/static/wagtailadmin/ + Alias /site_media/static/wagtailadmin/ /srv/http/2017.pycon-au.org/symposion/lib/python2.7/site-packages/wagtail/wagtailadmin/static/wagtailadmin/ + Order allow,deny Allow from all @@ -21,6 +52,14 @@ WSGIPythonPath /srv/http/2017.pycon-au.org/symposion/website:/srv/http/2017.pyco WSGIDaemonProcess 2017.pycon-au.org python-path="/srv/http/2017.pycon-au.org/symposion/website:/srv/http/2017.pycon-au.org/symposion/lib/python2.7/site-packages:/srv/http/2017.pycon-au.org/symposion/lib/python2.7" home=/srv/http/2017.pycon-au.org/symposion/website user=nicks group=www-data WSGIProcessGroup 2017.pycon-au.org + Alias /site_media/media/ /srv/http/2017.pycon-au.org/symposion/website/pinaxcon/site_media/media/ + + + Order allow,deny + Allow from all + # Require all granted + + Order allow,deny Allow from all @@ -29,13 +68,18 @@ WSGIPythonPath /srv/http/2017.pycon-au.org/symposion/website:/srv/http/2017.pyco WSGIScriptAlias / /srv/http/2017.pycon-au.org/symposion/website/pinaxcon/wsgi.py - ErrorLog /srv/http/2017.pycon-au.org/log/error.log + ErrorLog /srv/http/2017.pycon-au.org/log/ssl-error.log # Possible values include: debug, info, notice, warn, error, crit, # alert, emerg. LogLevel debug - CustomLog /srv/http/2017.pycon-au.org/log/access.log combined + CustomLog /srv/http/2017.pycon-au.org/log/ssl-access.log combined ServerSignature On + + SSLEngine on + SSLCertificateFile /srv/http/uat.2017.pycon-au.org/server.crt + SSLCertificateKeyFile /srv/http/uat.2017.pycon-au.org/server.key + SSLCertificateChainFile /srv/http/uat.2017.pycon-au.org/CAbundle.pem diff --git a/cms_pages/migrations/0020_auto_20170217_1220.py b/cms_pages/migrations/0020_auto_20170217_1220.py new file mode 100644 index 00000000..f79598cf --- /dev/null +++ b/cms_pages/migrations/0020_auto_20170217_1220.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-02-17 01:20 +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', '0019_auto_20170116_1334'), + ] + + 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')], required=False)), (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/0021_auto_20170217_1857.py b/cms_pages/migrations/0021_auto_20170217_1857.py new file mode 100644 index 00000000..ae8a0fcc --- /dev/null +++ b/cms_pages/migrations/0021_auto_20170217_1857.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-02-17 07:57 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cms_pages', '0020_auto_20170217_1220'), + ] + + operations = [ + migrations.AlterField( + model_name='contentpage', + name='intro', + field=models.CharField(blank=True, max_length=250), + ), + migrations.AlterField( + model_name='newsindexpage', + name='intro', + field=models.CharField(blank=True, max_length=250), + ), + migrations.AlterField( + model_name='newspage', + name='intro', + field=models.CharField(blank=True, max_length=250), + ), + ] diff --git a/cms_pages/models.py b/cms_pages/models.py index ba46acf3..0bded2b6 100644 --- a/cms_pages/models.py +++ b/cms_pages/models.py @@ -122,7 +122,7 @@ class BasicContentBlock(blocks.StructBlock): heading = blocks.CharBlock(required=True) inset_illustration = blocks.ChoiceBlock( choices=ILLUSTRATION_TYPES, - required=True, + required=False, ) background_image = imageblocks.ImageChooserBlock( required=False, @@ -217,7 +217,7 @@ class AbstractContentPage(Page): class Meta: abstract = True - intro = models.CharField(max_length=250) + intro = models.CharField(max_length=250, blank=True) body = StreamField([ ("rich_text", blocks.RichTextBlock(required=False)), diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index efd48216..7b5bb7ce 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -9,9 +9,17 @@ BASE_DIR = PACKAGE_ROOT DEBUG = False #bool(int(os.environ.get("DEBUG", "1"))) DATABASES = { - "default": { - "ENGINE": "django.db.backends.sqlite3", - "NAME": os.path.join(PROJECT_ROOT, "dev.db"), + #"default": { + # "ENGINE": "django.db.backends.sqlite3", + # "NAME": os.path.join(PROJECT_ROOT, "dev.db"), + #} + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'pycon2017_uat', + 'USER': 'pycon2017_uat', + 'PASSWORD': 'Eishuqu5johZee3G', + 'HOST': '172.16.0.100', + 'PORT': '', } } @@ -123,6 +131,7 @@ MIDDLEWARE_CLASSES = [ "django.contrib.auth.middleware.AuthenticationMiddleware", "django.contrib.auth.middleware.SessionAuthenticationMiddleware", "django.contrib.messages.middleware.MessageMiddleware", + "debug_toolbar.middleware.DebugToolbarMiddleware", "reversion.middleware.RevisionMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", 'wagtail.wagtailcore.middleware.SiteMiddleware', @@ -144,6 +153,7 @@ INSTALLED_APPS = [ "django.contrib.sites", "django.contrib.staticfiles", "django.contrib.humanize", + "debug_toolbar", # theme "bootstrapform", @@ -220,6 +230,29 @@ INSTALLED_APPS = [ "django_nose", ] +DEBUG_TOOLBAR_PANELS = [ + 'debug_toolbar.panels.versions.VersionsPanel', + 'debug_toolbar.panels.timer.TimerPanel', + 'debug_toolbar.panels.settings.SettingsPanel', + 'debug_toolbar.panels.headers.HeadersPanel', + 'debug_toolbar.panels.request.RequestPanel', + 'debug_toolbar.panels.sql.SQLPanel', + 'debug_toolbar.panels.staticfiles.StaticFilesPanel', + 'debug_toolbar.panels.templates.TemplatesPanel', + 'debug_toolbar.panels.cache.CachePanel', + 'debug_toolbar.panels.signals.SignalsPanel', + 'debug_toolbar.panels.logging.LoggingPanel', + '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, +} LOGGING = { 'version': 1, diff --git a/pinaxcon/templates/cms_pages/abstract_content_page.html b/pinaxcon/templates/cms_pages/abstract_content_page.html index 42efc011..eade8615 100644 --- a/pinaxcon/templates/cms_pages/abstract_content_page.html +++ b/pinaxcon/templates/cms_pages/abstract_content_page.html @@ -19,5 +19,22 @@ {% block header_inset_image %}{% endblock %} {% block content %} - {{ page.body }} +
+
+
xxx
+
+
+

{{ page.title }}

+

{{ page.intro }}

+ {{ page.body }} +
+
+
+
+

Sponsors

+ {% include "symposion/sponsorship/_vertical_by_level.html" %} +
+
+
+
{% endblock %} diff --git a/pinaxcon/templates/lca2017/content_page.html b/pinaxcon/templates/lca2017/content_page.html index 0f3e05b1..3b2542e8 100644 --- a/pinaxcon/templates/lca2017/content_page.html +++ b/pinaxcon/templates/lca2017/content_page.html @@ -13,6 +13,7 @@ {% block head_title %}{% endblock %} {% block body %} + THIS IS THE LCA PAGE CONTENT {% block heading_panel %}
diff --git a/pinaxcon/templates/pyconau2017/content_page.html b/pinaxcon/templates/pyconau2017/content_page.html index e3c2d8b8..0abc1355 100644 --- a/pinaxcon/templates/pyconau2017/content_page.html +++ b/pinaxcon/templates/pyconau2017/content_page.html @@ -12,25 +12,29 @@ {% block head_title %}{% endblock %} +{% comment %} +{% block body_base %} {% block body %} {% block heading_panel %} - - {% block topbar_base %} {% endblock %} {% endblock %} {% block content_base %} - - {% block content %} - {% endblock %} - - {% endblock %} + +{% endcomment %} + +{% block content_base %} +{% block content %} +{% endblock %} {% endblock %} +{% comment %} +the name "extra_script" doesn't actually match the inherited name... {% block extra_script %} - + {% endblock %} +{% endcomment %} diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index 0b614ed0..ff2d72a0 100755 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -1,23 +1,18 @@ + {% load staticfiles %} {% load metron_tags %} {% load i18n %} {% load sitetree %} {# #} - + - - - - - - {% block viewport %} - + {% endblock %} {% block head_title_base %}{% if SITE_NAME %}{{ SITE_NAME }} | {% endif %}{% block head_title %}{% endblock %}{% endblock %} @@ -26,8 +21,9 @@ + - @@ -36,8 +32,8 @@ - + + @@ -53,36 +49,38 @@ {% endblock %} + style="background-image: url({% static 'pyconau2017/images/pyconau-2016-collage-faded.jpg' %});"> {% 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 %} @@ -100,3 +98,4 @@ {% endblock %} + diff --git a/pinaxcon/templates/site_base_wagtail.html b/pinaxcon/templates/site_base_wagtail.html index 4499797f..d5aec5f8 100644 --- a/pinaxcon/templates/site_base_wagtail.html +++ b/pinaxcon/templates/site_base_wagtail.html @@ -1,18 +1,20 @@ + {% extends "site_base.html" %} {% load staticfiles %} {% block extra_style %}{% endblock %} -{% comment %} {% block body_base %} + {% comment %} {% include "_messages.html" %} {% endcomment %} + {% block body %} + {% block content %} {% endblock %} - + {% endblock %} - {% comment %} + {% endblock %} -{% endcomment %} {% block scripts %} @@ -25,4 +27,5 @@ {% block scripts_extra %} {% endblock %} + {% endblock %} diff --git a/pinaxcon/templates/sitetree_header.html b/pinaxcon/templates/sitetree_header.html index 1c9f5661..7d89cdd2 100644 --- a/pinaxcon/templates/sitetree_header.html +++ b/pinaxcon/templates/sitetree_header.html @@ -1,5 +1,6 @@ {% load sitetree %} -