Changeset - 6e63465feaca
[Not reviewed]
0 5 0
Tobias Schulmann - 6 years ago 2018-06-30 03:40:16
tobias.schulmann@googlemail.com
Basic styling for review section
5 files changed with 225 insertions and 229 deletions:
0 comments (0 inline, 0 general)
pinaxcon/templates/flatpages/homepage.html
Show inline comments
...
 
@@ -12,7 +12,7 @@ integrity="sha512-/Nsx9X4HebavoBvEBuyp3I7od5tA0UzAxs+j83KgC8PU0kgB4XiK4Lfe4y4cgB
 
crossorigin=""></script>
 

	
 
{% endblock %}
 
{% block body %}
 
{% block body_out %}
 
<div class="row">
 
  <div class="col-12">
 
    <img src="{% static 'assets/Header_placeholder.jpg' %}" id="hero">
pinaxcon/templates/site_base.html
Show inline comments
...
 
@@ -57,10 +57,10 @@
 
    <h1 class="text-primary text-upper h2 mb-5">{% block page_title %}{% endblock %}</h1>
 

	
 
    {% block body_base %}
 
    {% block body %}
 
    {% block body_out %}
 
    
 
    <div class="row">
 
      <div class="col-md-1">
 
      <div class="col-md-12">
 
        {% block body_outer %}
 
        {% endblock %}
 
      </div>
pinaxcon/templates/symposion/reviews/_review_table.html
Show inline comments
 
{% load i18n %}
 

	
 
<table class="table table-striped table-bordered table-reviews">
 
<table class="table table-striped table-reviews">
 
    <thead>
 
        <th>#</th>
 
        <th>{% trans "Speaker / Title" %}</th>
pinaxcon/templates/symposion/reviews/base.html
Show inline comments
...
 
@@ -6,82 +6,81 @@
 
{% block body_class %}reviews{% endblock %}
 

	
 
{% block body_outer %}
 
<div class="l-content-page">
 
<div class="l-content-page--richtext">
 
<div class="rich-text">
 

	
 
    <div class="row">
 
        <div class="col-md-2">
 
            {% block sidebar %}
 
            {% for section in review_sections %}
 
            <div class="panel panel-default">
 
                <div class="panel-heading">
 
                    <h3 class="panel-title">{{ section }}</h3>
 
                </div>
 
                <div class="list-group">
 
                        <a class="list-group-item review-list" href="{% url "review_section" section.section.slug %}">
 
                            {% trans "All Reviews" %}
 
                        </a>
 
                        {% comment %}
 
                        <li>
 
                            <a href="{% url "review_section_assignments" section.section.slug %}">
 
                                {% trans "Your Assignments" %}
 
                            </a>
 
                        </li>
 
                        {% endcomment %}
 
                        <a class="list-group-item user-reviewed" href="{% url "user_reviewed" section.section.slug %}">
 
                            {% trans "Reviewed by you" %}
 
                        </a>
 
                        <a class="list-group-item user-not-reviewed" href="{% url "user_not_reviewed" section.section.slug %}">
 
                            {% trans "Unreviewed by you" %}
 
                        </a>
 
                        <a class="list-group-item user-random" href="{% url "user_random" section.section.slug %}">
 
                            {% trans "Random unreviewed proposal" %}
 
                        </a>
 
                        <a class="list-group-item voting-status" href="{% url "review_status" section.section.slug %}">
 
                            {% trans "Voting Status" %}
 
                        </a>
 
                        {% if request.user.is_staff %}
 
                            <a class="list-group-item review-results" href="{% url "result_notification" section.section.slug 'accepted' %}">Result Notification</a>
 
                        {% endif %}
 
                </div>
 
            {% endfor %}
 
            {% endblock %}
 
        </div>
 
        <div class="col-md-10">
 
            {% block body %}
 
            {% endblock %}
 
<div class="row text-primary">
 
    <div class="col-md-4">
 
        {% block sidebar %}
 
        {% for section in review_sections %}
 
        <div class="card card-default mb-4">
 
            <div class="card-header">
 
                <h3 class="card-title">{{ section }}</h3>
 
            </div>
 
            <div class="list-group">
 
                <a class="list-group-item review-list" href="{% url "review_section" section.section.slug %}">
 
                    {% trans "All Reviews" %}
 
                </a>
 
                {% comment %}
 
                <li>
 
                    <a href="{% url "review_section_assignments" section.section.slug %}">
 
                        {% trans "Your Assignments" %}
 
                    </a>
 
                </li>
 
                {% endcomment %}
 
                <a class="list-group-item user-reviewed" href="{% url "user_reviewed" section.section.slug %}">
 
                    {% trans "Reviewed by you" %}
 
                </a>
 
                <a class="list-group-item user-not-reviewed" href="{% url "user_not_reviewed" section.section.slug %}">
 
                    {% trans "Unreviewed by you" %}
 
                </a>
 
                <a class="list-group-item user-random" href="{% url "user_random" section.section.slug %}">
 
                    {% trans "Random unreviewed proposal" %}
 
                </a>
 
                <a class="list-group-item voting-status" href="{% url "review_status" section.section.slug %}">
 
                    {% trans "Voting Status" %}
 
                </a>
 
                {% if request.user.is_staff %}
 
                <a class="list-group-item review-results" href="{% url "result_notification" section.section.slug 'accepted' %}">Result Notification</a>
 
                {% endif %}
 
            </div>
 
        </div>
 
        {% endfor %}
 
        {% endblock %}
 
    </div>
 
</div></div></div>
 
    
 
    
 
    <div class="col-md-8">
 
        {% block body %}
 
        {% endblock %}
 
    </div>
 
</div>
 

	
 
{% endblock %}
 
{% 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/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">
 
        $("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,
 
            "lengthMenu": [[10, 50, 100, -1], [10, 50, 100, "All"]],
 
            "pageLength": 100,
 
            "colReorder": true,
 
            "buttons": [ {
 
              extend: 'collection',
 
              text: 'Export',
 
              buttons: ["copy", "csv", "print"]
 
            },
 
            { extend: 'collection',
 
              text: 'Columns',
 
              buttons: [
 
                { extend: 'columnsToggle',
 
                  columns: '.toggle' },
 
                { extend: 'columnToggle',
 
                  text: 'Vote details',
 
                  columns: '.votes'
 
                }
 
              ]
 
        }]});
 
    </script>
 
    $("table.table-reviews").dataTable({
 
        "stateSave": true,
 
        "lengthMenu": [[10, 50, 100, -1], [10, 50, 100, "All"]],
 
        "pageLength": 100,
 
        "colReorder": true,
 
        "buttons": [{
 
            extend: 'collection',
 
            text: 'Export',
 
            buttons: ["copy", "csv", "print"]
 
        },
 
        { extend: 'collection',
 
        text: 'Columns',
 
        buttons: [
 
        { extend: 'columnsToggle',
 
        columns: '.toggle' },
 
        { extend: 'columnToggle',
 
        text: 'Vote details',
 
        columns: '.votes'
 
    }
 
    ]
 
}]});
 
</script>
 
{% endblock %}
pinaxcon/templates/symposion/reviews/review_detail.html
Show inline comments
...
 
@@ -6,183 +6,180 @@
 

	
 
