Makes dashboard use takeflight theme instead of pinax theme (#24)
* Starts porting dashboard to the wagtail base page * Dashboard mk 2 * Dashboard mk 3 * Last dashboard work for now
This commit is contained in:
Christopher Neugebauer
Scott Bragg
parent
e3f41b4b31
commit
6814b290eb
4 changed files with 188 additions and 218 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
{% extends "site_base.html" %}
|
{% extends "site_base_wagtail.html" %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% load proposal_tags %}
|
{% load proposal_tags %}
|
||||||
|
|
@ -9,234 +9,202 @@
|
||||||
{% block head_title %}Dashboard{% endblock %}
|
{% block head_title %}Dashboard{% endblock %}
|
||||||
|
|
||||||
{% block extra_style %}
|
{% block extra_style %}
|
||||||
<link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">
|
|
||||||
<!-- Latest compiled and minified CSS -->
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block body_class %}auth{% endblock %}
|
{% block body_class %}auth{% endblock %}
|
||||||
|
|
||||||
{% block body %}
|
{% block body %}
|
||||||
<div class="panel panel-default">
|
|
||||||
<div class="panel-heading">
|
|
||||||
<div class="pull-right">
|
|
||||||
{% if not user.speaker_profile %}
|
|
||||||
<a href="{% url "speaker_create" %}" class="btn btn-xs btn-default">
|
|
||||||
<i class="fa fa-plus-sign"></i> Create a speaker profile
|
|
||||||
</a>
|
|
||||||
{% else %}
|
|
||||||
<a href="{% url "speaker_edit" %}" class="btn btn-xs btn-default">
|
|
||||||
<i class="fa fa-pencil"></i> Edit your speaker profile
|
|
||||||
</a>
|
|
||||||
<a href="{% url "proposal_submit" %}" class="btn btn-xs btn-default">
|
|
||||||
<i class="fa fa-plus-sign"></i> Submit a new proposal
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
<h3 class="panel-title">
|
|
||||||
<i class="fa fa-bullhorn"></i>
|
|
||||||
{% trans "Speaking" %}
|
|
||||||
</h3>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="panel-body">
|
|
||||||
{% if not user.speaker_profile %}
|
<div class="l-content-page">
|
||||||
<p>To submit a proposal, you must first <a href="{% url "speaker_create" %}">create a speaker profile</a>.</p>
|
<div class="l-content-page--richtext">
|
||||||
{% else %}
|
<section id="panel-speaking">
|
||||||
<h4>Your Proposals</h4>
|
<h2>{% trans "Speaking" %}</h2>
|
||||||
{% if not user.speaker_profile.proposals.exists %}
|
|
||||||
<p>No proposals submitted yet.</p>
|
{% if not user.speaker_profile %}
|
||||||
{% endif %}
|
<p>To submit a proposal, you must first create a speaker profile.</p>
|
||||||
{% endif %}
|
{% else %}
|
||||||
</div>
|
<h3>Your Proposals</h3>
|
||||||
{% if user.speaker_profile.proposals.exists %}
|
|
||||||
<table class="table">
|
{% if not user.speaker_profile.proposals.exists %}
|
||||||
|
<p>No proposals submitted yet.</p>
|
||||||
|
{% else %}
|
||||||
|
<p></p>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if user.speaker_profile.proposals.exists %}
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<th>Title</th>
|
||||||
|
<th>Type</th>
|
||||||
|
<th>Status</th>
|
||||||
|
<th>Actions</th>
|
||||||
|
</tr>
|
||||||
|
{% for proposal in user.speaker_profile.proposals.all %}
|
||||||
|
{% include "symposion/proposals/_proposal_row.html" %}
|
||||||
|
{% endfor %}
|
||||||
|
</table>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if user.speaker_profile %}
|
||||||
|
{% associated_proposals as associated_proposals %}
|
||||||
|
{% if associated_proposals %}
|
||||||
|
<h3>Proposals you have joined as an additional speaker</h3>
|
||||||
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Title</th>
|
<th>Title</th>
|
||||||
<th>Session type</th>
|
<th>Type</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
<th>Actions</th>
|
<th>Actions</th>
|
||||||
</tr>
|
</tr>
|
||||||
{% for proposal in user.speaker_profile.proposals.all %}
|
{% for proposal in associated_proposals %}
|
||||||
{% include "symposion/proposals/_proposal_row.html" %}
|
{% include "symposion/proposals/_proposal_row.html" %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% pending_proposals as pending_proposals %}
|
||||||
|
{% if pending_proposals %}
|
||||||
|
<h3>Proposals you have been invited to join</h3>
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<th>Title</th>
|
||||||
|
<th>Type</th>
|
||||||
|
<th>Status</th>
|
||||||
|
<th>Actions</th>
|
||||||
|
</tr>
|
||||||
|
{% for proposal in pending_proposals %}
|
||||||
|
{% include "symposion/proposals/_pending_proposal_row.html" %}
|
||||||
|
{% endfor %}
|
||||||
|
</table>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<p></p>
|
||||||
|
<h3>Actions</h3>
|
||||||
|
<div class="btn-group">
|
||||||
|
{% if not user.speaker_profile %}
|
||||||
|
<a href="{% url "speaker_create" %}" class="btn">
|
||||||
|
<i class="fa fa-plus-sign"></i> Create a speaker profile
|
||||||
|
</a>
|
||||||
|
{% else %}
|
||||||
|
<a href="{% url "speaker_edit" %}" class="btn">
|
||||||
|
<i class="fa fa-pencil"></i> Edit your speaker profile
|
||||||
|
</a>
|
||||||
|
<a href="{% url "proposal_submit" %}" class="btn">
|
||||||
|
<i class="fa fa-plus-sign"></i> Submit a new proposal
|
||||||
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
{% if user.speaker_profile %}
|
<hr /> {# TODO: Can we do better? #}
|
||||||
{% associated_proposals as associated_proposals %}
|
|
||||||
{% if associated_proposals %}
|
|
||||||
<div class="panel-body">
|
|
||||||
<h4>Proposals you have joined as an additional speaker</h4>
|
|
||||||
</div>
|
|
||||||
<table class="table">
|
|
||||||
<tr>
|
|
||||||
<th>Title</th>
|
|
||||||
<th>Session type</th>
|
|
||||||
<th>Status</th>
|
|
||||||
<th>Actions</th>
|
|
||||||
</tr>
|
|
||||||
{% for proposal in associated_proposals %}
|
|
||||||
{% include "symposion/proposals/_proposal_row.html" %}
|
|
||||||
{% endfor %}
|
|
||||||
</table>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% pending_proposals as pending_proposals %}
|
</section>
|
||||||
{% if pending_proposals %}
|
|
||||||
<div class="panel-body"><h4>Proposals you have been invited to join</h4></div>
|
|
||||||
<table class="table">
|
|
||||||
<tr>
|
|
||||||
<th>Title</th>
|
|
||||||
<th>Session type</th>
|
|
||||||
<th>Status</th>
|
|
||||||
<th>Actions</th>
|
|
||||||
</tr>
|
|
||||||
{% for proposal in pending_proposals %}
|
|
||||||
{% include "symposion/proposals/_pending_proposal_row.html" %}
|
|
||||||
{% endfor %}
|
|
||||||
</table>
|
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{# {% include 'registrasion/dashboard-widget.html' %} #}
|
{# {% include 'registrasion/dashboard-widget.html' %} #}
|
||||||
|
|
||||||
<div class="panel panel-default">
|
|
||||||
<div class="panel-heading">
|
|
||||||
<div class="pull-right header-actions">
|
|
||||||
{% if not user.sponsorships.exists %}
|
|
||||||
<a href="{% url "sponsor_apply" %}" class="btn btn-xs btn-default">
|
|
||||||
<i class="fa fa-plus-sign"></i>
|
|
||||||
Apply to be a sponsor
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
<h3 class="panel-title">
|
|
||||||
<i class="fa fa-briefcase"></i>
|
|
||||||
{% trans "Sponsorship" %}
|
|
||||||
</h3>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="panel-body">
|
|
||||||
{% if not user.sponsorships.exists %}
|
|
||||||
<p>If you or your organization would be interested in sponsorship opportunities, <a href="{% url "sponsor_apply" %}">use our online form to apply to be a sponsor</a>.
|
|
||||||
{% else %}
|
|
||||||
<h4>Your Sponsorship</h4>
|
|
||||||
<ul class="list-group">
|
|
||||||
{% for sponsorship in user.sponsorships.all %}
|
|
||||||
<li class="list-group-item">
|
|
||||||
<a href="{% url "sponsor_detail" sponsorship.pk %}"><b>{{ sponsorship.name }}</b></a>
|
|
||||||
({{ sponsorship.level }})
|
|
||||||
{% if not sponsorship.active %}
|
|
||||||
<span class="label label-warning">awaiting approval</span>
|
|
||||||
{% endif %}
|
|
||||||
</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
{% endif %}
|
|
||||||
{% if user.is_staff %}
|
|
||||||
<p>
|
|
||||||
As staff, you can directly <a href="{% url "sponsor_add" %}">add a sponsor</a> if the organization isn't
|
|
||||||
applying themselves.
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% if review_sections %}
|
{% if review_sections %}
|
||||||
<div class="panel panel-default">
|
<h2 class="panel-title">
|
||||||
<div class="panel-heading">
|
<i class="fa fa-briefcase"></i>
|
||||||
<h3 class="panel-title">
|
{% trans "Reviews" %}
|
||||||
<i class="fa fa-briefcase"></i>
|
</h2>
|
||||||
{% trans "Reviews" %}
|
|
||||||
</h3>
|
|
||||||
</div>
|
|
||||||
<div class="panel-body">
|
|
||||||
<h4>Reviews by Section</h4>
|
|
||||||
<ul>
|
|
||||||
{% for section in review_sections %}
|
|
||||||
<h5>{{ section }}</h5>
|
|
||||||
<li><a href="{% url "review_section" section.section.slug %}">All</a></li>
|
|
||||||
<li><a href="{% url "user_reviewed" section.section.slug %}">Reviewed by you</a></li>
|
|
||||||
<li><a href="{% url "user_not_reviewed" section.section.slug %}">Not Reviewed by you</a></li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
{% comment %}
|
<h3>Reviews by Section</h3>
|
||||||
<h4>My Assignments</h4>
|
<ul>
|
||||||
<table class="table">
|
{% for section in review_sections %}
|
||||||
<thead>
|
<h4>{{ section }}</h4>
|
||||||
<td>Proposal Title</td>
|
<li><a href="{% url "review_section" section.section.slug %}">All</a></li>
|
||||||
<td>Score</td>
|
<li><a href="{% url "user_reviewed" section.section.slug %}">Reviewed by you</a></li>
|
||||||
</thead>
|
<li><a href="{% url "user_not_reviewed" section.section.slug %}">Not Reviewed by you</a></li>
|
||||||
<tbody>
|
{% endfor %}
|
||||||
<tr>
|
</ul>
|
||||||
<td>Title Three</td>
|
|
||||||
<td>-1</td>
|
{% comment %}
|
||||||
</tr>
|
<h4>My Assignments</h4>
|
||||||
<tr>
|
<table class="table">
|
||||||
<td>Title Four</td>
|
<thead>
|
||||||
<td>+2</td>
|
<td>Proposal Title</td>
|
||||||
</tr>
|
<td>Score</td>
|
||||||
</tbody>
|
</thead>
|
||||||
</table>
|
<tbody>
|
||||||
{% endcomment %}
|
<tr>
|
||||||
|
<td>Title Three</td>
|
||||||
|
<td>-1</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Title Four</td>
|
||||||
|
<td>+2</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{% endcomment %}
|
||||||
|
|
||||||
|
<hr /> {# TODO: Can we do better? #}
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% available_teams as available_teams %}
|
{% available_teams as available_teams %}
|
||||||
{% if user.memberships.exists or available_teams %}
|
{% if user.memberships.exists or available_teams %}
|
||||||
<div class="panel panel-default">
|
<section id="teams">
|
||||||
<div class="panel-heading">
|
<h2 class="panel-title">
|
||||||
<h3 class="panel-title">
|
<i class="fa fa-group"></i>
|
||||||
<i class="fa fa-group"></i>
|
{% trans "Teams" %}
|
||||||
{% trans "Teams" %}
|
</h2>
|
||||||
</h3>
|
|
||||||
</div>
|
{% if user.memberships.exists %}
|
||||||
|
<div class="panel-body">
|
||||||
|
<h3>Your Teams</h3>
|
||||||
|
</div>
|
||||||
|
<table>
|
||||||
|
{% for membership in user.memberships.all %}
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<a href="{% url "team_detail" membership.team.slug %}">{{ membership.team.name }}</a>
|
||||||
|
{% if membership.team.description %}<br>{{ membership.team.description }}{% endif %}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<span class="label{% if membership.state == 'invited' %} label-info{% endif %}">{{ membership.get_state_display }}</span>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
{% if membership.state == "manager" or user.is_staff %}
|
||||||
|
{% if membership.team.applicants %}{{ membership.team.applicants.count }} applicant{{ membership.team.applicants.count|pluralize }}{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</table>
|
||||||
|
{% endif %}
|
||||||
|
{% if available_teams %}
|
||||||
|
<div class="panel-body">
|
||||||
|
<h4>Available Teams</h4>
|
||||||
|
</div>
|
||||||
|
<table class="table table-striped">
|
||||||
|
{% for team in available_teams %}
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<a href="{% url team_detail team.slug %}">{{ team }}</a>
|
||||||
|
{% if team.description %}<br>{{ team.description }}{% endif %}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<span class="label label-default">{{ team.get_access_display }}</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</table>
|
||||||
|
{% endif %}
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<hr /> {# TODO: Can we do better? #}
|
||||||
|
|
||||||
{% if user.memberships.exists %}
|
|
||||||
<div class="panel-body">
|
|
||||||
<h4>Your Teams</h4>
|
|
||||||
</div>
|
|
||||||
<table class="table table-striped">
|
|
||||||
{% for membership in user.memberships.all %}
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<a href="{% url "team_detail" membership.team.slug %}">{{ membership.team.name }}</a>
|
|
||||||
{% if membership.team.description %}<br>{{ membership.team.description }}{% endif %}
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<span class="label{% if membership.state == 'invited' %} label-info{% endif %}">{{ membership.get_state_display }}</span>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
{% if membership.state == "manager" or user.is_staff %}
|
|
||||||
{% if membership.team.applicants %}{{ membership.team.applicants.count }} applicant{{ membership.team.applicants.count|pluralize }}{% endif %}
|
|
||||||
{% endif %}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</table>
|
|
||||||
{% endif %}
|
|
||||||
{% if available_teams %}
|
|
||||||
<div class="panel-body">
|
|
||||||
<h4>Available Teams</h4>
|
|
||||||
</div>
|
|
||||||
<table class="table table-striped">
|
|
||||||
{% for team in available_teams %}
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<a href="{% url team_detail team.slug %}">{{ team }}</a>
|
|
||||||
{% if team.description %}<br>{{ team.description }}{% endif %}
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<span class="label label-default">{{ team.get_access_display }}</span>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</table>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
||||||
|
|
@ -24,19 +24,13 @@
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
{% if not proposal.cancelled %}
|
{% if not proposal.cancelled %}
|
||||||
<div class="btn-group">
|
<ul>
|
||||||
<a class="btn btn-xs dropdown-toggle" data-toggle="dropdown" href="#">
|
<li><a href="{% url "proposal_pending_join" proposal.id %}">
|
||||||
{% trans 'Choose Response' %}
|
{% trans 'Accept invitation' %}</a></li>
|
||||||
<span class="caret"></span>
|
<li><a href="{% url "proposal_pending_decline" proposal.id
|
||||||
</a>
|
%}">{% trans 'Decline invitation' %}</a></li>
|
||||||
<ul class="dropdown-menu">
|
</ul>
|
||||||
<li><a href="{% url "proposal_pending_join" proposal.id %}">
|
{% endif %}
|
||||||
{% trans 'Accept invitation' %}</a></li>
|
|
||||||
<li><a href="{% url "proposal_pending_decline" proposal.id
|
|
||||||
%}">{% trans 'Decline invitation' %}</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,10 @@
|
||||||
<td>
|
<td>
|
||||||
{% if not proposal.cancelled %}
|
{% if not proposal.cancelled %}
|
||||||
{% if request.user == proposal.speaker.user and proposal.can_edit %}
|
{% if request.user == proposal.speaker.user and proposal.can_edit %}
|
||||||
<a href="{% url "proposal_edit" proposal.pk %}" class="btn btn-xs"><i class="fa fa-pencil"></i> Edit</a>
|
<ul>
|
||||||
<a href="{% url "proposal_speaker_manage" proposal.id %}" class="btn btn-xs"><i class="fa fa-user"></i> Manage Additional Speakers</a>
|
<li><a href="{% url "proposal_edit" proposal.pk %}"><i class="fa fa-pencil"></i> Edit</a></li>
|
||||||
|
<li><a href="{% url "proposal_speaker_manage" proposal.id %}"><i class="fa fa-user"></i> Manage Additional Speakers</a></li>
|
||||||
|
</ul>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
|
|
|
||||||
|
|
@ -779,6 +779,12 @@ table.alt tr:not(:last-of-type) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.btn__compact {
|
||||||
|
padding: 0.625rem 1.25rem;
|
||||||
|
border: 1px solid #3ab1c9;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.btn-group {
|
.btn-group {
|
||||||
display: -ms-flexbox;
|
display: -ms-flexbox;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue