diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index 71eb4c68..b6c4a75f 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -18,7 +18,7 @@ DATABASES = {
'NAME': 'pycon2017_uat',
'USER': 'pycon2017_uat',
'PASSWORD': 'Eishuqu5johZee3G',
- 'HOST': '172.16.0.100',
+ 'HOST': '127.0.0.1',
'PORT': '',
}
}
@@ -247,7 +247,7 @@ DEBUG_TOOLBAR_PANELS = [
DEBUG_TOOLBAR_CONFIG = {
'INTERCEPT_REDIRECTS': False,
- 'SHOW_TOOLBAR_CALLBACK': lambda x: True,
+ 'SHOW_TOOLBAR_CALLBACK': lambda x: DEBUG,
}
LOGGING = {
@@ -280,7 +280,7 @@ LOGGING = {
'log_file':{
'level': 'DEBUG',
'class': 'logging.handlers.RotatingFileHandler',
- 'filename': os.path.join('/srv/http/2017.pycon-au.org', 'log/django.log'),
+ 'filename': os.path.abspath('log/django.log'),
'maxBytes': '16777216', # 16megabytes
'formatter': 'verbose'
},
diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html
index 82e94244..d8932892 100644
--- a/pinaxcon/templates/dashboard.html
+++ b/pinaxcon/templates/dashboard.html
@@ -1,4 +1,4 @@
-{% extends "site_base_wagtail.html" %}
+{% extends "utility_page.html" %}
{% load staticfiles %}
{% load i18n %}
{% load proposal_tags %}
@@ -6,62 +6,58 @@
{% load teams_tags %}
{% load registrasion_tags %}
{% load pyconau2017_tags %}
-
-{% block head_title %}Dashboard{% endblock %}
-
-{% block extra_style %}
-
-{% endblock %}
-
-{% block body_class %}auth{% endblock %}
-
-{% block body %}
-
{% load staticfiles %}
{% load wagtailimages_tags %}
+
+{% block head_title %}Dashboard{% endblock %}
+
+
+{% block content %}
+
+
+
DASHBOARD
{% available_categories as categories %}
{% if categories %}
-
-
-
-
-
{% trans "Attend" %} {% conference_name %}
+
+
+
+
{% trans "Attend" %} {% conference_name %}
-
+
-
-
+
{% if not user.attendee.completed_registration %}
To attend the conference, you must purchase a ticket. Use our registration form to purchase your ticket.
+
{% else %}
-
Your items
+
Your items
{% items_pending as pending %}
{% if pending %}
@@ -107,39 +103,34 @@
You have ${{ credit }} leftover from refunded invoices. This credit will be automatically applied to new invoices. Contact the conference organisers to
for a refund to your original payment source.
{% endif %}
- {% endif %}
-
+ {% endif %}
+
{% endif %}
-
-
-
-
-
-
{% trans "Speaking and Miniconfs" %}
-
-
-
-
-
+
{% if not user.speaker_profile %}
To submit a proposal, you must first create a speaker profile.
@@ -163,7 +154,7 @@
{% if user.speaker_profile %}
{% associated_proposals as associated_proposals %}
{% if associated_proposals %}
-
Proposals you have joined as an additional speaker
+
Proposals you have joined as an additional speaker
Title |
@@ -179,7 +170,7 @@
{% pending_proposals as pending_proposals %}
{% if pending_proposals %}
- Proposals you have been invited to join
+ Proposals you have been invited to join
Title |
@@ -194,59 +185,36 @@
{% endif %}
{% endif %}
-
-
-
{# {% include 'registrasion/dashboard-widget.html' %} #}
{% if review_sections %}
-
-
-
-
-
{% trans "Reviews" %}
-
-
-
+
+
{% trans "Reviews" %}
-
-
- {% for section in review_sections %}
-
{{ section }}
-
- {% endfor %}
-
-
+ {% for section in review_sections %}
+
{{ section }}
+
+ {% endfor %}
-
+
{% endif %}
{% available_teams as available_teams %}
{% if user.memberships.exists or available_teams %}
-
-
-
-
{% trans "Teams" %}
-
-
-
-
+
+
{% trans "Teams" %}
-
- {% if user.memberships.exists %}
-
-
-
Your Teams
+ {% if user.memberships.exists %}
+
Your Teams
{% for membership in user.memberships.all %}
@@ -255,39 +223,40 @@
{% if membership.team.description %}
{{ membership.team.description }}{% endif %}
- {{ membership.get_state_display }}
+ {{ membership.get_state_display }}
|
{% if membership.state == "manager" or user.is_staff %}
{% if membership.team.applicants %}{{ membership.team.applicants.count }} applicant{{ membership.team.applicants.count|pluralize }}{% endif %}
- {% endif %}
+ {% endif %}
|
{% endfor %}
+
{% endif %}
+
+
{% if available_teams %}
-
Available Teams
+
Available Teams
{% for team in available_teams %}
-
-
+ |
{{ team }}
{% if team.description %} {{ team.description }}{% endif %}
- |
-
- {{ team.get_access_display }}
+ |
+ {{ team.get_access_display }}
|
{% endfor %}
-
+
{% endif %}
-
+
-
{% endif %}
+
-{% endblock %}
+{% endblock %}
{% block scripts_extra %}
-{% endblock %}
+{% endblock %}
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 6577e9c0..9598abe3 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -13,7 +13,6 @@ from django.contrib import admin
import symposion.views
-import debug_toolbar
import sys
@@ -23,7 +22,6 @@ urlpatterns = [
url(r"^account/", include("account.urls")),
- url(r'^__debug__', include(debug_toolbar.urls)),
url(r"^dashboard/", symposion.views.dashboard, name="dashboard"),
url(r"^speaker/", include("symposion.speakers.urls")),
@@ -51,16 +49,16 @@ urlpatterns = [
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")),
]
-#if settings.DEBUG:
-# import debug_toolbar
-# urlpatterns += [ url(r'^__debug__/', include(debug_toolbar.urls)), ]
+if settings.DEBUG:
+ import debug_toolbar
+ urlpatterns.insert(0, url(r'^__debug__/', include(debug_toolbar.urls)))
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/static/src/pyconau2017/css/bootstrap.css b/static/src/pyconau2017/css/bootstrap.css
index 03997802..ced7bbd4 100644
--- a/static/src/pyconau2017/css/bootstrap.css
+++ b/static/src/pyconau2017/css/bootstrap.css
@@ -3049,7 +3049,7 @@ fieldset[disabled] .btn {
}
.btn-default {
color: #333;
- background-color: #fff;
+ background-color: #2a2;
border-color: #ccc;
}
.btn-default:hover,
diff --git a/static/src/pyconau2017/css/pyconau.css b/static/src/pyconau2017/css/pyconau.css
index c8d1f552..562b5bb0 100644
--- a/static/src/pyconau2017/css/pyconau.css
+++ b/static/src/pyconau2017/css/pyconau.css
@@ -32,6 +32,8 @@ body {
color: black;
margin-top: 60px;
margin-bottom: 60px;
+ border-radius: 6px;
+ padding: 2em;
}
@font-face {
@@ -89,7 +91,7 @@ nav {
text-align: center;
width: 150px; /* this is a hack. need to figure out exactly where (else) it's being set. */
}
-
+btn
.thumbnail {
width: auto;
height: auto;
@@ -111,4 +113,21 @@ legend {
.pad-buttons {
padding: 200px 0 20px 0;
-}
\ No newline at end of file
+}
+
+.team-table {
+ width: 80%;
+}
+
+.dashboard-panel {
+ border: solid black 1px;
+ border-radius: 6px;
+ background-color: #eee;
+ padding: 20px 20px 20px 20px;
+ margin-top: 20px;
+}
+
+.btn__black {
+ color: black;
+ border-color: black;
+}