From baed455f5e36208240c9b1cc23162c3a38b7d769 Mon Sep 17 00:00:00 2001 From: Jorran de Wit <jorrandewit@outlook.com> Date: Fri, 19 May 2017 19:49:04 +0200 Subject: [PATCH] Improve vet commentary page --- .../commentaries/_commentary_summary.html | 2 +- .../commentaries/vet_commentary_requests.html | 65 ++++++++++--------- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/commentaries/templates/commentaries/_commentary_summary.html b/commentaries/templates/commentaries/_commentary_summary.html index 681641bf6..be9db8316 100644 --- a/commentaries/templates/commentaries/_commentary_summary.html +++ b/commentaries/templates/commentaries/_commentary_summary.html @@ -11,7 +11,7 @@ <td>As Contributors:</td> <td> {% for author in commentary.authors.all %} - <a href="{% url 'scipost:contributor_info' author.id %}">{{author.user.first_name}} {{author.user.last_name}}</a> + {% if not forloop.first %} · {% endif %}<a href="{% url 'scipost:contributor_info' author.id %}">{{author.user.first_name}} {{author.user.last_name}}</a> {% empty %} (none claimed) {% endfor %} diff --git a/commentaries/templates/commentaries/vet_commentary_requests.html b/commentaries/templates/commentaries/vet_commentary_requests.html index 70edddb6e..e4f853aa1 100644 --- a/commentaries/templates/commentaries/vet_commentary_requests.html +++ b/commentaries/templates/commentaries/vet_commentary_requests.html @@ -1,35 +1,40 @@ -{% extends 'scipost/base.html' %} +{% extends 'scipost/_personal_page_base.html' %} -{% block pagetitle %}: vet Commentary requests{% endblock pagetitle %} - -{% block bodysup %} - -<section> - {% if not commentary_to_vet %} - <h1>There are no Commentary Page requests for you to vet.</h1> - - {% else %} +{% load bootstrap %} - <h1>SciPost Commentary Page request to vet:</h1> - - <br> - <hr> - <div class="row"> - <div class="col-8"> - {% include 'commentaries/_commentary_summary.html' with commentary=commentary_to_vet %} - <h3>Abstract:</h3> - <p>{{ commentary_to_vet.pub_abstract }}</p> +{% block pagetitle %}: vet Commentary requests{% endblock pagetitle %} +{% block breadcrumb_items %} + {{block.super}} + <span class="breadcrumb-item">Vet Commentary Page requests</span> +{% endblock %} + +{% block content %} + +<div class="row"> + <div class="col-12"> + {% if not commentary_to_vet %} + <h1>There are no Commentary Page requests for you to vet.</h1> + {% else %} + <h1>SciPost Commentary Page request to vet:</h1> + + <hr> + <div class="row"> + <div class="col-md-7"> + {% include 'commentaries/_commentary_summary.html' with commentary=commentary_to_vet %} + <h3 class="mt-4">Abstract:</h3> + <p>{{ commentary_to_vet.pub_abstract }}</p> + + </div> + <div class="col-md-5"> + <form action="{% url 'commentaries:vet_commentary_request_ack' commentary_id=commentary_to_vet.id %}" method="post"> + {% csrf_token %} + {{ form|bootstrap }} + <input type="submit" class="btn btn-secondary" value="Submit" /> + </div> + </div> + {% endif %} </div> - <div class="col-4"> - <form action="{% url 'commentaries:vet_commentary_request_ack' commentary_id=commentary_to_vet.id %}" method="post"> - {% csrf_token %} - {{ form.as_ul }} - <input type="submit" value="Submit" /> - </div> - </div> - - {% endif %} -</section> +</div> -{% endblock bodysup %} +{% endblock %} -- GitLab