From 35ea3e74a083b436d9ef520e6aa0e663907185a9 Mon Sep 17 00:00:00 2001 From: janmax <mail-github@jmx.io> Date: Sat, 6 May 2017 14:11:03 +0200 Subject: [PATCH] Forgot to add modified to table --- core/templates/base.html | 2 +- core/templates/core/feedback_list.html | 2 ++ core/templates/core/reviewer_startpage.html | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/templates/base.html b/core/templates/base.html index 782ccbb2..31fd6609 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -47,7 +47,7 @@ <ul class="nav nav-pills"> <li class="nav-item"><a class="btn mr-1 navbar-btn btn-link" href="{% url 'start' %}">{{ user.username }}</a></li> <li class="nav-item"><a class="btn mr-1 navbar-btn btn-outline-primary" href="{% url 'logout' %}" role="button">Logout</a></li> - <li class="nav-item"><a class="btn mr-1 navbar-btn btn-outline-danger" href="https://gitlab.gwdg.de/j.michal/grady">Give Feedback</a></li> + <li class="nav-item"><a class="btn mr-1 navbar-btn btn-outline-danger" href="https://gitlab.gwdg.de/j.michal/grady" target="_blank">Give Feedback</a></li> </ul> {% else %} <form id="login_form" class="navbar-form form-inline" role="form" method="post" action="/login/"> diff --git a/core/templates/core/feedback_list.html b/core/templates/core/feedback_list.html index fc592c48..12b5cf0d 100644 --- a/core/templates/core/feedback_list.html +++ b/core/templates/core/feedback_list.html @@ -12,6 +12,7 @@ <th>Student</th> <th>Score</th> <th>Auto feedback</th> + <th>Modified</th> <th></th> </tr> </thead> @@ -25,6 +26,7 @@ <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"> -- </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> diff --git a/core/templates/core/reviewer_startpage.html b/core/templates/core/reviewer_startpage.html index 4ca8fc93..a9ede5ad 100644 --- a/core/templates/core/reviewer_startpage.html +++ b/core/templates/core/reviewer_startpage.html @@ -72,19 +72,21 @@ <th>Student</th> <th>Score</th> <th>Tutor</th> + <th>Modified</th> <th></th> </tr> </thead> <tbody> {% for feedback in feedback_list_manual %} <tr> - <td class="align-middle"> + <td class="align-middle fit"> {% include "core/feedback_badge.html" %} </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.modified | date:"m/d/y H:i"}} </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> -- GitLab