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

Better styling for dashboard now working.

Browse source
This commit is contained in:
Nick Seidenman 2017-03-02 21:06:28 +11:00 committed by Sachi King
parent 17c9b191d9
commit 01c5292653
5 changed files with 102 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pinaxcon/settings.py
View file

@ -18,7 +18,7 @@ DATABASES = {
'NAME': 'pycon2017_uat', 'NAME': 'pycon2017_uat',
'USER': 'pycon2017_uat', 'USER': 'pycon2017_uat',
'PASSWORD': 'Eishuqu5johZee3G', 'PASSWORD': 'Eishuqu5johZee3G',
'HOST': '172.16.0.100', 'HOST': '127.0.0.1',
'PORT': '', 'PORT': '',
} }
} }
@ -247,7 +247,7 @@ DEBUG_TOOLBAR_PANELS = [
DEBUG_TOOLBAR_CONFIG = { DEBUG_TOOLBAR_CONFIG = {
'INTERCEPT_REDIRECTS': False, 'INTERCEPT_REDIRECTS': False,
'SHOW_TOOLBAR_CALLBACK': lambda x: True, 'SHOW_TOOLBAR_CALLBACK': lambda x: DEBUG,
} }
LOGGING = { LOGGING = {
@ -280,7 +280,7 @@ LOGGING = {
'log_file':{ 'log_file':{
'level': 'DEBUG', 'level': 'DEBUG',
'class': 'logging.handlers.RotatingFileHandler', '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 'maxBytes': '16777216', # 16megabytes
'formatter': 'verbose' 'formatter': 'verbose'
}, },

177
pinaxcon/templates/dashboard.html
View file

@ -1,4 +1,4 @@
{% extends "site_base_wagtail.html" %} {% extends "utility_page.html" %}
{% load staticfiles %} {% load staticfiles %}
{% load i18n %} {% load i18n %}
{% load proposal_tags %} {% load proposal_tags %}
@ -6,62 +6,58 @@
{% load teams_tags %} {% load teams_tags %}
{% load registrasion_tags %} {% load registrasion_tags %}
{% load pyconau2017_tags %} {% load pyconau2017_tags %}
{% block head_title %}Dashboard{% endblock %}
{% block extra_style %}
{% endblock %}
{% block body_class %}auth{% endblock %}
{% block body %}
{% load staticfiles %} {% load staticfiles %}
{% load wagtailimages_tags %} {% load wagtailimages_tags %}
{% block head_title %}Dashboard{% endblock %}
{% block content %}
<div class="jumbotron-white">
<h1>DASHBOARD</h1>
{% available_categories as categories %} {% available_categories as categories %}
{% if categories %} {% if categories %}
<div class="panel panel__compact panel__bg panel__last"> <!--div class="panel panel__compact panel__bg panel__last" -->
<!-- div style="background-image: url('{% static "pyconau2017/images/wp_bg_optimised.jpg" %}');" class="panel--bg"></div --> <div class="dashbpard-panel">
<div class="panel--content"> <div>
<div > <h3>{% trans "Attend" %} {% conference_name %}</h3>
<h2>{% trans "Attend" %} {% conference_name %}</h2>
<div class="vertical-bigger"></div> <div class="vertical-bigger"></div>
<div class="btn-group"> <div class="btn-group">
{% if not user.attendee.completed_registration %} {% if not user.attendee.completed_registration %}
<a href="{% url "guided_registration" %}" class="btn btn__white"> <a href="{% url "guided_registration" %}" class="btn btn__neut">
Get your ticket Get your ticket
</a> </a>
{% else %} {% else %}
<a href="{% url "attendee_edit" %}" class="btn btn__white"> <a href="{% url "attendee_edit" %}" class="btn btn__neut">
Edit attendee profile Edit attendee profile
</a> </a>
{% items_pending as pending %} {% items_pending as pending %}
{% if pending %} {% if pending %}
<a href="{% url "checkout" %}" class="btn btn__white"> <a href="{% url "checkout" %}" class="btn btn__neut">
Check out and pay Check out and pay
</a> </a>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if user.is_staff %} {% if user.is_staff %}
<a class="btn btn__white" href="{% url "reports_list" %}">Reports</a> <a class="btn btn__neut" href="{% url "reports_list" %}">Reports</a>
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>
</div> <!--/div-->
<div class="l-content-page"> <div class="dashboard-panel">
<div class="l-content-page--richtext">
{% if not user.attendee.completed_registration %} {% if not user.attendee.completed_registration %}
<p>To attend the conference, you must purchase a ticket. <a href="{% url "guided_registration" %}">Use our registration form to purchase your ticket</a>. <p>To attend the conference, you must purchase a ticket. <a href="{% url "guided_registration" %}">Use our registration form to purchase your ticket</a>.
</p>
{% else %} {% else %}
<h3>Your items</h3> <h3 class="small">Your items</h3>
{% items_pending as pending %} {% items_pending as pending %}
{% if pending %} {% if pending %}
@ -107,39 +103,34 @@
<p>You have ${{ credit }} leftover from refunded invoices. This credit will be automatically applied to new invoices. Contact the conference organisers to <p>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.</p> for a refund to your original payment source.</p>
{% endif %} {% endif %}
{% endif %}
<p></p> <p></p>
</div> {% endif %}
</div> </div>
{% endif %} {% endif %}
<div class="dashboard-panel">
<div class="panel panel__compact panel__bg panel__last"> <div class="panel--2-3">
<!-- div style="background-image: url('{% static "pyconau2017/images/hobart_bg_optimised.jpg" %}');" class="panel--bg"></div--> <h3>{% trans "Speaking and Miniconfs" %}</h3>
<div class="panel--content"> <br />
<div class="panel--2-3"> <div class="btn-group">
<h2>{% trans "Speaking and Miniconfs" %}</h2> {% if not user.speaker_profile %}
<br /> <a href="{% url "speaker_create" %}" class="btn btn__neut">
<div class="btn-group"> Create profile
{% if not user.speaker_profile %} </a>
<a href="{% url "speaker_create" %}" class="btn btn__white"> {% else %}
Create profile <a href="{% url "speaker_edit" %}" class="btn btn__neut">
</a> Edit profile
{% else %} </a>
<a href="{% url "speaker_edit" %}" class="btn btn__white"> <a href="{% url "proposal_submit" %}" class="btn btn__neut">
Edit profile New proposal
</a> </a>
<a href="{% url "proposal_submit" %}" class="btn btn__white"> {% endif %}
New proposal </div>
</a>
{% endif %}
</div> </div>
</div>
</div> </div>
</div>
<div class="l-content-page"> <div class="dashboard-panel">
<div class="l-content-page--richtext">
{% if not user.speaker_profile %} {% if not user.speaker_profile %}
<p>To submit a proposal, you must first create a speaker profile.</p> <p>To submit a proposal, you must first create a speaker profile.</p>
@ -163,7 +154,7 @@
{% if user.speaker_profile %} {% if user.speaker_profile %}
{% associated_proposals as associated_proposals %} {% associated_proposals as associated_proposals %}
{% if associated_proposals %} {% if associated_proposals %}
<h3>Proposals you have joined as an additional speaker</h3> <h3 class="small">Proposals you have joined as an additional speaker</h3>
<table> <table>
<tr> <tr>
<th>Title</th> <th>Title</th>
@ -179,7 +170,7 @@
{% pending_proposals as pending_proposals %} {% pending_proposals as pending_proposals %}
{% if pending_proposals %} {% if pending_proposals %}
<h3>Proposals you have been invited to join</h3> <h3 class="small">Proposals you have been invited to join</h3>
<table> <table>
<tr> <tr>
<th>Title</th> <th>Title</th>
@ -194,59 +185,36 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
<br />
</div>
</div> </div>
{# {% include 'registrasion/dashboard-widget.html' %} #} {# {% include 'registrasion/dashboard-widget.html' %} #}
{% if review_sections %} {% if review_sections %}
<div class="panel panel__compact panel__bg panel__last"> <div class="dashboard-panel">
<!-- div style="background-image: url('{% static "pyconau2017/images/conference_bg_optimised.jpg" %}');" class="panel--bg"></div--> <h3>{% trans "Reviews" %}</h3>
<div class="panel--content">
<div class="panel--2-3">
<h2>{% trans "Reviews" %}</h2>
</div>
</div>
</div>
<div class="l-content-page"> {% for section in review_sections %}
<div class="l-content-page--richtext"> <h3 class="small">{{ section }}</h3>
{% for section in review_sections %} <ul>
<h3>{{ section }}</h3> <li><a href="{% url "review_section" section.section.slug %}">All</a></li>
<ul> <li><a href="{% url "user_reviewed" section.section.slug %}">Reviewed by you</a></li>
<li><a href="{% url "review_section" section.section.slug %}">All</a></li> <li><a href="{% url "user_not_reviewed" section.section.slug %}">Not Reviewed by you</a></li>
<li><a href="{% url "user_reviewed" section.section.slug %}">Reviewed by you</a></li> </ul>
<li><a href="{% url "user_not_reviewed" section.section.slug %}">Not Reviewed by you</a></li> {% endfor %}
</ul>
{% endfor %}
<br />
</div> </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__compact panel__bg"> <div class="dashboard-panel">
<div style="background-image: url('{% static "pyconau2017/images/hobart_bg_optimised.jpg" %}');" class="panel--bg"></div--> <h3>{% trans "Teams" %}</h3>
<div class="panel--content">
<div class="panel--2-3">
<h2>{% trans "Teams" %}</h2>
<br />
</div>
</div>
</div>
{% if user.memberships.exists %}
{% if user.memberships.exists %} <h3 class="small">Your Teams</h3>
<div class="l-content-page">
<div class="l-content-page--richtext">
<h3>Your Teams</h3>
<table> <table>
{% for membership in user.memberships.all %} {% for membership in user.memberships.all %}
<tr> <tr>
@ -255,39 +223,40 @@
{% if membership.team.description %}<br>{{ membership.team.description }}{% endif %} {% if membership.team.description %}<br>{{ membership.team.description }}{% endif %}
</td> </td>
<td> <td>
<span class="label{% if membership.state == 'invited' %} label-info{% endif %}">{{ membership.get_state_display }}</span> <span class="{% if membership.state == 'invited' %} label-info{% endif %}">{{ membership.get_state_display }}</span>
</td> </td>
<td> <td>
{% if membership.state == "manager" or user.is_staff %} {% if membership.state == "manager" or user.is_staff %}
{% if membership.team.applicants %}{{ membership.team.applicants.count }} applicant{{ membership.team.applicants.count|pluralize }}{% endif %} {% if membership.team.applicants %}{{ membership.team.applicants.count }} applicant{{ membership.team.applicants.count|pluralize }}{% endif %}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
{% endif %} {% endif %}
{% if available_teams %} {% if available_teams %}
<h3>Available Teams</h3> <h3 class="small">Available Teams</h3>
<table class="table table-striped"> <table class="table table-striped">
{% for team in available_teams %} {% for team in available_teams %}
<tr> <tr> <td>
<td>
<a href="{% url "team_detail" team.slug %}">{{ team }}</a> <a href="{% url "team_detail" team.slug %}">{{ team }}</a>
{% if team.description %}<br>{{ team.description }}{% endif %} {% if team.description %}<br>{{ team.description }}{% endif %}
</td> </td> <td>
<td> <span class="label label-default">{{ team.get_access_display }}</span>
<span class="label label-default">{{ team.get_access_display }}</span>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
{% endif %} {% endif %}
</div>
</div> </div>
{% endif %} {% endif %}
</div>
{% endblock %} {% endblock %} <!-- block content -->
{% block scripts_extra %} {% block scripts_extra %}
<script type="text/javascript"> <script type="text/javascript">
@ -313,4 +282,4 @@
var toggleVoidInvoices = _toggleVoidInvoices(); var toggleVoidInvoices = _toggleVoidInvoices();
_toggleVoidInvoices() = undefined; _toggleVoidInvoices() = undefined;
</script> </script>
{% endblock %} {% endblock %} <!-- scripts_extra -->

10
pinaxcon/urls.py
View file

@ -13,7 +13,6 @@ from django.contrib import admin
import symposion.views import symposion.views
import debug_toolbar
import sys import sys
@ -23,7 +22,6 @@ urlpatterns = [
url(r"^account/", include("account.urls")), url(r"^account/", include("account.urls")),
url(r'^__debug__', include(debug_toolbar.urls)),
url(r"^dashboard/", symposion.views.dashboard, name="dashboard"), url(r"^dashboard/", symposion.views.dashboard, name="dashboard"),
url(r"^speaker/", include("symposion.speakers.urls")), url(r"^speaker/", include("symposion.speakers.urls")),
@ -51,16 +49,16 @@ urlpatterns = [
url(r'^', include(wagtail_urls)), url(r'^', include(wagtail_urls)),
# Matches *NOTHING* -- remove once site_tree is fixed # 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 # Demo payment gateway and related features
#url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")), #url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")),
] ]
#if settings.DEBUG: if settings.DEBUG:
# import debug_toolbar import debug_toolbar
# urlpatterns += [ url(r'^__debug__/', include(debug_toolbar.urls)), ] urlpatterns.insert(0, url(r'^__debug__/', include(debug_toolbar.urls)))
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

2
static/src/pyconau2017/css/bootstrap.css vendored
View file

@ -3049,7 +3049,7 @@ fieldset[disabled] .btn {
} }
.btn-default { .btn-default {
color: #333; color: #333;
background-color: #fff; background-color: #2a2;
border-color: #ccc; border-color: #ccc;
} }
.btn-default:hover, .btn-default:hover,

23
static/src/pyconau2017/css/pyconau.css
View file

@ -32,6 +32,8 @@ body {
color: black; color: black;
margin-top: 60px; margin-top: 60px;
margin-bottom: 60px; margin-bottom: 60px;
border-radius: 6px;
padding: 2em;
} }
@font-face { @font-face {
@ -89,7 +91,7 @@ nav {
text-align: center; text-align: center;
width: 150px; /* this is a hack. need to figure out exactly where (else) it's being set. */ width: 150px; /* this is a hack. need to figure out exactly where (else) it's being set. */
} }
btn
.thumbnail { .thumbnail {
width: auto; width: auto;
height: auto; height: auto;
@ -111,4 +113,21 @@ legend {
.pad-buttons { .pad-buttons {
padding: 200px 0 20px 0; padding: 200px 0 20px 0;
} }
.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;
}