Default content page and sponsor list is working, mostly.
TODO: get sponsor logos to show up instead of the names (text).
This commit is contained in:
Nick Seidenman (N6)
parent
aa359400a2
commit
ac7228ec50
14 changed files with 151 additions and 33 deletions
24
cms_pages/migrations/0020_auto_20170217_1220.py
Normal file
24
cms_pages/migrations/0020_auto_20170217_1220.py
Normal file
|
|
@ -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))]))]),
|
||||
),
|
||||
]
|
||||
|
|
@ -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,
|
||||
|
|
@ -254,6 +254,7 @@ class ContentPage(AbstractContentPage):
|
|||
inset_illustration = models.CharField(
|
||||
choices=ILLUSTRATION_TYPES,
|
||||
max_length=256,
|
||||
required=False,
|
||||
)
|
||||
|
||||
content_panels = AbstractContentPage.content_panels + [
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ DATABASES = {
|
|||
#}
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
||||
'NAME': 'pycontest',
|
||||
'USER': 'nicks',
|
||||
'PASSWORD': 'spam&eggs',
|
||||
'HOST': 'localhost',
|
||||
'NAME': 'pycon2017_uat',
|
||||
'USER': 'pycon2017_uat',
|
||||
'PASSWORD': 'Eishuqu5johZee3G',
|
||||
'HOST': '172.16.0.100',
|
||||
'PORT': '',
|
||||
}
|
||||
}
|
||||
|
|
@ -129,6 +129,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',
|
||||
|
|
@ -150,6 +151,7 @@ INSTALLED_APPS = [
|
|||
"django.contrib.sites",
|
||||
"django.contrib.staticfiles",
|
||||
"django.contrib.humanize",
|
||||
"debug_toolbar",
|
||||
|
||||
# theme
|
||||
"bootstrapform",
|
||||
|
|
@ -226,6 +228,25 @@ 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',
|
||||
]
|
||||
|
||||
DEBUG_TOOLBAR_CONFIG = {
|
||||
'INTERCEPT_REDIRECTS': False,
|
||||
'SHOW_TOOLBAR_CALLBACK': lambda x: True,
|
||||
}
|
||||
|
||||
LOGGING = {
|
||||
'version': 1,
|
||||
|
|
|
|||
|
|
@ -19,5 +19,20 @@
|
|||
{% block header_inset_image %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-1">xxx</div>
|
||||
<div class="col-md-10" >
|
||||
<div id="announcements" class="jumbotron-white">
|
||||
{{ page.body }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-1">
|
||||
<div id="sponsors" class="wrapper jumbotron-white">
|
||||
<h4>Sponsors</h4>
|
||||
{% include "symposion/sponsorship/_wall.html" %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
{% block head_title %}{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
THIS IS THE LCA PAGE CONTENT
|
||||
{% block heading_panel %}
|
||||
<div class="panel panel__compact panel__bg">
|
||||
|
||||
|
|
|
|||
|
|
@ -12,25 +12,29 @@
|
|||
|
||||
{% block head_title %}{% endblock %}
|
||||
|
||||
{% comment %}
|
||||
{% block body_base %}
|
||||
{% block body %}
|
||||
|
||||
{% block heading_panel %}
|
||||
<!-- div style="background-image: url('{% block header_background_image %}{% endblock %}');" class="panel--bg"></div -->
|
||||
|
||||
|
||||
{% block topbar_base %}
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content_base %}
|
||||
<div class="l-content-page">
|
||||
|
||||
{% endcomment %}
|
||||
|
||||
{% block content_base %}
|
||||
{% block content %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
||||
{% comment %}
|
||||
the name "extra_script" doesn't actually match the inherited name...
|
||||
{% block extra_script %}
|
||||
<!-- script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script -->
|
||||
{% endblock %}
|
||||
{% endcomment %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,18 @@
|
|||
<!-- site_base.html -->
|
||||
{% load staticfiles %}
|
||||
{% load metron_tags %}
|
||||
{% load i18n %}
|
||||
{% load sitetree %}
|
||||
{# <!-- https://gist.github.com/geedmo/5682742--> #}
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" class="no-js">
|
||||
<html lang="en" class="no-js" manifest="{% static 'pyconau2017/manifest.appcache' %}">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="description" content="">
|
||||
|
||||
<!-- disable browser cache (for now) -->
|
||||
<meta http-equiv="cache-control" content="max-age=0" />
|
||||
<meta http-equiv="cache-control" content="no-cache" />
|
||||
<meta http-equiv="expires" content="0" />
|
||||
<meta http-equiv="expires" content="Tue, 01 Jan 1990 12:00:00 GMT" />
|
||||
|
||||
{% block viewport %}
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
|
||||
<!-- meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" -->
|
||||
{% endblock %}
|
||||
<title>{% block head_title_base %}{% if SITE_NAME %}{{ SITE_NAME }} | {% endif %}{% block head_title %}{% endblock %}{% endblock %}</title>
|
||||
|
||||
|
|
@ -28,7 +23,7 @@
|
|||
<link href="{% static 'pyconau2017/css/pyconau.css' %}" rel="stylesheet">
|
||||
<link href="{% static 'pyconau2017/css/pyconau2016.css' %}" rel="stylesheet">
|
||||
|
||||
<link rel="icon" href="{% static 'pyconau2017/images/favicon.png' %}"
|
||||
<link rel="icon" href="{% static 'pyconau2017/images/favicon.png' %}">
|
||||
|
||||
<!--Meta tags-->
|
||||
<meta name="theme-color" content="#0c486c">
|
||||
|
|
@ -37,7 +32,7 @@
|
|||
<!--Twitter-->
|
||||
<meta name="twitter:card" content="summary">
|
||||
<meta name="twitter:site" content="@pyconau2017">
|
||||
<meta name="twitter:title" content="Pycon AU – 3 - 8 2017 – Melbourne, Victoria"
|
||||
<meta name="twitter:title" content="Pycon AU – 3 - 8 2017 – Melbourne, Victoria">
|
||||
<meta name="twitter:description" content="Discover the future of Open Source at linux.conf.au 2017. Tickets on sale from October.">
|
||||
<meta name="twitter:image" content="{{ request.scheme }}://{{ request.get_host }}{% static 'pyconau2017/images/socmed/twitter-tuz.png' %}">
|
||||
<meta name="twitter:image:alt" content="Tuz">
|
||||
|
|
@ -54,7 +49,7 @@
|
|||
{% endblock %}
|
||||
</head>
|
||||
<body class="{% block body_class %}{% endblock %}"
|
||||
style="background-image: url({% static 'pyconau2017/images/pyconau-2016-collage.jpg' %});">
|
||||
style="background-image: url({% static 'pyconau2017/images/pyconau-2016-collage-faded.jpg' %});">
|
||||
{% block topbar_base %}
|
||||
|
||||
{% block nav %}
|
||||
|
|
@ -65,23 +60,27 @@
|
|||
|
||||
{% endblock %}
|
||||
|
||||
<!-- site_base block body_base -->
|
||||
{% block body_base %}
|
||||
<!--div style="height: 100px;" /-->
|
||||
<!--main role="main"-->
|
||||
<!-- site_base block body -->
|
||||
{% block body %}
|
||||
{% block content %}
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
<!-- site_base endblock body -->
|
||||
<!--/main-->
|
||||
<!--/div-->
|
||||
{% endblock %}
|
||||
<!-- site_base endblock body_base -->
|
||||
|
||||
{% block footer_base %}
|
||||
<!-- https://gist.github.com/geedmo/5682742-->
|
||||
<!-- footer class="l-footer l-footer__alt" -->
|
||||
{% block footer %}
|
||||
{% endblock %}
|
||||
</footer>
|
||||
<!-- /footer -->
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
|
|
@ -99,3 +98,4 @@
|
|||
{% endblock %}
|
||||
</body>
|
||||
</html>
|
||||
<!-- end site_base.html -->
|
||||
|
|
|
|||
|
|
@ -1,18 +1,20 @@
|
|||
<!-- site_base_wagtail.html -->
|
||||
{% extends "site_base.html" %}
|
||||
{% load staticfiles %}
|
||||
{% block extra_style %}{% endblock %}
|
||||
{% comment %}
|
||||
{% block body_base %}
|
||||
{% comment %}
|
||||
{% include "_messages.html" %}
|
||||
{% endcomment %}
|
||||
<!-- site_base_wagtail.html block body -->
|
||||
{% block body %}
|
||||
<!-- begin content -->
|
||||
{% block content %}
|
||||
{% endblock %}
|
||||
|
||||
<!-- end content -->
|
||||
{% endblock %}
|
||||
{% comment %}
|
||||
<!-- site_base_wagtail.html enblock body -->
|
||||
{% endblock %}
|
||||
{% endcomment %}
|
||||
|
||||
{% block scripts %}
|
||||
|
||||
|
|
@ -25,4 +27,5 @@
|
|||
{% block scripts_extra %}
|
||||
{% endblock %}
|
||||
|
||||
<!-- end site_base_wagtail.html -->
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{% load sitetree %}
|
||||
<nav role="navigation" id="LOL" class="l-header--links">
|
||||
<nav id="LOL" class="l-header--links">
|
||||
<ul>
|
||||
{% for item in sitetree_items %}
|
||||
<li class="l-header--nav">
|
||||
<a
|
||||
|
|
@ -19,4 +20,5 @@
|
|||
{% endif %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</nav>
|
||||
|
|
|
|||
|
|
@ -13,11 +13,18 @@ from django.contrib import admin
|
|||
|
||||
import symposion.views
|
||||
|
||||
import debug_toolbar
|
||||
|
||||
|
||||
import sys
|
||||
|
||||
urlpatterns = [
|
||||
#url(r"^$", TemplateView.as_view(template_name="pyconau2017-homepage.html"), name="home"),
|
||||
url(r"^admin/", include(admin.site.urls)),
|
||||
|
||||
# Debug toolbar
|
||||
url(r'^__debug__/', include(debug_toolbar.urls)),
|
||||
|
||||
url(r"^account/", include("account.urls")),
|
||||
|
||||
url(r"^dashboard/", symposion.views.dashboard, name="dashboard"),
|
||||
|
|
@ -51,6 +58,12 @@ urlpatterns = [
|
|||
|
||||
# Demo payment gateway and related features
|
||||
#url(r"^register/pinaxcon/", include("pinaxcon.registrasion.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)
|
||||
|
|
|
|||
|
|
@ -12,6 +12,10 @@ pinax-boxes==2.1.2
|
|||
wagtail==1.6.2
|
||||
pylibmc==1.5.1
|
||||
raven==5.27.0
|
||||
django-debug-toolbar==1.6
|
||||
|
||||
# database
|
||||
psycopg2==2.6.2
|
||||
|
||||
#Wiki
|
||||
wiki==0.1.2
|
||||
|
|
|
|||
14
static/src/manifest.appcache
Normal file
14
static/src/manifest.appcache
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
CACHE MANIFEST
|
||||
# 2017-02-17
|
||||
|
||||
＃ Explicitly cached entries ...
|
||||
CACHE:
|
||||
/favicon.ico
|
||||
|
||||
# Resources that require the user to be on-line
|
||||
NETWORK:
|
||||
|
||||
|
||||
FALLBACK:
|
||||
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ body {
|
|||
}
|
||||
|
||||
.jumbotron-white {
|
||||
background-color: rgba(240,240,240,0.9);
|
||||
background-color: rgba(255,255,255,1.0);
|
||||
color: black;
|
||||
margin-top: 60px;
|
||||
margin-bottom: 60px;
|
||||
|
|
@ -61,6 +61,8 @@ body {
|
|||
/*color: white;*/
|
||||
}
|
||||
|
||||
/* getting nav bar sorted ... (n6) */
|
||||
|
||||
nav {
|
||||
background-color: #000;
|
||||
width: 100%;
|
||||
|
|
@ -74,3 +76,17 @@ nav {
|
|||
font-weight: bold;
|
||||
color: #a6e9f5;
|
||||
}
|
||||
|
||||
.menu-dropdown {
|
||||
background: #4c4c4b;
|
||||
}
|
||||
|
||||
#sponsors {
|
||||
border-radius: 6px;
|
||||
padding: 1em;
|
||||
margin-top: 60px;
|
||||
margin-bottom: 60px;
|
||||
text-align: center;
|
||||
width: 150px; /* this is a hack. need to figure out exactly where (else) it's being set. */
|
||||
}
|
||||
|
||||
|
|
|
|||
BIN
static/src/pyconau2017/images/pyconau-2016-collage-faded.jpg
Normal file
BIN
static/src/pyconau2017/images/pyconau-2016-collage-faded.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 527 KiB |
Loading…
Add table
Reference in a new issue