diff --git a/fixtures/conference.json b/fixtures/conference.json index 3d6246be..2ce8ce28 100644 --- a/fixtures/conference.json +++ b/fixtures/conference.json @@ -6,7 +6,7 @@ "timezone": "US/Eastern", "start_date": "2040-01-01", "end_date": "2040-01-04", - "title": "PinaxCon" + "title": "PyconAU 2017" } }, { diff --git a/fixtures/sites.json b/fixtures/sites.json index 5d2c044b..3b8a2195 100644 --- a/fixtures/sites.json +++ b/fixtures/sites.json @@ -4,7 +4,7 @@ "model": "sites.site", "fields": { "domain": "localhost:8000", - "name": "PinaxCon" + "name": "PyconAU 2017" } }, { @@ -12,7 +12,7 @@ "model": "sites.site", "fields": { "domain": "conference.pinaxproject.com", - "name": "PinaxCon" + "name": "PyconAU 2017" } } ] diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 9c8e2c09..0637dd2c 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -66,11 +66,13 @@ MEDIA_URL = "/site_media/media/" # Don"t put anything in this directory yourself; store your static files # in apps" "static/" subdirectories and in STATICFILES_DIRS. # Example: "/home/media/media.lawrence.com/static/" -STATIC_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "static") +#STATIC_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "static") +STATIC_ROOT = os.path.join(PROJECT_ROOT, "static", "dist") # URL prefix for static files. # Example: "http://media.lawrence.com/static/" -STATIC_URL = "/site_media/static/" +#STATIC_URL = "/site_media/static/" +STATIC_URL = "/static/dist/" # Additional locations of static files STATICFILES_DIRS = [ @@ -249,7 +251,7 @@ LOGGING = { 'log_file':{ 'level': 'DEBUG', 'class': 'logging.handlers.RotatingFileHandler', - 'filename': os.path.join('/srv/http/uat.2017.pycon-au.org', 'log/django.log'), + 'filename': os.path.join('/srv/http/2017.pycon-au.org', 'log/django.log'), 'maxBytes': '16777216', # 16megabytes 'formatter': 'verbose' }, diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 2822fa37..0aba897b 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -18,38 +18,38 @@ urlpatterns = [ #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)), + url(r"^admin/", include(admin.site.urls)), - # url(r"^account/", include("account.urls")), + url(r"^account/", include("account.urls")), - # url(r"^dashboard/", symposion.views.dashboard, name="dashboard"), + url(r"^dashboard/", symposion.views.dashboard, name="dashboard"), - # url(r"^speaker/", include("symposion.speakers.urls")), - # url(r"^proposals/", include("symposion.proposals.urls")), - ## url(r"^sponsors/", include("symposion.sponsorship.urls")), - # url(r"^reviews/", include("symposion.reviews.urls")), - # url(r"^schedule/", include("symposion.schedule.urls")), + url(r"^speaker/", include("symposion.speakers.urls")), + url(r"^proposals/", include("symposion.proposals.urls")), + url(r"^sponsors/", include("symposion.sponsorship.urls")), + url(r"^reviews/", include("symposion.reviews.urls")), + url(r"^schedule/", include("symposion.schedule.urls")), - # url(r"^teams/", include("symposion.teams.urls")), + url(r"^teams/", include("symposion.teams.urls")), - # url(r"^boxes/", include("pinax.boxes.urls")), + url(r"^boxes/", include("pinax.boxes.urls")), - # url(r'^cms/', include(wagtailadmin_urls)), + url(r'^cms/', include(wagtailadmin_urls)), # Required by registrasion - # url(r'^tickets/payments/', include('registripe.urls')), - # url(r'^tickets/', include('registrasion.urls')), - # url(r'^nested_admin/', include('nested_admin.urls')), + url(r'^tickets/payments/', include('registripe.urls')), + url(r'^tickets/', include('registrasion.urls')), + url(r'^nested_admin/', include('nested_admin.urls')), # Wiki - # url(r'^notifications/', get_nyt_pattern()), - # url(r'^wiki/', get_wiki_pattern()), + url(r'^notifications/', get_nyt_pattern()), + url(r'^wiki/', get_wiki_pattern()), # Default catch-all for wagtail pages. - # url(r'^', include(wagtail_urls)), + url(r'^', include(wagtail_urls)), # Matches *NOTHING* -- remove once site_tree is fixed - # url(r"^$", TemplateView.as_view(template_name="homepage.html"), name="home"), + #url(r"^$", TemplateView.as_view(template_name="homepage.html"), name="home"), # Demo payment gateway and related features # url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")), diff --git a/static/src/pyconau2017/special-events-2017.pdf b/static/src/pyconau2017/special-events-2017.pdf new file mode 100644 index 00000000..ac890d68 Binary files /dev/null and b/static/src/pyconau2017/special-events-2017.pdf differ