{% block body %}
 

	
 
    <div>
 
        <a class="btn btn-primary" href="{% url "user_random" proposal.section.slug %}">
 
            {% 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="">
 
                {% csrf_token %}
 
                <div class="btn-group">
 
                    {% if proposal.result.status == "accepted" %}
 
                        <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="btn-group">
 
                                <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-info btn-xs" />
 
                                <input type="submit" name="result_submit" value="undecide" class="btn btn-primary btn-xs" />
 
                            </div>
 
                        </div>
 
                        <input type="submit" name="publish_changes" value="Publish Changes" class="btn btn-success" />
 
                    {% else %}
 
                        {% if proposal.result.status == "rejected" %}
 
                            <a class="btn dropdown-toggle btn-danger" data-toggle="dropdown" href="#">Rejected <span class="caret"></span></a>
 
                            <div class="dropdown-menu pull-right">
 
                                <div class="btn-group">
 
                                    <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-info btn-xs" />
 
                                    <input type="submit" name="result_submit" value="undecide" class="btn btn-default btn-xs" />
 
                                </div>
 
                            </div>
 
                        {% else %}
 
                            {% if proposal.result.status == "standby" %}
 
                                <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#">Standby <span class="caret"></span></a>
 
                                <div class="dropdown-menu pull-right">
 
                                    <div class="btn-group">
 
                                        <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-xs btn-danger" />
 
                                        <input type="submit" name="result_submit" value="undecide" class="btn btn-primary btn-xs" />
 
                                    </div>
 
                                </div>
 
                            {% else %}
 
                                <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#">Undecided <span class="caret"></span></a>
 
                                <div class="dropdown-menu pull-right">
 
                                    <div class="btn-group">
 
                                        <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-xs btn-danger" />
 
                                        <input type="submit" name="result_submit" value="standby" class="btn btn-info btn-xs" />
 
                                    </div>
 
                                </div>
 
                            {% endif %}
 
                        {% endif %}
 
                    {% endif %}
 
                </div>
 
            </form>
 
        </div>
 
    {% endif %}
 

	
 
    <h3>#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }})</h3>
 

	
 
    <div class="tabbable">
 
        <ul class="nav nav-tabs">
 
            <li class="active"><a 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><a href="#proposal-feedback" data-toggle="tab">{% trans "Speaker Feedback" %} <span class="badge">{{ proposal.messages.all|length }}</span></a></li>
 
        </ul>
 
        <div class="tab-content">
 
            <div class="tab-pane active" id="proposal-detail">
 
                {% include "symposion/proposals/_proposal_fields.html" %}
 
{% if is_manager %}
 
<div class="float-right">
 
    <form class="result-form form-inline form-horizontal" method="POST" action="">
 
        {% csrf_token %}
 
        <div class="btn-group">
 
            {% if proposal.result.status == "accepted" %}
 
            <a class="btn dropdown-toggle btn-success" data-toggle="dropdown" href="#">Accepted <span class="caret"></span></a>
 
            <div class="dropdown-menu pull-right">
 
                <input type="submit" name="result_submit" value="reject" class="btn btn-block 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="undecide" class="btn btn-block btn-primary btn-xs" />
 
            </div>
 
            <div class="tab-pane" id="proposal-reviews">
 

	
 
                <h4>{% trans "Current Results" %}</h4>
 
                <table class="table table-striped">
 
                    <thead>
 
                        <th>+2 votes</th>
 
                        <th>+1 votes</th>
 
                        <th>-1 votes</th>
 
                        <th>-2 votes</th>
 
                        <th>{% trans "Total Responses" %}
 
                    </thead>
 
                    <tbody>
 
                        <tr>
 
                            <td>{{ proposal.plus_two }}</td>
 
                            <td>{{ proposal.plus_one }}</td>
 
                            <td>{{ proposal.minus_one }}</td>
 
                            <td>{{ proposal.minus_two }}</td>
 
                            <td>{{ proposal.total_votes }}</td>
 
                        </tr>
 
                    </tbody>
 
                </table>
 
            <input type="submit" name="publish_changes" value="Publish Changes" class="btn btn-block btn-success" />
 
            {% else %}
 
            {% if proposal.result.status == "rejected" %}
 
            <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">
 
                <input type="submit" name="result_submit" value="accept" class="btn btn-block 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="undecide" class="btn btn-block btn-default btn-xs" />
 
            </div>
 
            {% else %}
 
            {% if proposal.result.status == "standby" %}
 
            <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">
 
                <input type="submit" name="result_submit" value="accept" class="btn btn-block 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="undecide" class="btn btn-block btn-primary btn-xs" />
 
            </div>
 
            {% else %}
 
            <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">
 
                <input type="submit" name="result_submit" value="accept" class="btn btn-block 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="standby" class="btn btn-block btn-info btn-xs" />
 
            </div>
 
            {% endif %}
 
            {% endif %}
 
            {% endif %}
 
        </div>
 
    </form>
 
</div>
 
{% endif %}
 

	
 
                <hr />
 
<h2 class="mb-5">#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }})</h2>
 

	
 
                {% if review_form %}
 
<div class="tabbable">
 
    <ul class="nav nav-pills">
 
        <li class="nav-item"><a class="nav-link active" href="#proposal-detail" data-toggle="tab">{% trans "Proposal Details" %}</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 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>
 
    <div class="tab-content">
 
        <div class="tab-pane active" id="proposal-detail">
 
            {% include "symposion/proposals/_proposal_fields.html" %}
 
        </div>
 
        <div class="tab-pane" id="proposal-reviews">
 
            <div class="row my-4">
 
                <div class="col-12">
 
                    <h2>{% trans "Current Results" %}</h2>
 
                    <table class="table table-striped">
 
                        <thead>
 
                            <th>+2 votes</th>
 
                            <th>+1 votes</th>
 
                            <th>-1 votes</th>
 
                            <th>-2 votes</th>
 
                            <th>{% trans "Total Responses" %}</th>
 
                        </thead>
 
                        <tbody>
 
                            <tr>
 
                                <td>{{ proposal.plus_two }}</td>
 
                                <td>{{ proposal.plus_one }}</td>
 
                                <td>{{ proposal.minus_one }}</td>
 
                                <td>{{ proposal.minus_two }}</td>
 
                                <td>{{ proposal.total_votes }}</td>
 
                            </tr>
 
                        </tbody>
 
                    </table>
 
                    
 
                    <hr />
 
                    
 
                    {% if review_form %}
 
                    <form method="POST" action="#proposal-reviews" class="review-form form-horizontal">
 
                        <legend>{% trans "Submit Review" %}</legend>
 
                        <p>Enter your vote and any comment to go along with it. You can revise your vote or comment multiple times with an existing vote (your previously recorded score will be replaced during calculations). <b>Your vote and comments are not public and will only be viewable by other reviewers.</b></p>
 
                        {% csrf_token %}
 
                            {{ review_form|bootstrap }}
 
                            <div class="form-action">
 
                              <input type="submit" class="btn btn-primary" name="vote_submit" value="Submit Review" />
 
                              <input type="submit" class="btn btn-primary" name="vote_submit_and_random" value="Submit Review and jump to random proposal" />
 
                            </div>
 
                        {{ review_form|bootstrap }}
 
                        <div class="form-action">
 
                            <input type="submit" class="btn btn-primary" name="vote_submit" value="Submit Review" />
 
                            <input type="submit" class="btn btn-primary" name="vote_submit_and_random" value="Submit Review and jump to random proposal" />
 
                        </div>
 
                    </form>
 
                {% else %}
 
                    {% else %}
 
                    <p>You do not have permission to vote on this proposal.</p>
 
                {% endif %}
 

	
 
                {% if reviews %}
 
                    {% endif %}
 
                    
 
                    {% if reviews %}
 
                    <h5>Review Comments</h5>
 
                    {% for review in reviews %}
 
                        <div class="review-box">
 
                            <div class="vote pull-left">
 
                                <span>{{ review.vote }}</span>
 
                            </div>
 
                            {% if is_manager %}
 
                                <div class="pull-right">
 
                                    <form class="form-inline form-horizontal" action="{% url "review_delete" review.id %}" method="POST">
 
                                        {% csrf_token %}
 
                                        <button class="btn btn-xs btn-danger" type="submit">Delete</button>
 
                                    </form>
 
                                </div>
 
                            {% endif %}
 
                            <div class="review-content">
 
                                &nbsp;
 
                                <b>
 
                                  {% if review.user.speaker_profile %}
 
                                    {{ review.user.speaker_profile.name }}
 
                                  {% else %}
 
                                    {{ review.user.username }}
 
                                  {% endif %}
 
                                </b>
 
                                {{ review.submitted_at|timesince }} ago <br />
 
                                {{ review.comment_html|safe }}
 
                            </div>
 
                    <div class="review-box">
 
                        <div class="vote pull-left">
 
                            <span>{{ review.vote }}</span>
 
                        </div>
 
                        {% if is_manager %}
 
                        <div class="pull-right">
 
                            <form class="form-inline form-horizontal" action="{% url "review_delete" review.id %}" method="POST">
 
                                {% csrf_token %}
 
                                <button class="btn btn-xs btn-danger" type="submit">Delete</button>
 
                            </form>
 
                        </div>
 
                        {% endif %}
 
                        <div class="review-content">
 
                            &nbsp;
 
                            <b>
 
                                {% if review.user.speaker_profile %}
 
                                {{ review.user.speaker_profile.name }}
 
                                {% else %}
 
                                {{ review.user.username }}
 
                                {% endif %}
 
                            </b>
 
                            {{ review.submitted_at|timesince }} ago <br />
 
                            {{ review.comment_html|safe }}
 
                        </div>
 
                    </div>
 
                    {% endfor %}
 
                {% endif %}
 
                    {% endif %}
 
                </div>
 
            </div>
 
            <div class="tab-pane" id="proposal-feedback">
 
                {% if review_messages %}
 
                    <h3>{% trans "Conversation with the submitter" %}</h3>
 
        </div>
 
        <div class="tab-pane" id="proposal-feedback">
 
            <div class="row my-4">
 
                <div class="col-12">
 
                    {% if review_messages %}
 
                    <h2>{% trans "Conversation with the submitter" %}</h2>
 
                    {% for message in review_messages %}
 
                        <div class="comment-box">
 
                            <div class="commment-content">
 
                                <b>{{ message.user.username }}</b>
 
                                {{ message.submitted_at|timesince }} ago <br />
 
                                {{ message.message|safe }}
 
                            </div>
 
                    <div class="comment-box">
 
                        <div class="commment-content">
 
                            <b>{{ message.user.username }}</b>
 
                            {{ message.submitted_at|timesince }} ago <br />
 
                            {{ message.message|safe }}
 
                        </div>
 
                    </div>
 
                    {% endfor %}
 
                    <hr />
 
                {% endif %}
 

	
 
                <form class="form-horizontal" action="" method="POST"accept-charset="utf-8">
 
                    <legend>{% trans "Send a message" %}</legend>
 
                    <p>
 
                        {% blocktrans %}
 
                    {% endif %}
 
                    
 
                    <form class="form-horizontal" action="" method="POST"accept-charset="utf-8">
 
                        <h3>{% trans "Send a message" %}</h3>
 
                        <p>
 
                            {% blocktrans %}
 
                            If you'd like to communicate with the submitter, use the following form and he or she will be
 
                            notified and given the opportunity to respond.
 
                        {% endblocktrans %}
 
                    </p>
 
                    {% csrf_token %}
 
                    {{ message_form|bootstrap }}
 
                    <div class="form-actions">
 
                        <input type="submit" class="btn btn-primary" name="message_submit" value="Send Message" />
 
                    </div>
 
                </form>
 
                            {% endblocktrans %}
 
                        </p>
 
                        {% csrf_token %}
 
                        {{ message_form|bootstrap }}
 
                        <div class="form-actions">
 
                            <input type="submit" class="btn btn-primary" name="message_submit" value="Send Message" />
 
                        </div>
 
                    </form>
 
                </div>
 
            </div>
 
        </div>
 
    </div>
 
</div>
 

	
 
    <div>
 
        <a class="btn btn-primary" href="{% url "user_random" proposal.section.slug %}">
 
            {% trans "Jump to a random unreviewed proposal" %}
 
        </a>
 
    </div>
 
<div>
 
    <a href="{% url "user_random" proposal.section.slug %}">
 
        {% trans "Jump to a random unreviewed proposal" %}
 
    </a>
 
</div>
 
</div>
 
</div>
 
</div>
 
</div>
 

	
 
{% endblock %}
0 comments (0 inline, 0 general)