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

Basic styling for review section

Browse source
This commit is contained in:
Tobias Schulmann 2018-06-30 15:28:03 +12:00 committed by Tobias S
parent 27ae211e39
commit 6e63465fea
5 changed files with 225 additions and 229 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pinaxcon/templates/flatpages/homepage.html
View file

@ -12,7 +12,7 @@ integrity="sha512-/Nsx9X4HebavoBvEBuyp3I7od5tA0UzAxs+j83KgC8PU0kgB4XiK4Lfe4y4cgB
crossorigin=""></script> crossorigin=""></script>
{% endblock %} {% endblock %}
{% block body %} {% block body_out %}
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<img src="{% static 'assets/Header_placeholder.jpg' %}" id="hero"> <img src="{% static 'assets/Header_placeholder.jpg' %}" id="hero">

4
pinaxcon/templates/site_base.html
View file

@ -57,10 +57,10 @@
<h1 class="text-primary text-upper h2 mb-5">{% block page_title %}{% endblock %}</h1> <h1 class="text-primary text-upper h2 mb-5">{% block page_title %}{% endblock %}</h1>
{% block body_base %} {% block body_base %}
{% block body %} {% block body_out %}
<div class="row"> <div class="row">
<div class="col-md-1"> <div class="col-md-12">
{% block body_outer %} {% block body_outer %}
{% endblock %} {% endblock %}
</div> </div>

2
pinaxcon/templates/symposion/reviews/_review_table.html
View file

@ -1,6 +1,6 @@
{% load i18n %} {% load i18n %}
<table class="table table-striped table-bordered table-reviews"> <table class="table table-striped table-reviews">
<thead> <thead>
<th>#</th> <th>#</th>
<th>{% trans "Speaker / Title" %}</th> <th>{% trans "Speaker / Title" %}</th>

35
pinaxcon/templates/symposion/reviews/base.html
View file

@ -6,17 +6,13 @@
{% block body_class %}reviews{% endblock %} {% block body_class %}reviews{% endblock %}
{% block body_outer %} {% block body_outer %}
<div class="l-content-page"> <div class="row text-primary">
<div class="l-content-page--richtext"> <div class="col-md-4">
<div class="rich-text">
<div class="row">
<div class="col-md-2">
{% block sidebar %} {% block sidebar %}
{% for section in review_sections %} {% for section in review_sections %}
<div class="panel panel-default"> <div class="card card-default mb-4">
<div class="panel-heading"> <div class="card-header">
<h3 class="panel-title">{{ section }}</h3> <h3 class="card-title">{{ section }}</h3>
</div> </div>
<div class="list-group"> <div class="list-group">
<a class="list-group-item review-list" href="{% url "review_section" section.section.slug %}"> <a class="list-group-item review-list" href="{% url "review_section" section.section.slug %}">
@ -45,29 +41,32 @@
<a class="list-group-item review-results" href="{% url "result_notification" section.section.slug 'accepted' %}">Result Notification</a> <a class="list-group-item review-results" href="{% url "result_notification" section.section.slug 'accepted' %}">Result Notification</a>
{% endif %} {% endif %}
</div> </div>
</div>
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}
</div> </div>
<div class="col-md-10">
<div class="col-md-8">
{% block body %} {% block body %}
{% endblock %} {% endblock %}
</div> </div>
</div> </div>
</div></div></div>
{% endblock %} {% endblock %}
{% block extra_script %} {% block extra_script %}
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jszip-2.5.0/dt-1.10.16/b-1.4.2/b-colvis-1.4.2/b-flash-1.4.2/b-html5-1.4.2/b-print-1.4.2/cr-1.4.1/fc-3.2.3/fh-3.1.3/r-2.2.0/rg-1.0.2/datatables.min.css"/> <link rel="stylesheet" type="text/css" href="//cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css"/>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/v/bs/jszip-2.5.0/dt-1.10.16/b-1.4.2/b-colvis-1.4.2/b-html5-1.4.2/b-print-1.4.2/cr-1.4.1/fc-3.2.3/fh-3.1.3/r-2.2.0/rg-1.0.2/datatables.min.js"></script> <script type="text/javascript" src="https://cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/1.10.19/js/dataTables.bootstrap4.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$("table.table-reviews").dataTable({ $("table.table-reviews").dataTable({
"dom": "<'row'<'col-md-3'l><'col-md-3'B><'col-md-4'f>r>t<'row'<'col-md-3'i><'col-md-5'p>>",
"stateSave": true, "stateSave": true,
"lengthMenu": [[10, 50, 100, -1], [10, 50, 100, "All"]], "lengthMenu": [[10, 50, 100, -1], [10, 50, 100, "All"]],
"pageLength": 100, "pageLength": 100,
"colReorder": true, "colReorder": true,
"buttons": [ { "buttons": [{
extend: 'collection', extend: 'collection',
text: 'Export', text: 'Export',
buttons: ["copy", "csv", "print"] buttons: ["copy", "csv", "print"]
@ -82,6 +81,6 @@
columns: '.votes' columns: '.votes'
} }
] ]
}]}); }]});
</script> </script>
{% endblock %} {% endblock %}

93
pinaxcon/templates/symposion/reviews/review_detail.html
View file

@ -6,86 +6,73 @@
{% block body %} {% block body %}
<div> {% if is_manager %}
<a class="btn btn-primary" href="{% url "user_random" proposal.section.slug %}"> <div class="float-right">
{% trans "Jump to a random unreviewed proposal" %}
</a>
</div>
{% if is_manager %}
<div class="pull-right">
<form class="result-form form-inline form-horizontal" method="POST" action=""> <form class="result-form form-inline form-horizontal" method="POST" action="">
{% csrf_token %} {% csrf_token %}
<div class="btn-group"> <div class="btn-group">
{% if proposal.result.status == "accepted" %} {% if proposal.result.status == "accepted" %}
<a class="btn dropdown-toggle btn-success" data-toggle="dropdown" href="#">Accepted <span class="caret"></span></a> <a class="btn dropdown-toggle btn-success" data-toggle="dropdown" href="#">Accepted <span class="caret"></span></a>
<div class="dropdown-menu pull-right"> <div class="dropdown-menu pull-right">
<div class="btn-group"> <input type="submit" name="result_submit" value="reject" class="btn btn-block btn-xs btn-danger" />
<input type="submit" name="result_submit" value="reject" class="btn btn-xs btn-danger" /> <input type="submit" name="result_submit" value="standby" class="btn btn-block btn-info btn-xs" />
<input type="submit" name="result_submit" value="standby" class="btn btn-info btn-xs" /> <input type="submit" name="result_submit" value="undecide" class="btn btn-block btn-primary btn-xs" />
<input type="submit" name="result_submit" value="undecide" class="btn btn-primary btn-xs" />
</div> </div>
</div> <input type="submit" name="publish_changes" value="Publish Changes" class="btn btn-block btn-success" />
<input type="submit" name="publish_changes" value="Publish Changes" class="btn btn-success" />
{% else %} {% else %}
{% if proposal.result.status == "rejected" %} {% if proposal.result.status == "rejected" %}
<a class="btn dropdown-toggle btn-danger" data-toggle="dropdown" href="#">Rejected <span class="caret"></span></a> <a class="btn btn-block dropdown-toggle btn-danger" data-toggle="dropdown" href="#">Rejected <span class="caret"></span></a>
<div class="dropdown-menu pull-right"> <div class="dropdown-menu pull-right">
<div class="btn-group"> <input type="submit" name="result_submit" value="accept" class="btn btn-block btn-xs btn-success" />
<input type="submit" name="result_submit" value="accept" class="btn btn-xs btn-success" /> <input type="submit" name="result_submit" value="standby" class="btn btn-block btn-info btn-xs" />
<input type="submit" name="result_submit" value="standby" class="btn btn-info btn-xs" /> <input type="submit" name="result_submit" value="undecide" class="btn btn-block btn-default btn-xs" />
<input type="submit" name="result_submit" value="undecide" class="btn btn-default btn-xs" />
</div>
</div> </div>
{% else %} {% else %}
{% if proposal.result.status == "standby" %} {% if proposal.result.status == "standby" %}
<a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#">Standby <span class="caret"></span></a> <a class="btn btn-block btn-info dropdown-toggle" data-toggle="dropdown" href="#">Standby <span class="caret"></span></a>
<div class="dropdown-menu pull-right"> <div class="dropdown-menu pull-right">
<div class="btn-group"> <input type="submit" name="result_submit" value="accept" class="btn btn-block btn-xs btn-success" />
<input type="submit" name="result_submit" value="accept" class="btn btn-xs btn-success" /> <input type="submit" name="result_submit" value="reject" class="btn btn-block btn-xs btn-danger" />
<input type="submit" name="result_submit" value="reject" class="btn btn-xs btn-danger" /> <input type="submit" name="result_submit" value="undecide" class="btn btn-block btn-primary btn-xs" />
<input type="submit" name="result_submit" value="undecide" class="btn btn-primary btn-xs" />
</div>
</div> </div>
{% else %} {% else %}
<a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#">Undecided <span class="caret"></span></a> <a class="btn btn-block btn-primary dropdown-toggle" data-toggle="dropdown" href="#">Undecided <span class="caret"></span></a>
<div class="dropdown-menu pull-right"> <div class="dropdown-menu pull-right">
<div class="btn-group"> <input type="submit" name="result_submit" value="accept" class="btn btn-block btn-xs btn-success" />
<input type="submit" name="result_submit" value="accept" class="btn btn-xs btn-success" /> <input type="submit" name="result_submit" value="reject" class="btn btn-block btn-xs btn-danger" />
<input type="submit" name="result_submit" value="reject" class="btn btn-xs btn-danger" /> <input type="submit" name="result_submit" value="standby" class="btn btn-block btn-info btn-xs" />
<input type="submit" name="result_submit" value="standby" class="btn btn-info btn-xs" />
</div>
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>
</form> </form>
</div> </div>
{% endif %} {% endif %}
<h3>#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }})</h3> <h2 class="mb-5">#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }})</h2>
<div class="tabbable"> <div class="tabbable">
<ul class="nav nav-tabs"> <ul class="nav nav-pills">
<li class="active"><a href="#proposal-detail" data-toggle="tab">{% trans "Proposal Details" %}</a></li> <li class="nav-item"><a class="nav-link active" href="#proposal-detail" data-toggle="tab">{% trans "Proposal Details" %}</a></li>
<li><a href="#proposal-reviews" data-toggle="tab">{% trans "Reviews" %} <span class="badge">{{ reviews|length }}</span></a></li> <li class="nav-item"><a class="nav-link" href="#proposal-reviews" data-toggle="tab">{% trans "Reviews" %} <span class="badge">{{ reviews|length }}</span></a></li>
<li><a href="#proposal-feedback" data-toggle="tab">{% trans "Speaker Feedback" %} <span class="badge">{{ proposal.messages.all|length }}</span></a></li> <li class="nav-item"><a class="nav-link" href="#proposal-feedback" data-toggle="tab">{% trans "Speaker Feedback" %} <span class="badge">{{ proposal.messages.all|length }}</span></a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane active" id="proposal-detail"> <div class="tab-pane active" id="proposal-detail">
{% include "symposion/proposals/_proposal_fields.html" %} {% include "symposion/proposals/_proposal_fields.html" %}
</div> </div>
<div class="tab-pane" id="proposal-reviews"> <div class="tab-pane" id="proposal-reviews">
<div class="row my-4">
<h4>{% trans "Current Results" %}</h4> <div class="col-12">
<h2>{% trans "Current Results" %}</h2>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<th>+2 votes</th> <th>+2 votes</th>
<th>+1 votes</th> <th>+1 votes</th>
<th>-1 votes</th> <th>-1 votes</th>
<th>-2 votes</th> <th>-2 votes</th>
<th>{% trans "Total Responses" %} <th>{% trans "Total Responses" %}</th>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
@ -146,9 +133,13 @@
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</div> </div>
</div>
</div>
<div class="tab-pane" id="proposal-feedback"> <div class="tab-pane" id="proposal-feedback">
<div class="row my-4">
<div class="col-12">
{% if review_messages %} {% if review_messages %}
<h3>{% trans "Conversation with the submitter" %}</h3> <h2>{% trans "Conversation with the submitter" %}</h2>
{% for message in review_messages %} {% for message in review_messages %}
<div class="comment-box"> <div class="comment-box">
<div class="commment-content"> <div class="commment-content">
@ -162,7 +153,7 @@
{% endif %} {% endif %}
<form class="form-horizontal" action="" method="POST"accept-charset="utf-8"> <form class="form-horizontal" action="" method="POST"accept-charset="utf-8">
<legend>{% trans "Send a message" %}</legend> <h3>{% trans "Send a message" %}</h3>
<p> <p>
{% blocktrans %} {% blocktrans %}
If you'd like to communicate with the submitter, use the following form and he or she will be If you'd like to communicate with the submitter, use the following form and he or she will be
@ -178,11 +169,17 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div> <div>
<a class="btn btn-primary" href="{% url "user_random" proposal.section.slug %}"> <a href="{% url "user_random" proposal.section.slug %}">
{% trans "Jump to a random unreviewed proposal" %} {% trans "Jump to a random unreviewed proposal" %}
</a> </a>
</div> </div>
</div>
</div>
</div>
</div>
{% endblock %} {% endblock %}