Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'prod' of github.com:pyconau2017/website into prod

Browse source 
Conflicts:
	pinaxcon/urls.py
This commit is contained in:
Nick Seidenman (N6) 2017-01-18 14:54:02 +11:00
commit 8cf2714496
3 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fixtures/sites.json
View file

@ -4,7 +4,7 @@
"model": "sites.site",
"fields": {
"domain": "localhost:8000",
"name": "PyCon AU 2017 Dev"
"name": "PyconAU 2017"
}
},
{
@ -12,7 +12,7 @@
"model": "sites.site",
"fields": {
"domain": "conference.pinaxproject.com",
"name": "PyCon AU 2017 Dev"
"name": "PyconAU 2017"
}
}
]

8
pinaxcon/settings.py
View file

@ -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'
},

36
pinaxcon/urls.py
View file

@ -17,38 +17,36 @@ import symposion.views
urlpatterns = [
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")),