Started dashboard design
This commit is contained in:
Tobias Schulmann
Tobias S
parent
1f04ec0cea
commit
5256aeeda3
7 changed files with 383 additions and 321 deletions
2
pinaxcon/templates/_form_btns.html
Normal file
2
pinaxcon/templates/_form_btns.html
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
<input class="btn btn-primary" type="submit" value="Save" />
|
||||
<a class="btn btn-default" href="{% url "dashboard" %}">Cancel</a>
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{% load lca2018_tags %}
|
||||
{% load bootstrap %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% if form.non_field_errors %}
|
||||
<div class="has-errors">
|
||||
|
|
@ -9,7 +10,7 @@
|
|||
{% endif %}
|
||||
|
||||
<blockquote>
|
||||
Fields marked with <strong>*</strong> are required.
|
||||
Fields marked with a<br/>* are required
|
||||
</blockquote>
|
||||
|
||||
{{ form|bootstrap_horizontal }}
|
||||
{% crispy form %}
|
||||
|
|
|
|||
|
|
@ -11,27 +11,28 @@
|
|||
|
||||
{% block header_title %}linux.conf.au 2019{% endblock %}
|
||||
{% block header_lead %}User Dashboard{% endblock %}
|
||||
|
||||
{% block main_class %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% available_categories as categories %}
|
||||
{% if categories %}
|
||||
{% available_categories as categories %}
|
||||
<div class="container">
|
||||
<h1 class="text-primary mb-5">Dashboard</h1>
|
||||
</div>
|
||||
{% if categories %}
|
||||
|
||||
{% if user.is_staff %}
|
||||
<div class="container">
|
||||
<div class="page-header">
|
||||
{% if user.is_staff %}
|
||||
<div class="container">
|
||||
<h2>Administration</h2>
|
||||
</div>
|
||||
<div class="page-row">
|
||||
<div class="col-xs-12">
|
||||
<a class="btn btn-lg btn-info" role="button" href="{% url "reports_list" %}">Reports</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="container">
|
||||
<div class="container">
|
||||
<div class="col-12">
|
||||
<h2>{% trans "Attend" %} {% conference_name %}</h2>
|
||||
</div>
|
||||
|
|
@ -166,53 +167,57 @@
|
|||
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<h2>{% trans "Speaking and Miniconfs" %}</h2>
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
Speaker Profile
|
||||
<h2 class="text-primary mb-5">{% trans "Speaking and Miniconfs" %}</h2>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<p class="card-text">
|
||||
Your speaker profile is independent of your attendee profile and the details you provide here will be used during selection and to populate your speaker bio on the conference website.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6 text-primary d-flex flex-column">
|
||||
<h3 class="text-upper">Speaker Profile</h3>
|
||||
{% if not user.speaker_profile %}
|
||||
<p class="card-text">To create a speaking or miniconf proposal you must first create a speaker profile.</p>
|
||||
<a href="{% url "speaker_create" %}" class="btn btn-primary">Create Profile</a>
|
||||
<p>
|
||||
To create a speaking or miniconf proposal you must first create a speaker
|
||||
profile.
|
||||
</p>
|
||||
{% endif %}
|
||||
<p>
|
||||
Your speaker profile is independent of your attendee profile and the
|
||||
details you provide here will be used during selection and to populate
|
||||
your speaker bio on the conference website.
|
||||
</p>
|
||||
<div class="mt-auto">
|
||||
{% if not user.speaker_profile %}
|
||||
<a href="{% url "speaker_create" %}" class="btn btn-primary btn-lg" role="button">Create Profile</a>
|
||||
{% else %}
|
||||
<a class="btn btn-primary" role="button" href="{% url "speaker_edit" %}">Edit Profile</a>
|
||||
<a href="{% url "speaker_edit" %}" class="btn btn-primary btn-lg" role="button">Edit Profile</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
{% if user.speaker_profile %}
|
||||
<div class="col-xs-12 col-sm-6 col-lg-6">
|
||||
<div class="panel panel-primary">
|
||||
<div class="panel-heading">
|
||||
<h5>New Proposal</h5>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="col-md-6 text-primary d-flex flex-column">
|
||||
<h3 class="text-upper">New Proposal</h3>
|
||||
<p>You may use the following form to create a speaking or miniconf proposal.</p>
|
||||
<p>Once submitted you will be able to see the status of your proposals, as well manage the submission and co-speakers from this page</p>
|
||||
<a class="btn btn-lg btn-primary pull-right" role="button" href="{% url "proposal_submit" %}">New Proposal</a>
|
||||
</div>
|
||||
<div class="mt-auto">
|
||||
<a class="btn btn-lg btn-primary" role="button" href="{% url "proposal_submit" %}">New Proposal</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
{% if user.speaker_profile %}
|
||||
{% if user.speaker_profile.proposals.exists %}
|
||||
<div class="container">
|
||||
{% if user.speaker_profile %}
|
||||
{% if user.speaker_profile.proposals.exists %}
|
||||
<div class="container">
|
||||
<div class="page-header">
|
||||
<h2>Your Proposals</h2>
|
||||
</div>
|
||||
|
|
@ -223,16 +228,16 @@
|
|||
{% endfor %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
|
||||
{% if user.speaker_profile %}
|
||||
{% associated_proposals as associated_proposals %}
|
||||
{% pending_proposals as pending_proposals %}
|
||||
{% if associated_proposals or pending_proposals %}
|
||||
<div class="container">
|
||||
{% if user.speaker_profile %}
|
||||
{% associated_proposals as associated_proposals %}
|
||||
{% pending_proposals as pending_proposals %}
|
||||
{% if associated_proposals or pending_proposals %}
|
||||
<div class="container">
|
||||
<div class="page-header">
|
||||
<h2>Copresenter Proposals</h2>
|
||||
</div>
|
||||
|
|
@ -244,30 +249,26 @@
|
|||
{% include "symposion/proposals/_pending_proposal_row.html" %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if review_sections %}
|
||||
<div class="container">
|
||||
<div class="page-header">
|
||||
<h2>{% trans "Reviews" %}</h2>
|
||||
</div>
|
||||
<div class="page-row">
|
||||
<div class="bg-primary text-secondary mt-5 pb-5">
|
||||
<div class="container">
|
||||
|
||||
{% if review_sections %}
|
||||
<div class="row">
|
||||
<h2 class="col-12 my-5">{% trans "Reviews" %}</h2>
|
||||
{% for section in review_sections %}
|
||||
<div class="col-xs-12 col-sm-6 col-lg-6">
|
||||
<div class="panel panel-primary">
|
||||
<div class="panel-heading">
|
||||
<h5>{{ section }}</h5>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<ul>
|
||||
<div class="col-md-6">
|
||||
<h3>{{ section }}</h3>
|
||||
<ul class="list-unstyled">
|
||||
<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>
|
||||
</ul>
|
||||
{% if section in manage_sections %}
|
||||
<ul>
|
||||
<ul class="list-unstyled">
|
||||
<li><a href="{% url "review_bulk_update" section.section.slug %}">Bulk Update</a></li>
|
||||
<li><a href="{% url "result_notification" section.section.slug "accepted" %}">Send notifications</a></li>
|
||||
<li><a href="{% url "review_status" section.section.slug %}">Voting Status</a></li>
|
||||
|
|
@ -275,21 +276,19 @@
|
|||
</ul>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% available_teams as available_teams %}
|
||||
{% if user.memberships.exists or available_teams %}
|
||||
<div class="container">
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% available_teams as available_teams %}
|
||||
{% if user.memberships.exists or available_teams %}
|
||||
<div class="container">
|
||||
<div class="page-header">
|
||||
<h2>{% trans "Teams" %}</h2>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
</div>
|
||||
<div class="container">
|
||||
<div class="page-row">
|
||||
{% if user.memberships.exists %}
|
||||
<div class="page-header">
|
||||
|
|
@ -316,8 +315,8 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
</div>
|
||||
<div class="container">
|
||||
<div class="page-row">
|
||||
{% if available_teams %}
|
||||
<div class="page-header">
|
||||
|
|
@ -341,13 +340,13 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% endblock %} <!-- block content -->
|
||||
|
||||
{% block scripts_extra %}
|
||||
<script type="text/javascript">
|
||||
<script type="text/javascript">
|
||||
var _toggleVoidInvoices = function() {
|
||||
var visible = false;
|
||||
function toggleVoidInvoices() {
|
||||
|
|
@ -369,5 +368,5 @@
|
|||
}
|
||||
var toggleVoidInvoices = _toggleVoidInvoices();
|
||||
_toggleVoidInvoices = undefined;
|
||||
</script>
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
{% endif %}
|
||||
|
||||
|
||||
|
||||
<h1 class="text-primary text-upper h2 mb-5">{% block page_title %}{% endblock %}</h1>
|
||||
|
||||
{% block body_base %}
|
||||
{% block body %}
|
||||
|
|
|
|||
|
|
@ -10,10 +10,7 @@
|
|||
{% csrf_token %}
|
||||
<fieldset>
|
||||
{% include "_form_snippet.html" with form=speaker_form %}
|
||||
<div class="btn-group">
|
||||
<input class="btn btn-primary" type="submit" value="Save" />
|
||||
<a class="btn btn-default" href="{% url "dashboard" %}">Cancel</a>
|
||||
</div>
|
||||
{% include "_form_btns.html" %}
|
||||
</fieldset>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -10,10 +10,7 @@
|
|||
{% csrf_token %}
|
||||
<fieldset>
|
||||
{% include "_form_snippet.html" with form=speaker_form %}
|
||||
<div class="btn-group">
|
||||
<input class="btn btn-primary" type="submit" value="Save" />
|
||||
<a class="btn btn-default" href="{% url "dashboard" %}">Cancel</a>
|
||||
</div>
|
||||
{% include "_form_btns.html" %}
|
||||
</fieldset>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -41,6 +41,10 @@ body {
|
|||
}
|
||||
}
|
||||
|
||||
.text-upper {
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.navbar-collapse {
|
||||
margin-left: $padding-left-default;
|
||||
}
|
||||
|
|
@ -184,3 +188,65 @@ main.container-fluid {
|
|||
height: 480px;
|
||||
filter: grayscale(100%);
|
||||
}
|
||||
|
||||
.btn-lg {
|
||||
padding: 0.8rem 4.5rem;
|
||||
font-size: 1rem;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.btn {
|
||||
padding: 0.4rem 2.25rem;
|
||||
font-size: 1rem;
|
||||
border-radius: 0;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.jumbotron {
|
||||
border-radius: 0;
|
||||
background-color: rgba(204, 213, 197, 0.1);
|
||||
border: 1px $primary solid;
|
||||
color: $primary;
|
||||
padding: 5rem 6rem ;
|
||||
}
|
||||
|
||||
.col-form-label, .form-check-label {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.form-text.text-muted {
|
||||
color: $primary !important;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
fieldset {
|
||||
blockquote {
|
||||
font-size: 80%;
|
||||
}
|
||||
}
|
||||
|
||||
.form-control {
|
||||
border-radius: 0;
|
||||
border: 2px $primary solid;
|
||||
|
||||
&:focus {
|
||||
border: 2px $primary solid;
|
||||
}
|
||||
}
|
||||
|
||||
label.form-check-label {
|
||||
display: flex;
|
||||
align-items: center
|
||||
}
|
||||
|
||||
h3 {
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
|
||||
main {
|
||||
a {
|
||||
color: #f5843e;
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue