Skip to content
Snippets Groups Projects
Commit bed57cf1 authored by Jan Maximilian Michal's avatar Jan Maximilian Michal
Browse files

minor css change

parent 7a4a29bd
Branches 287-build-test-image-constantly-failing
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
core/static/lib/css/custom.css
+ 4
− 0
View file @ bed57cf1
......@@ -32,3 +32,7 @@ pre {
.nopadding-right {
padding-right: 0 !important;
}
.nomargin {
margin: 0;
}
core/templates/core/reviewer_startpage.html
+ 61
− 71
View file @ bed57cf1
......@@ -10,9 +10,9 @@
<div class="col-4 nopadding-right">
{# This is a control panel where new work can be requested #}
<div class="card">
<div class="card-header">Progress</div>
<table class="table">
<div class="card mb-2">
<h5 class="card-header">Progress</h5>
<table class="table nomargin">
<thead>
<th>Name</th>
<th>Progress</th>
......@@ -29,12 +29,10 @@
</div>
{# Only a list of tutors. Currently no controls available #}
<div class="card my-2">
<div class="card-header">
Tutor overview
</div>
<div class="card mb-2">
<h5 class="card-header">Tutor overview</h5>
<div class="card-block">
<table class="table">
<table class="table nomargin">
<thead>
<th>Tutor</th>
<th># of feedbacks</th>
......@@ -53,48 +51,87 @@
</div>
<div class="col-8">
<div class="row-auto page-header">
<div class="card mb-2">
{% if feedback_list|length == 0 %}
<h2>Nobody has provided any feedback, yet. <br>Maybe you have to kick some ass?</h2>
<h5 class="card-header">There is no feedback, yet. Maybe you have to kick some ass?</h5>
{% elif feedback_list|length == 1 %}
<h2>Well, one is better than nothing</h2>
<h5 class="card-header">Well, one is better than nothing</h5>
{% else %}
<h2>So far {{feedback_list|length}} contributions were provided</h2>
<h5 class="card-header">So far {{feedback_list|length}} contributions were provided</h5>
{% endif %}
<div class="card-block">
<table class="table nomargin">
<thead>
<tr>
<th></th>
<th>Submission Type</th>
<th>Student</th>
<th>Score</th>
<th>Tutor</th>
<th></th>
</tr>
</thead>
<tbody>
{% for feedback in feedback_list %}
<tr>
<td class="align-middle"> {% if feedback.final %}
<span class="badge badge-success">Final</span>
{% endif %}
</td>
<td class="align-middle"> {{ feedback.of_submission.type }} </td>
<td class="align-middle"> {{ feedback.of_submission.student }} </td>
<td class="align-middle"> <code> {{ feedback.score }} / {{ feedback.of_submission.type.full_score }} </code> </td>
<td class="align-middle"> {{ feedback.of_tutor}} </td>
<td class="align-middle">
<a href="{% url 'FeedbackEdit' feedback.slug %}" class="btn btn-outline-primary mb-1" name="edit" value="View">View</a>
<a href="{% url 'FeedbackDelete' feedback.slug %}" class="btn btn-outline-danger mb-1" name="delete" value="Delete">Delete</a>
{% if not feedback.final %}
<a class="btn btn-outline-success mb-1" href="{% url 'FeedbackMarkFinal' feedback.slug %}"> Mark final </a>
{% else %}
<a class="btn btn-outline-secondary mb-1" href="{% url 'FeedbackMarkNotFinal' feedback.slug %}"> Undo </a>
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
<div class="row-auto my-1">
<div class="card">
<h5 class="card-header">This feedback was hard work</h5>
<div class="card-block m-2">
<table class="table">
{# This is card for empty feedback for the sake of completeness #}
<div class="card mb-2">
<a data-toggle="collapse" href="#collapseEmpty">
<h5 class="card-header">Empty feedback</h5>
</a>
<div id="collapseEmpty" class="collapse hide" role="tabpanel">
<div class="card-block">
<table class="table nomargin">
<thead>
<tr>
<th></th>
<th>Submission Type</th>
<th>Student</th>
<th>Score</th>
<th>Tutor</th>
<th>Auto feedback</th>
<th></th>
</tr>
</thead>
<tbody>
{% for feedback in feedback_list %}
{% for feedback in feedback_list_auto %}
<tr>
<td class="align-middle"> {% if feedback.final %}
<td class="align-middle">
{% if feedback.final %}
<span class="badge badge-success">Final</span>
{% endif %}
</td>
<td class="align-middle"> {{ feedback.of_submission.type }} </td>
<td class="align-middle"> {{ feedback.of_submission.student }} </td>
<td class="align-middle"> <code> {{ feedback.score }} / {{ feedback.of_submission.type.full_score }} </code> </td>
<td class="align-middle"> {{ feedback.of_tutor}} </td>
<td class="align-middle"> {{ feedback.get_origin_display }} </td>
<td class="align-middle">
{% if not feedback.origin == feedback.WAS_EMPTY %}
<a href="{% url 'FeedbackEdit' feedback.slug %}" class="btn btn-outline-primary mb-1" name="edit" value="View">View</a>
<a href="{% url 'FeedbackDelete' feedback.slug %}" class="btn btn-outline-danger mb-1" name="delete" value="Delete">Delete</a>
{% if not feedback.final %}
<a class="btn btn-outline-success mb-1" href="{% url 'FeedbackMarkFinal' feedback.slug %}"> Mark final </a>
{% else %}
<a class="btn btn-outline-secondary mb-1" href="{% url 'FeedbackMarkNotFinal' feedback.slug %}"> Undo </a>
{% endif %}
</td>
......@@ -105,53 +142,6 @@
</div>
</div>
</div>
{# This is card for empty feedback for the sake of completeness #}
<div class="row-auto my-1">
<div class="card">
<a data-toggle="collapse" href="#collapseEmpty">
<h5 class="card-header">Empty feedback</h5>
</a>
<div id="collapseEmpty" class="collapse hide" role="tabpanel">
<div class="card-block m-2">
<table class="table">
<thead>
<tr>
<th></th>
<th>Submission Type</th>
<th>Student</th>
<th>Score</th>
<th>Auto feedback</th>
<th></th>
</tr>
</thead>
<tbody>
{% for feedback in feedback_list_auto %}
<tr>
<td class="align-middle">
{% if feedback.final %}
<span class="badge badge-success">Final</span>
{% endif %}
</td>
<td class="align-middle"> {{ feedback.of_submission.type }} </td>
<td class="align-middle"> {{ feedback.of_submission.student }} </td>
<td class="align-middle"> <code> {{ feedback.score }} / {{ feedback.of_submission.type.full_score }} </code> </td>
<td class="align-middle"> {{ feedback.get_origin_display }} </td>
<td class="align-middle">
{% if not feedback.origin == feedback.WAS_EMPTY %}
<a href="{% url 'FeedbackEdit' feedback.slug %}" class="btn btn-outline-primary mb-1" name="edit" value="View">View</a>
<a href="{% url 'FeedbackDelete' feedback.slug %}" class="btn btn-outline-danger mb-1" name="delete" value="Delete">Delete</a>
<a class="btn btn-outline-secondary mb-1" href="{% url 'FeedbackMarkNotFinal' feedback.slug %}"> Undo </a>
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
......
core/templates/core/tutor_startpage.html
+ 1
− 1
View file @ bed57cf1
......@@ -12,7 +12,7 @@
{# This is a control panel where new work can be requested #}
<div class="card">
<h4 class="card-header">Overview</h4>
<table class="table">
<table class="table nomargin">
<thead>
<th>Name</th>
<th>Progress</th>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment