diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html
index 4a81c409..ad9abe75 100644
--- a/pinaxcon/templates/dashboard.html
+++ b/pinaxcon/templates/dashboard.html
@@ -16,11 +16,36 @@
{% block body %}
+{% load staticfiles %}
+{% load wagtailimages_tags %}
+
+
-
- {% trans "Speaking" %}
{% if not user.speaker_profile %}
To submit a proposal, you must first create a speaker profile.
@@ -36,17 +61,9 @@
{% endif %}
{% if user.speaker_profile.proposals.exists %}
-
-
- Title |
- Type |
- Status |
- Actions |
-
{% for proposal in user.speaker_profile.proposals.all %}
{% include "symposion/proposals/_proposal_row.html" %}
{% endfor %}
-
{% endif %}
{% if user.speaker_profile %}
@@ -83,82 +100,60 @@
{% endif %}
{% endif %}
-
- Actions
-
+
+
+{# {% include 'registrasion/dashboard-widget.html' %} #}
+
+{% if review_sections %}
+
+
+
+
+
+
{% trans "Reviews" %}
+
+
+
-
{# TODO: Can we do better? #}
-
-
-
- {# {% include 'registrasion/dashboard-widget.html' %} #}
-
-
- {% if review_sections %}
-
-
- {% trans "Reviews" %}
-
-
-
Reviews by Section
-
- {% for section in review_sections %}
- {{ section }}
+
+
+ {% for section in review_sections %}
+
{{ section }}
+
+
+ {% endfor %}
- {% comment %}
-
My Assignments
-
-
- Proposal Title |
- Score |
-
-
-
- Title Three |
- -1 |
-
-
- Title Four |
- +2 |
-
-
-
- {% endcomment %}
+
-
{# TODO: Can we do better? #}
+
+
+{% endif %}
- {% endif %}
- {% available_teams as available_teams %}
- {% if user.memberships.exists or available_teams %}
-
-
-
- {% trans "Teams" %}
-
+{% available_teams as available_teams %}
+{% if user.memberships.exists or available_teams %}
+
+
+
+
+
{% trans "Teams" %}
+
+
+
+
- {% if user.memberships.exists %}
-
-
Your Teams
-
+
+ {% if user.memberships.exists %}
+
+
+
Your Teams
{% for membership in user.memberships.all %}
@@ -179,9 +174,7 @@
{% endif %}
{% if available_teams %}
-
-
Available Teams
-
+
Available Teams
{% for team in available_teams %}
@@ -196,15 +189,9 @@
{% endfor %}
{% endif %}
-
+
+
-
{# TODO: Can we do better? #}
-
- {% endif %}
-
-
-
-
-
+{% endif %}
{% endblock %}
diff --git a/pinaxcon/templates/symposion/proposals/_proposal_row.html b/pinaxcon/templates/symposion/proposals/_proposal_row.html
index e3f16f98..fad92d9e 100644
--- a/pinaxcon/templates/symposion/proposals/_proposal_row.html
+++ b/pinaxcon/templates/symposion/proposals/_proposal_row.html
@@ -1,11 +1,11 @@
-