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

Makes dashboard use takeflight theme instead of pinax theme (#24)

Browse source 
* 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 2016-06-27 13:26:26 +10:00 committed by Scott Bragg
parent e3f41b4b31
commit 6814b290eb
4 changed files with 188 additions and 218 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

160
pinaxcon/templates/dashboard.html
View file

@ -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,50 +9,37 @@
{% 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">
<div class="l-content-page">
<div class="l-content-page--richtext">
<section id="panel-speaking">
<h2>{% trans "Speaking" %}</h2>
{% if not user.speaker_profile %} {% if not user.speaker_profile %}
<p>To submit a proposal, you must first <a href="{% url "speaker_create" %}">create a speaker profile</a>.</p> <p>To submit a proposal, you must first create a speaker profile.</p>
{% else %} {% else %}
<h4>Your Proposals</h4> <h3>Your Proposals</h3>
{% if not user.speaker_profile.proposals.exists %} {% if not user.speaker_profile.proposals.exists %}
<p>No proposals submitted yet.</p> <p>No proposals submitted yet.</p>
{% else %}
<p></p>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div>
{% if user.speaker_profile.proposals.exists %} {% if user.speaker_profile.proposals.exists %}
<table class="table"> <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>
@ -65,13 +52,11 @@
{% if user.speaker_profile %} {% if user.speaker_profile %}
{% associated_proposals as associated_proposals %} {% associated_proposals as associated_proposals %}
{% if associated_proposals %} {% if associated_proposals %}
<div class="panel-body"> <h3>Proposals you have joined as an additional speaker</h3>
<h4>Proposals you have joined as an additional speaker</h4> <table>
</div>
<table class="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>
@ -83,11 +68,11 @@
{% pending_proposals as pending_proposals %} {% pending_proposals as pending_proposals %}
{% if pending_proposals %} {% if pending_proposals %}
<div class="panel-body"><h4>Proposals you have been invited to join</h4></div> <h3>Proposals you have been invited to join</h3>
<table class="table"> <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>
@ -97,65 +82,41 @@
</table> </table>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div>
{# {% include 'registrasion/dashboard-widget.html' %} #} <p></p>
<h3>Actions</h3>
<div class="panel panel-default"> <div class="btn-group">
<div class="panel-heading"> {% if not user.speaker_profile %}
<div class="pull-right header-actions"> <a href="{% url "speaker_create" %}" class="btn">
{% if not user.sponsorships.exists %} <i class="fa fa-plus-sign"></i> Create a speaker profile
<a href="{% url "sponsor_apply" %}" class="btn btn-xs btn-default"> </a>
<i class="fa fa-plus-sign"></i> {% else %}
Apply to be a sponsor <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> </a>
{% endif %} {% endif %}
</div> </div>
<h3 class="panel-title">
<i class="fa fa-briefcase"></i>
{% trans "Sponsorship" %}
</h3>
</div>
<div class="panel-body"> <hr /> {# TODO: Can we do better? #}
{% 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>. </section>
{% else %}
<h4>Your Sponsorship</h4> {# {% include 'registrasion/dashboard-widget.html' %} #}
<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">
<h3 class="panel-title">
<i class="fa fa-briefcase"></i> <i class="fa fa-briefcase"></i>
{% trans "Reviews" %} {% trans "Reviews" %}
</h3> </h2>
</div>
<div class="panel-body"> <h3>Reviews by Section</h3>
<h4>Reviews by Section</h4>
<ul> <ul>
{% for section in review_sections %} {% for section in review_sections %}
<h5>{{ section }}</h5> <h4>{{ section }}</h4>
<li><a href="{% url "review_section" section.section.slug %}">All</a></li> <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_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> <li><a href="{% url "user_not_reviewed" section.section.slug %}">Not Reviewed by you</a></li>
@ -182,25 +143,23 @@
</table> </table>
{% endcomment %} {% endcomment %}
</div> <hr /> {# TODO: Can we do better? #}
</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" %}
</h3> </h2>
</div>
{% if user.memberships.exists %} {% if user.memberships.exists %}
<div class="panel-body"> <div class="panel-body">
<h4>Your Teams</h4> <h3>Your Teams</h3>
</div> </div>
<table class="table table-striped"> <table>
{% for membership in user.memberships.all %} {% for membership in user.memberships.all %}
<tr> <tr>
<td> <td>
@ -237,6 +196,15 @@
{% endfor %} {% endfor %}
</table> </table>
{% endif %} {% endif %}
</div> </section>
<hr /> {# TODO: Can we do better? #}
{% endif %} {% endif %}
</div>
</div>
{% endblock %} {% endblock %}

12
pinaxcon/templates/symposion/proposals/_pending_proposal_row.html
View file

@ -25,18 +25,12 @@
<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="#">
{% trans 'Choose Response' %}
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a href="{% url "proposal_pending_join" proposal.id %}"> <li><a href="{% url "proposal_pending_join" proposal.id %}">
{% trans 'Accept invitation' %}</a></li> {% trans 'Accept invitation' %}</a></li>
<li><a href="{% url "proposal_pending_decline" proposal.id <li><a href="{% url "proposal_pending_decline" proposal.id
%}">{% trans 'Decline invitation' %}</a></li> %}">{% trans 'Decline invitation' %}</a></li>
</ul> </ul>
</div>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

6
pinaxcon/templates/symposion/proposals/_proposal_row.html
View file

@ -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>

6
static/src/lca2017/css/app.css
View file

@ -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;