From 7595bde87c617af4d5926d7f635ceef54b68197c Mon Sep 17 00:00:00 2001 From: "J.-S. Caux" <J.S.Caux@uva.nl> Date: Mon, 15 Apr 2019 08:50:01 +0200 Subject: [PATCH] Template style: app finances --- finances/templates/finances/base.html | 16 +- finances/templates/finances/finances.html | 60 +++--- .../finances/subsidy_confirm_delete.html | 30 +-- .../templates/finances/subsidy_detail.html | 10 +- finances/templates/finances/subsidy_form.html | 26 +-- finances/templates/finances/subsidy_list.html | 204 +++++++++--------- .../subsidyattachment_confirm_delete.html | 30 +-- .../finances/subsidyattachment_form.html | 92 ++++---- finances/templates/finances/timesheets.html | 102 ++++----- .../finances/timesheets_detailed.html | 116 +++++----- .../finances/worklog_confirm_delete.html | 58 ++--- .../templates/partials/finances/logs.html | 52 ++--- .../partials/finances/subsidy_details.html | 110 +++++----- 13 files changed, 453 insertions(+), 453 deletions(-) diff --git a/finances/templates/finances/base.html b/finances/templates/finances/base.html index 3847767ad..1337071d4 100644 --- a/finances/templates/finances/base.html +++ b/finances/templates/finances/base.html @@ -3,13 +3,13 @@ {% block body_class %}{{ block.super }} finances{% endblock %} {% block breadcrumb %} - <div class="breadcrumb-container"> - <div class="container"> - <nav class="breadcrumb hidden-sm-down"> - {% block breadcrumb_items %} - <a href="{% url 'finances:finances' %}" class="breadcrumb-item">Finances</a> - {% endblock %} - </nav> - </div> + <div class="breadcrumb-container"> + <div class="container"> + <nav class="breadcrumb hidden-sm-down"> + {% block breadcrumb_items %} + <a href="{% url 'finances:finances' %}" class="breadcrumb-item">Finances</a> + {% endblock %} + </nav> </div> + </div> {% endblock %} diff --git a/finances/templates/finances/finances.html b/finances/templates/finances/finances.html index adf91a6e9..fdb570bb1 100644 --- a/finances/templates/finances/finances.html +++ b/finances/templates/finances/finances.html @@ -4,41 +4,41 @@ {% load bootstrap %} {% block breadcrumb_items %} - {{ block.super }} - <span class="breadcrumb-item">Finances</span> + {{ block.super }} + <span class="breadcrumb-item">Finances</span> {% endblock %} {% block pagetitle %}: Finances{% endblock pagetitle %} {% block content %} -<div class="row"> - <div class="col-12"> - <h2>Finances</h2> - - <h3 class="highlight">Sponsors</h3> - <p>Visit our <a href="{% url 'sponsors:sponsors' %}">Sponsors page</a> to view our list of sponsors and more information on our sponsorship scheme.</p> - - <h3 class="highlight">Subsidies</h3> - <ul> - <li><a href="{% url 'finances:subsidies' %}">View {% if perms.scipost.can_manage_subsidies %}(and manage) {% endif %}info on Subsidies obtained by SciPost</a></li> - </ul> - - <h3 class="highlight" id="reports">Financial Reports</h3> - <ul> - <li><a href="{% static 'scipost/info/AnnualReports/AnnualReport_2015.pdf' %}">Annual Report 2015</a></li> - <li><a href="{% static 'scipost/info/AnnualReports/AnnualReport_2016.pdf' %}">Annual Report 2016</a></li> - <li><a href="{% static 'scipost/info/AnnualReports/AnnualReport_2017.pdf' %}">Annual Report 2017</a></li> - <li><a href="{% static 'scipost/info/AnnualReports/AnnualReport_2018.pdf' %}">Annual Report 2018</a></li> - </ul> - - {% if perms.scipost.can_view_timesheets %} - <h3 class="highlight">Timesheets</h3> - <ul> - <li><a href="{% url 'finances:timesheets' %}">Manage Timesheets</a></li> - </ul> - {% endif %} - + <div class="row"> + <div class="col-12"> + <h2>Finances</h2> + + <h3 class="highlight">Sponsors</h3> + <p>Visit our <a href="{% url 'sponsors:sponsors' %}">Sponsors page</a> to view our list of sponsors and more information on our sponsorship scheme.</p> + + <h3 class="highlight">Subsidies</h3> + <ul> + <li><a href="{% url 'finances:subsidies' %}">View {% if perms.scipost.can_manage_subsidies %}(and manage) {% endif %}info on Subsidies obtained by SciPost</a></li> + </ul> + + <h3 class="highlight" id="reports">Financial Reports</h3> + <ul> + <li><a href="{% static 'scipost/info/AnnualReports/AnnualReport_2015.pdf' %}">Annual Report 2015</a></li> + <li><a href="{% static 'scipost/info/AnnualReports/AnnualReport_2016.pdf' %}">Annual Report 2016</a></li> + <li><a href="{% static 'scipost/info/AnnualReports/AnnualReport_2017.pdf' %}">Annual Report 2017</a></li> + <li><a href="{% static 'scipost/info/AnnualReports/AnnualReport_2018.pdf' %}">Annual Report 2018</a></li> + </ul> + + {% if perms.scipost.can_view_timesheets %} + <h3 class="highlight">Timesheets</h3> + <ul> + <li><a href="{% url 'finances:timesheets' %}">Manage Timesheets</a></li> + </ul> + {% endif %} + + </div> </div> -</div> {% endblock content %} diff --git a/finances/templates/finances/subsidy_confirm_delete.html b/finances/templates/finances/subsidy_confirm_delete.html index 9b7ed50ef..ab3dbe75c 100644 --- a/finances/templates/finances/subsidy_confirm_delete.html +++ b/finances/templates/finances/subsidy_confirm_delete.html @@ -3,28 +3,28 @@ {% load bootstrap %} {% block breadcrumb_items %} -{{ block.super }} -<span class="breadcrumb-item"><a href="{% url 'finances:subsidies' %}">Subsidies</a></span> -<span class="breadcrumb-item">Confirm deletetion</span> + {{ block.super }} + <span class="breadcrumb-item"><a href="{% url 'finances:subsidies' %}">Subsidies</a></span> + <span class="breadcrumb-item">Confirm deletetion</span> {% endblock %} {% block pagetitle %}: Delete Subsidy{% endblock pagetitle %} {% block content %} -<div class="row"> + <div class="row"> <div class="col-12"> - <h1 class="highlight">Delete Subsidy</h1> - {{ object }} + <h1 class="highlight">Delete Subsidy</h1> + {{ object }} + </div> + </div> + <div class="row"> + <div class="col-12"> + <form method="post"> + {% csrf_token %} + <h3 class="mb-2">Are you sure you want to delete this Subsidy?</h3> + <input type="submit" class="btn btn-danger" value="Yes, delete it" /> + </form> </div> -</div> -<div class="row"> - <div class="col-12"> - <form method="post"> - {% csrf_token %} - <h3 class="mb-2">Are you sure you want to delete this Subsidy?</h3> - <input type="submit" class="btn btn-danger" value="Yes, delete it" /> - </form> </div> -</div> {% endblock content %} diff --git a/finances/templates/finances/subsidy_detail.html b/finances/templates/finances/subsidy_detail.html index bf585887d..2a8ada9c6 100644 --- a/finances/templates/finances/subsidy_detail.html +++ b/finances/templates/finances/subsidy_detail.html @@ -5,15 +5,15 @@ {% block pagetitle %}: Subsidy details{% endblock pagetitle %} {% block breadcrumb_items %} -{{ block.super }} -<span class="breadcrumb-item"><a href="{% url 'finances:subsidies' %}">Subsidies</a></span> -<span class="breadcrumb-item">{{ subsidy }}</span> + {{ block.super }} + <span class="breadcrumb-item"><a href="{% url 'finances:subsidies' %}">Subsidies</a></span> + <span class="breadcrumb-item">{{ subsidy }}</span> {% endblock %} {% block content %} - <h1 class="highlight">Subsidy details</h1> - {% include 'partials/finances/subsidy_details.html' with subsidy=subsidy %} + <h1 class="highlight">Subsidy details</h1> + {% include 'partials/finances/subsidy_details.html' with subsidy=subsidy %} {% endblock content %} diff --git a/finances/templates/finances/subsidy_form.html b/finances/templates/finances/subsidy_form.html index a240bf009..d33fe20d5 100644 --- a/finances/templates/finances/subsidy_form.html +++ b/finances/templates/finances/subsidy_form.html @@ -3,27 +3,27 @@ {% load bootstrap %} {% block breadcrumb_items %} -{{ block.super }} -<span class="breadcrumb-item"><a href="{% url 'finances:subsidies' %}">Subsidies</a></span> -<span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new Subsidy{% endif %}</span> + {{ block.super }} + <span class="breadcrumb-item"><a href="{% url 'finances:subsidies' %}">Subsidies</a></span> + <span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new Subsidy{% endif %}</span> {% endblock %} {% block pagetitle %}: Subsidies{% endblock pagetitle %} {% block content %} -<div class="row"> - <div class="col-12"> - <form action="" method="post"> - {% csrf_token %} - {{ form|bootstrap }} - <input type="submit" value="Submit" class="btn btn-primary"> - </form> + <div class="row"> + <div class="col-12"> + <form action="" method="post"> + {% csrf_token %} + {{ form|bootstrap }} + <input type="submit" value="Submit" class="btn btn-primary"> + </form> + </div> </div> -</div> {% endblock content %} {% block footer_script %} -{{ block.super }} -{{ form.media }} + {{ block.super }} + {{ form.media }} {% endblock footer_script %} diff --git a/finances/templates/finances/subsidy_list.html b/finances/templates/finances/subsidy_list.html index c7bf0329f..7de678509 100644 --- a/finances/templates/finances/subsidy_list.html +++ b/finances/templates/finances/subsidy_list.html @@ -6,121 +6,121 @@ {% load bootstrap %} {% block headsup %} -<script type="text/javascript"> -$(document).ready(function($) { - $(".table-row").click(function() { - window.document.location = $(this).data("href"); - }); -}); -</script> + <script type="text/javascript"> + $(document).ready(function($) { + $(".table-row").click(function() { + window.document.location = $(this).data("href"); + }); + }); + </script> {% endblock headsup %} {% block breadcrumb_items %} - {{ block.super }} - <span class="breadcrumb-item">Subsidies</span> + {{ block.super }} + <span class="breadcrumb-item">Subsidies</span> {% endblock %} {% block content %} -<div class="row"> - <div class="col-12"> - <h1 class="highlight">Subsidies</h1> - {% if perms.scipost.can_manage_subsidies %} - <ul> - <li><a href="{% url 'finances:subsidy_create' %}">Add a Subsidy</a></li> - </ul> - {% endif %} + <div class="row"> + <div class="col-12"> + <h1 class="highlight">Subsidies</h1> + {% if perms.scipost.can_manage_subsidies %} + <ul> + <li><a href="{% url 'finances:subsidy_create' %}">Add a Subsidy</a></li> + </ul> + {% endif %} + </div> </div> -</div> -<div class="row"> - <div class="col-12"> - <table class="table table-hover mb-5"> - <thead class="thead-default"> - <tr> - <th>From Organization</th> - <th>Type</th> - <th>Amount - {% if request.GET.ordering != 'asc' %} - <a href="?order_by=amount&ordering=asc"><i class="fa fa-sort-asc"></i></a> - {% else %} - <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-asc"></i></a> + <div class="row"> + <div class="col-12"> + <table class="table table-hover mb-5"> + <thead class="thead-default"> + <tr> + <th>From Organization</th> + <th>Type</th> + <th>Amount + {% if request.GET.ordering != 'asc' %} + <a href="?order_by=amount&ordering=asc"><i class="fa fa-sort-asc"></i></a> + {% else %} + <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-asc"></i></a> + {% endif %} + {% if request.GET.ordering != 'desc' %} + <a href="?order_by=amount&ordering=desc"><i class="fa fa-sort-desc"></i></a> + {% else %} + <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-desc"></i></a> + {% endif %} + </th> + {% if perms.scipost.can_manage_subsidies %} + <th>Status</th> + <th><span class="small" style="writing-mode: vertical-lr;">attachments?</span></th> {% endif %} - {% if request.GET.ordering != 'desc' %} - <a href="?order_by=amount&ordering=desc"><i class="fa fa-sort-desc"></i></a> - {% else %} - <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-desc"></i></a> + <th>From date + {% if request.GET.ordering != 'asc' %} + <a href="?order_by=date&ordering=asc"><i class="fa fa-sort-asc"></i></a> + {% else %} + <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-asc"></i></a> + {% endif %} + {% if request.GET.ordering != 'desc' %} + <a href="?order_by=date&ordering=desc"><i class="fa fa-sort-desc"></i></a> + {% else %} + <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-desc"></i></a> + {% endif %} + </th> + <th>Until + {% if request.GET.ordering != 'asc' %} + <a href="?order_by=until&ordering=asc"><i class="fa fa-sort-asc"></i></a> + {% else %} + <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-asc"></i></a> + {% endif %} + {% if request.GET.ordering != 'desc' %} + <a href="?order_by=until&ordering=desc"><i class="fa fa-sort-desc"></i></a> + {% else %} + <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-desc"></i></a> + {% endif %} + </th> + {% if perms.scipost.can_manage_subsidies %} + <th><span class="small" style="writing-mode: vertical-lr;">Renewable?</span></th> + <th><span class="small" style="writing-mode: vertical-lr;">Renewed?</span></th> + <th>Renewal<br/>action date</th> {% endif %} - </th> - {% if perms.scipost.can_manage_subsidies %} - <th>Status</th> - <th><span class="small" style="writing-mode: vertical-lr;">attachments?</span></th> - {% endif %} - <th>From date - {% if request.GET.ordering != 'asc' %} - <a href="?order_by=date&ordering=asc"><i class="fa fa-sort-asc"></i></a> - {% else %} - <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-asc"></i></a> - {% endif %} - {% if request.GET.ordering != 'desc' %} - <a href="?order_by=date&ordering=desc"><i class="fa fa-sort-desc"></i></a> - {% else %} - <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-desc"></i></a> - {% endif %} - </th> - <th>Until - {% if request.GET.ordering != 'asc' %} - <a href="?order_by=until&ordering=asc"><i class="fa fa-sort-asc"></i></a> - {% else %} - <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-asc"></i></a> - {% endif %} - {% if request.GET.ordering != 'desc' %} - <a href="?order_by=until&ordering=desc"><i class="fa fa-sort-desc"></i></a> - {% else %} - <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-desc"></i></a> - {% endif %} - </th> - {% if perms.scipost.can_manage_subsidies %} - <th><span class="small" style="writing-mode: vertical-lr;">Renewable?</span></th> - <th><span class="small" style="writing-mode: vertical-lr;">Renewed?</span></th> - <th>Renewal<br/>action date</th> - {% endif %} - </tr> - </thead> - <tbody> - {% for subsidy in object_list %} - <tr> - <td><a href="{{ subsidy.organization.get_absolute_url }}">{{ subsidy.organization }}</a></td> - <td><a href="{{ subsidy.get_absolute_url }}">{{ subsidy.get_subsidy_type_display }}</a> - {% if subsidy.renewal_of.all|length > 0 %}<br/><span class="small text-muted">Renewal of:<ul class="list-unstyled">{% for prevsub in subsidy.renewal_of.all %}<li><a href="{{ prevsub.get_absolute_url }}">{{ prevsub }}</a></li>{% endfor %}</ul></span>{% endif %} - {% if subsidy.renewed_by.all|length > 0 %}<br/><span class="small text-muted">Renewed by:<ul class="list-unstyled">{% for newsub in subsidy.renewed_by.all %}<li><a href="{{ newsub.get_absolute_url }}">{{ newsub }}</a></li>{% endfor %}</ul></span>{% endif %} </td> - <td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies %}€{{ subsidy.amount }}{% else %}-{% endif %}</td> - {% if perms.scipost.can_manage_subsidies %} - <td>{{ subsidy.get_status_display }}</td> - <td>{% if subsidy.attachments.all|length > 0 %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td> - {% endif %} - <td>{{ subsidy.date }}</td> - <td class="bg-{{ subsidy.date_until_color_class }}">{{ subsidy.date_until }}</td> - {% if perms.scipost.can_manage_subsidies %} - <td> - {% if subsidy.renewable == True %}<i class="fa fa-check-circle text-success"></i>{% elif subsidy.renewable == False %}<i class="fa fa-times-circle text-danger"></i>{% else %}<i class="fa fa-question-circle text-warning"></i>{% endif %} - </td> - <td> - {% if subsidy.renewed_by.all|length > 0 %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %} - </td> - <td class="bg-{{ subsidy.renewal_action_date_color_class }}">{{ subsidy.renewal_action_date }}</td> - {% endif %} - </tr> - {% empty %} - <tr> - <td colspan="5">No Subsidy found</td> - </tr> - {% endfor %} - </tbody> - </table> + </tr> + </thead> + <tbody> + {% for subsidy in object_list %} + <tr> + <td><a href="{{ subsidy.organization.get_absolute_url }}">{{ subsidy.organization }}</a></td> + <td><a href="{{ subsidy.get_absolute_url }}">{{ subsidy.get_subsidy_type_display }}</a> + {% if subsidy.renewal_of.all|length > 0 %}<br/><span class="small text-muted">Renewal of:<ul class="list-unstyled">{% for prevsub in subsidy.renewal_of.all %}<li><a href="{{ prevsub.get_absolute_url }}">{{ prevsub }}</a></li>{% endfor %}</ul></span>{% endif %} + {% if subsidy.renewed_by.all|length > 0 %}<br/><span class="small text-muted">Renewed by:<ul class="list-unstyled">{% for newsub in subsidy.renewed_by.all %}<li><a href="{{ newsub.get_absolute_url }}">{{ newsub }}</a></li>{% endfor %}</ul></span>{% endif %} </td> + <td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies %}€{{ subsidy.amount }}{% else %}-{% endif %}</td> + {% if perms.scipost.can_manage_subsidies %} + <td>{{ subsidy.get_status_display }}</td> + <td>{% if subsidy.attachments.all|length > 0 %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td> + {% endif %} + <td>{{ subsidy.date }}</td> + <td class="bg-{{ subsidy.date_until_color_class }}">{{ subsidy.date_until }}</td> + {% if perms.scipost.can_manage_subsidies %} + <td> + {% if subsidy.renewable == True %}<i class="fa fa-check-circle text-success"></i>{% elif subsidy.renewable == False %}<i class="fa fa-times-circle text-danger"></i>{% else %}<i class="fa fa-question-circle text-warning"></i>{% endif %} + </td> + <td> + {% if subsidy.renewed_by.all|length > 0 %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %} + </td> + <td class="bg-{{ subsidy.renewal_action_date_color_class }}">{{ subsidy.renewal_action_date }}</td> + {% endif %} + </tr> + {% empty %} + <tr> + <td colspan="5">No Subsidy found</td> + </tr> + {% endfor %} + </tbody> + </table> + </div> </div> -</div> {% endblock content %} diff --git a/finances/templates/finances/subsidyattachment_confirm_delete.html b/finances/templates/finances/subsidyattachment_confirm_delete.html index 282485633..a094ba791 100644 --- a/finances/templates/finances/subsidyattachment_confirm_delete.html +++ b/finances/templates/finances/subsidyattachment_confirm_delete.html @@ -3,28 +3,28 @@ {% load bootstrap %} {% block breadcrumb_items %} -{{ block.super }} -<span class="breadcrumb-item"><a href="{% url 'finances:subsidies' %}">Subsidies</a></span> -<span class="breadcrumb-item">Confirm deletetion</span> + {{ block.super }} + <span class="breadcrumb-item"><a href="{% url 'finances:subsidies' %}">Subsidies</a></span> + <span class="breadcrumb-item">Confirm deletetion</span> {% endblock %} {% block pagetitle %}: Delete SubsidyAttachment{% endblock pagetitle %} {% block content %} -<div class="row"> + <div class="row"> <div class="col-12"> - <h1 class="highlight">Delete SubsidyAttachment</h1> - {{ object }} + <h1 class="highlight">Delete SubsidyAttachment</h1> + {{ object }} + </div> + </div> + <div class="row"> + <div class="col-12"> + <form method="post"> + {% csrf_token %} + <h3 class="mb-2">Are you sure you want to delete this SubsidyAttachment?</h3> + <input type="submit" class="btn btn-danger" value="Yes, delete it" /> + </form> </div> -</div> -<div class="row"> - <div class="col-12"> - <form method="post"> - {% csrf_token %} - <h3 class="mb-2">Are you sure you want to delete this SubsidyAttachment?</h3> - <input type="submit" class="btn btn-danger" value="Yes, delete it" /> - </form> </div> -</div> {% endblock content %} diff --git a/finances/templates/finances/subsidyattachment_form.html b/finances/templates/finances/subsidyattachment_form.html index 9f1ee098c..13791e36f 100644 --- a/finances/templates/finances/subsidyattachment_form.html +++ b/finances/templates/finances/subsidyattachment_form.html @@ -5,65 +5,65 @@ {% load staticfiles %} {% block breadcrumb_items %} -{{ block.super }} -<span class="breadcrumb-item"><a href="{% url 'finances:subsidies' %}">Subsidies</a></span> -<span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new Subsidy Attachment{% endif %}</span> + {{ block.super }} + <span class="breadcrumb-item"><a href="{% url 'finances:subsidies' %}">Subsidies</a></span> + <span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new Subsidy Attachment{% endif %}</span> {% endblock %} {% block pagetitle %}: SubsidyAttachments{% endblock pagetitle %} {% block headsup %} -<link rel="stylesheet" href="{% static 'flags/sprite-hq.css' %}"> + <link rel="stylesheet" href="{% static 'flags/sprite-hq.css' %}"> {% endblock headsup %} {% block content %} -<div class="row"> - <div class="col-12"> - <p><strong>N.B.:</strong> for Sponsorship Agreements, please adopt the following format for the file names:</p> - <p> - <em>SciPost_Sponsorship_<span class="text-muted">[year]</span>_<span class="text-muted">[2-letter country code]</span>_<span class="text-muted">[Organization acronym or short name]</span>.pdf</em><br/>in which <span class="text-muted">[year]</span> is the year of validity of the Agreement. - </p> + <div class="row"> + <div class="col-12"> + <p><strong>N.B.:</strong> for Sponsorship Agreements, please adopt the following format for the file names:</p> + <p> + <em>SciPost_Sponsorship_<span class="text-muted">[year]</span>_<span class="text-muted">[2-letter country code]</span>_<span class="text-muted">[Organization acronym or short name]</span>.pdf</em><br/>in which <span class="text-muted">[year]</span> is the year of validity of the Agreement. + </p> + </div> </div> -</div> -<div class="row"> - <div class="col-2"> - <p>Examples:</p> + <div class="row"> + <div class="col-2"> + <p>Examples:</p> + </div> + <div class="col-1"> + </div> + <div class="col-9"> + <ul class="list-unstyled"> + <li><em>SciPost_Sponsorship_2019_AU_UniMelb.pdf</em></li> + <li><em>SciPost_Sponsorship_2019_DE_MPDL.pdf</em></li> + </ul> + </div> </div> - <div class="col-1"> - </div> - <div class="col-9"> - <ul class="list-unstyled"> - <li><em>SciPost_Sponsorship_2019_AU_UniMelb.pdf</em></li> - <li><em>SciPost_Sponsorship_2019_DE_MPDL.pdf</em></li> - </ul> - </div> -</div> -<div class="row"> - <div class="col-3"> - <h4>Hover on flag to view country code</h4> - <p class="small text-muted">[only countries with at least one Organization are listed]</p> - </div> - <div class="col-8"> - <ul> - {% for code in countrycodes %} - {% get_country code as country_obj %} - <li style="display: inline-block;"> - <i class="{{ country_obj.flag_css }}" aria-label="{{ country_obj.code }}" data-toggle="tooltip" title="{{ country_obj.name }}: {{ country_obj.code }}"></i> - </li> - {% endfor %} - </ul> + <div class="row"> + <div class="col-3"> + <h4>Hover on flag to view country code</h4> + <p class="small text-muted">[only countries with at least one Organization are listed]</p> + </div> + <div class="col-8"> + <ul> + {% for code in countrycodes %} + {% get_country code as country_obj %} + <li style="display: inline-block;"> + <i class="{{ country_obj.flag_css }}" aria-label="{{ country_obj.code }}" data-toggle="tooltip" title="{{ country_obj.name }}: {{ country_obj.code }}"></i> + </li> + {% endfor %} + </ul> + </div> </div> -</div> -<div class="row"> - <div class="col-12"> - <form enctype="multipart/form-data" action="" method="post"> - {% csrf_token %} - {{ form|bootstrap }} - <input type="submit" value="Submit" class="btn btn-primary"> - </form> + <div class="row"> + <div class="col-12"> + <form enctype="multipart/form-data" action="" method="post"> + {% csrf_token %} + {{ form|bootstrap }} + <input type="submit" value="Submit" class="btn btn-primary"> + </form> + </div> </div> -</div> {% endblock content %} diff --git a/finances/templates/finances/timesheets.html b/finances/templates/finances/timesheets.html index e48fdf69a..a235f6571 100644 --- a/finances/templates/finances/timesheets.html +++ b/finances/templates/finances/timesheets.html @@ -1,8 +1,8 @@ {% extends 'finances/base.html' %} {% block breadcrumb_items %} - {{ block.super }} - <span class="breadcrumb-item">Team timesheets</span> + {{ block.super }} + <span class="breadcrumb-item">Team timesheets</span> {% endblock %} {% block pagetitle %}: Team timesheets{% endblock pagetitle %} @@ -12,62 +12,62 @@ {% block content %} -<div class="row"> + <div class="row"> <div class="col-12"> - <h1 class="highlight">Timesheets</h1> - <a href="{% url 'finances:timesheets_detailed' %}">See detailed timesheets</a> - <br> - <br> + <h1 class="highlight">Timesheets</h1> + <a href="{% url 'finances:timesheets_detailed' %}">See detailed timesheets</a> + <br> + <br> - <form method="get"> - {{form.employee|bootstrap }} + <form method="get"> + {{form.employee|bootstrap }} - <label>Date from</label> - <div class="form-row"> - {{ form.start }} - </div> + <label>Date from</label> + <div class="form-row"> + {{ form.start }} + </div> - <label>Date until</label> - <div class="form-row"> - {{ form.end }} - </div> - <br> + <label>Date until</label> + <div class="form-row"> + {{ form.end }} + </div> + <br> - <input type="submit" class="btn btn-primary" value="Filter"> - </form> + <input type="submit" class="btn btn-primary" value="Filter"> + </form> </div> -</div> + </div> -<div class="row"> + <div class="row"> <div class="col-12"> - {% if form.is_bound and form.is_valid %} - <h2 class="mb-2 mt-4">Team timesheets</h2> - <h4 class="mb-1">{{ user_log.user.first_name }} {{ user_log.user.last_name }}</h4> - <table class="table table-hover"> - <thead class="thead-default"> - <tr> - <th>Employee</th> - {% for month in form.get_months %} - <th>{{ month|date:'N Y' }}</th> - {% endfor %} - </tr> - </thead> - <tbody> - {% for user_log in form.filter_per_month %} - <tr> - <td>{{ user_log.user.last_name }}, {{ user_log.user.first_name }}</td> - {% for log in user_log.logs %} - <td>{{ log|duration }}</td> - {% endfor %} - </tr> - {% empty %} - <tr><td colspan="5">No logs found.</td></tr> - {% endfor %} - </tbody> - </table> - {% else %} - <p class="text-danger">First submit the filter form to retrieve results.</p> - {% endif %} + {% if form.is_bound and form.is_valid %} + <h2 class="mb-2 mt-4">Team timesheets</h2> + <h4 class="mb-1">{{ user_log.user.first_name }} {{ user_log.user.last_name }}</h4> + <table class="table table-hover"> + <thead class="thead-default"> + <tr> + <th>Employee</th> + {% for month in form.get_months %} + <th>{{ month|date:'N Y' }}</th> + {% endfor %} + </tr> + </thead> + <tbody> + {% for user_log in form.filter_per_month %} + <tr> + <td>{{ user_log.user.last_name }}, {{ user_log.user.first_name }}</td> + {% for log in user_log.logs %} + <td>{{ log|duration }}</td> + {% endfor %} + </tr> + {% empty %} + <tr><td colspan="5">No logs found.</td></tr> + {% endfor %} + </tbody> + </table> + {% else %} + <p class="text-danger">First submit the filter form to retrieve results.</p> + {% endif %} </div> -</div> + </div> {% endblock %} diff --git a/finances/templates/finances/timesheets_detailed.html b/finances/templates/finances/timesheets_detailed.html index eaa053038..236629251 100644 --- a/finances/templates/finances/timesheets_detailed.html +++ b/finances/templates/finances/timesheets_detailed.html @@ -1,9 +1,9 @@ {% extends 'finances/base.html' %} {% block breadcrumb_items %} - {{ block.super }} - <a href="{% url 'finances:timesheets' %}" class="breadcrumb-item">Team timesheets</a> - <span class="breadcrumb-item">Detailed timesheets</span> + {{ block.super }} + <a href="{% url 'finances:timesheets' %}" class="breadcrumb-item">Team timesheets</a> + <span class="breadcrumb-item">Detailed timesheets</span> {% endblock %} {% block pagetitle %}: Team timesheets{% endblock pagetitle %} @@ -13,68 +13,68 @@ {% block content %} -<div class="row"> + <div class="row"> <div class="col-12"> - <h1 class="highlight">Detailed timesheets</h1> - <br> + <h1 class="highlight">Detailed timesheets</h1> + <br> - <form method="get"> - {{form.employee|bootstrap }} + <form method="get"> + {{form.employee|bootstrap }} - <label>Date from</label> - <div class="form-row"> - {{ form.start }} - </div> + <label>Date from</label> + <div class="form-row"> + {{ form.start }} + </div> - <label>Date until</label> - <div class="form-row"> - {{ form.end }} - </div> - <br> + <label>Date until</label> + <div class="form-row"> + {{ form.end }} + </div> + <br> - <input type="submit" class="btn btn-primary" value="Filter"> - </form> + <input type="submit" class="btn btn-primary" value="Filter"> + </form> </div> -</div> + </div> -<div class="row"> + <div class="row"> <div class="col-12"> - {% if form.is_bound and form.is_valid %} - <h2 class="mb-2 mt-4">Team timesheets</h2> - {% for user_log in form.filter %} - <h4 class="mb-1">{{ user_log.user.first_name }} {{ user_log.user.last_name }}</h4> - <table class="table table-hover"> - <thead class="thead-default"> - <tr> - <th>Date</th> - <th>Related to object</th> - <th>Log type</th> - <th>Comments</th> - <th>Duration</th> - </tr> - </thead> - <tbody> - {% for log in user_log.logs %} - <tr> - <td>{{ log.work_date }}</td> - <td>{{ log.content }}</td> - <td>{{ log.log_type }}</td> - <td>{{ log.comments }}</td> - <td>{{ log.duration|duration }}</td> - </tr> - {% endfor %} - <tr> - <td colspan="4" class="text-right">Total:</td> - <td><strong>{{ user_log.duration.total|duration }}</strong></td> - </tr> - </tbody> - </table> - {% empty %} - <p>No logs found.</p> - {% endfor %} - {% else %} - <p class="text-danger">First submit the filter form to retrieve results.</p> - {% endif %} + {% if form.is_bound and form.is_valid %} + <h2 class="mb-2 mt-4">Team timesheets</h2> + {% for user_log in form.filter %} + <h4 class="mb-1">{{ user_log.user.first_name }} {{ user_log.user.last_name }}</h4> + <table class="table table-hover"> + <thead class="thead-default"> + <tr> + <th>Date</th> + <th>Related to object</th> + <th>Log type</th> + <th>Comments</th> + <th>Duration</th> + </tr> + </thead> + <tbody> + {% for log in user_log.logs %} + <tr> + <td>{{ log.work_date }}</td> + <td>{{ log.content }}</td> + <td>{{ log.log_type }}</td> + <td>{{ log.comments }}</td> + <td>{{ log.duration|duration }}</td> + </tr> + {% endfor %} + <tr> + <td colspan="4" class="text-right">Total:</td> + <td><strong>{{ user_log.duration.total|duration }}</strong></td> + </tr> + </tbody> + </table> + {% empty %} + <p>No logs found.</p> + {% endfor %} + {% else %} + <p class="text-danger">First submit the filter form to retrieve results.</p> + {% endif %} </div> -</div> + </div> {% endblock %} diff --git a/finances/templates/finances/worklog_confirm_delete.html b/finances/templates/finances/worklog_confirm_delete.html index 9b6200d7c..1f8d679a3 100644 --- a/finances/templates/finances/worklog_confirm_delete.html +++ b/finances/templates/finances/worklog_confirm_delete.html @@ -3,47 +3,47 @@ {% load scipost_extras %} {% block breadcrumb_items %} - {{block.super}} - <span class="breadcrumb-item">Delete log</span> + {{block.super}} + <span class="breadcrumb-item">Delete log</span> {% endblock %} {% load bootstrap %} {% block content %} -<div class="row"> + <div class="row"> <div class="col-12"> - <h1 class="highlight">Delete log</h1> - {% include 'partials/submissions/submission_card_content.html' with submission=object.content.submission %} + <h1 class="highlight">Delete log</h1> + {% include 'partials/submissions/submission_card_content.html' with submission=object.content.submission %} </div> -</div> -<div class="row"> - <div class="col-12"> + </div> + <div class="row"> + <div class="col-12"> <form method="post"> {% csrf_token %} - <h3 class="mb-2">Are you sure you want to delete this work log?</h3> - <table class="table"> - <tr> - <th>Logged by</th> - <td>{{ object.user }}</td> - </tr> - <tr> - <th>Comment</th> - <td>{{ object.comments|default:'-' }}</td> - </tr> - <tr> - <th>Logged time</th> - <td>{{ object.duration|duration }}</td> - </tr> - <tr> - <th>Log date</th> - <td>{{ object.work_date }}</td> - </tr> - </table> - <input type="submit" class="btn btn-danger" value="Yes, delete log" /> + <h3 class="mb-2">Are you sure you want to delete this work log?</h3> + <table class="table"> + <tr> + <th>Logged by</th> + <td>{{ object.user }}</td> + </tr> + <tr> + <th>Comment</th> + <td>{{ object.comments|default:'-' }}</td> + </tr> + <tr> + <th>Logged time</th> + <td>{{ object.duration|duration }}</td> + </tr> + <tr> + <th>Log date</th> + <td>{{ object.work_date }}</td> + </tr> + </table> + <input type="submit" class="btn btn-danger" value="Yes, delete log" /> </form> </ul> + </div> </div> -</div> {% endblock content %} diff --git a/finances/templates/partials/finances/logs.html b/finances/templates/partials/finances/logs.html index bd3f4c9d5..4bfc5fd07 100644 --- a/finances/templates/partials/finances/logs.html +++ b/finances/templates/partials/finances/logs.html @@ -1,29 +1,29 @@ - {% load scipost_extras %} +{% load scipost_extras %} - <ul class="list-unstyled"> +<ul class="list-unstyled"> {% for log in logs %} - <li id="log_{{ log.slug }}" class="pb-2"> - <div class="d-flex justify-content-between"> - <div> - <strong>{{ log.user.first_name }} {{ log.user.last_name }}</strong> - <br> - <span class="text-muted">{{ log.log_type }}</span> - <br> - {{ log.comments|linebreaksbr }} - </div> - <div class="text-muted text-right d-flex justify-content-end"> - <div> - {{ log.work_date }} - <br> - <strong>Duration: {{ log.duration|duration }}</strong> - </div> - <div class="pl-2"> - <a class="text-danger" href="{% url 'finances:log_delete' log.slug %}"><i class="fa fa-trash" aria-hidden="true"></i></a> - </div> - </div> - </div> - </li> - {% empty %} - <li>No logs were found.</li> - {% endfor %} + <li id="log_{{ log.slug }}" class="pb-2"> + <div class="d-flex justify-content-between"> + <div> + <strong>{{ log.user.first_name }} {{ log.user.last_name }}</strong> + <br> + <span class="text-muted">{{ log.log_type }}</span> + <br> + {{ log.comments|linebreaksbr }} + </div> + <div class="text-muted text-right d-flex justify-content-end"> + <div> + {{ log.work_date }} + <br> + <strong>Duration: {{ log.duration|duration }}</strong> + </div> + <div class="pl-2"> + <a class="text-danger" href="{% url 'finances:log_delete' log.slug %}"><i class="fa fa-trash" aria-hidden="true"></i></a> + </div> + </div> + </div> + </li> + {% empty %} + <li>No logs were found.</li> + {% endfor %} </ul> diff --git a/finances/templates/partials/finances/subsidy_details.html b/finances/templates/partials/finances/subsidy_details.html index 8be008e54..b054470a5 100644 --- a/finances/templates/partials/finances/subsidy_details.html +++ b/finances/templates/partials/finances/subsidy_details.html @@ -5,36 +5,36 @@ {% get_obj_perms request.user for subsidy.organization as "user_org_perms" %} <div class="row"> - <div class="col-12"> - {% if perms.scipost.can_manage_subsidies %} + <div class="col-12"> + {% if perms.scipost.can_manage_subsidies %} <ul class="list-inline"><li class="list-inline-item"><strong>Admin actions:</strong></li> <li class="list-inline-item"><a href="{% url 'finances:subsidy_update' pk=subsidy.id %}"><span class="text-warning">Update</span></a></li> <li class="list-inline-item"><a href="{% url 'finances:subsidy_delete' pk=subsidy.id %}"><span class="text-danger">Delete</span></a></li> </ul> - {% endif %} + {% endif %} - <table class="table"> - <tr> - <td>From:</td><td>{% if subsidy.organization.details_publicly_viewable or perms.scipost.can_manage_organizations %}<a href="{{ subsidy.organization.get_absolute_url }}">{{ subsidy.organization }}</a>{% else %}{{ subsidy.organization }}{% endif %}</td> - </tr> - <tr> - <td>Type:</td><td>{{ subsidy.get_subsidy_type_display }}</td> - </tr> - <tr> - <td>Description:</td><td>{{ subsidy.description }}</td> - </tr> - <tr> - <td>Amount:</td><td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %}€{{ subsidy.amount }}{% else %}-{% endif %}{% if perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %} {% if subsidy.amount_publicly_shown %}<span class="text-success">publicly visible</span>{% else %}<span class="text-danger">publicly invisible</span>{% endif %} <a href="{% url 'finances:subsidy_toggle_amount_public_visibility' subsidy_id=subsidy.id %}" class="small">Make it {% if subsidy.amount_publicly_shown %}in{% endif %}visible</a>{% endif %}</td> - </tr> - <tr> - <td>Date:</td><td>{{ subsidy.date }}</td> - </tr> - {% if subsidy.date_until %} + <table class="table"> + <tr> + <td>From:</td><td>{% if subsidy.organization.details_publicly_viewable or perms.scipost.can_manage_organizations %}<a href="{{ subsidy.organization.get_absolute_url }}">{{ subsidy.organization }}</a>{% else %}{{ subsidy.organization }}{% endif %}</td> + </tr> + <tr> + <td>Type:</td><td>{{ subsidy.get_subsidy_type_display }}</td> + </tr> + <tr> + <td>Description:</td><td>{{ subsidy.description }}</td> + </tr> + <tr> + <td>Amount:</td><td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %}€{{ subsidy.amount }}{% else %}-{% endif %}{% if perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %} {% if subsidy.amount_publicly_shown %}<span class="text-success">publicly visible</span>{% else %}<span class="text-danger">publicly invisible</span>{% endif %} <a href="{% url 'finances:subsidy_toggle_amount_public_visibility' subsidy_id=subsidy.id %}" class="small">Make it {% if subsidy.amount_publicly_shown %}in{% endif %}visible</a>{% endif %}</td> + </tr> + <tr> + <td>Date:</td><td>{{ subsidy.date }}</td> + </tr> + {% if subsidy.date_until %} <tr> <td>Date until:</td><td>{{ subsidy.date_until }}</td> </tr> - {% endif %} - {% if perms.scipost.can_manage_subsidies %} + {% endif %} + {% if perms.scipost.can_manage_subsidies %} <tr> <td>Renewable?</td><td>{% if subsidy.renewable == True %}Yes, renewal action date: <span class="bg-{{ subsidy.renewal_action_date_color_class }}">{{ subsidy.renewal_action_date }}</span>{% elif subsidy.renewable == None %}Undetermined [please update]{% else %}No{% endif %}</td> </tr> @@ -42,56 +42,56 @@ <td>Status</td> <td>{{ subsidy.get_status_display }}</td> </tr> - {% endif %} - </table> + {% endif %} + </table> - {% if subsidy.renewal_of.all|length > 0 %} + {% if subsidy.renewal_of.all|length > 0 %} <p> Renewal of:<ul>{% for prevsub in subsidy.renewal_of.all %}<li><a href="{% url 'finances:subsidy_details' pk=prevsub.id %}">{{ prevsub }}</a></li>{% endfor %}</ul> </p> - {% endif %} - {% if subsidy.renewed_by.all|length > 0 %} + {% endif %} + {% if subsidy.renewed_by.all|length > 0 %} <p> Renewed by:<ul>{% for newsub in subsidy.renewed_by.all %}<li><a href="{% url 'finances:subsidy_details' pk=newsub.id %}">{{ newsub }}</a></li>{% endfor %}</ul> </p> - {% endif %} + {% endif %} - </div> </div> +</div> - <div class="row"> - <div class="col-12"> - <h3>Attachments</h3> - {% if perms.scipost.can_manage_subsidies %} +<div class="row"> + <div class="col-12"> + <h3>Attachments</h3> + {% if perms.scipost.can_manage_subsidies %} <ul> <li><a href="{% url 'finances:subsidyattachment_create' subsidy_id=subsidy.id %}">Add a Subsidy Attachment</a> to this Subsidy</li> </ul> - {% endif %} - <table class="table"> - <tr> - <th>File name</th> - {% if perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %} + {% endif %} + <table class="table"> + <tr> + <th>File name</th> + {% if perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %} <th>Publicly visible?</th> - {% endif %} - </tr> - {% for att in subsidy.attachments.all %} + {% endif %} + </tr> + {% for att in subsidy.attachments.all %} {% if att.publicly_visible or perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %} - <tr> - <td><a href="{{ att.get_absolute_url }}" target="_blank">{{ att.name }}</a></td> - {% if perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %} - <td>{% if att.publicly_visible %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %} <a href="{% url 'finances:subsidy_attachment_toggle_public_visibility' attachment_id=att.id %}" class="small">Make it {% if att.publicly_visible %}in{% endif %}visible</a></td> - {% if perms.scipost.can_manage_subsidies %} - <td><a href="{% url 'finances:subsidyattachment_update' pk=att.id %}"><span class="text-warning">Update</span></a></td> - <td><a href="{% url 'finances:subsidyattachment_delete' pk=att.id %}"><span class="text-danger">Delete</span></a></td> - {% endif %} - {% endif %} - </tr> + <tr> + <td><a href="{{ att.get_absolute_url }}" target="_blank">{{ att.name }}</a></td> + {% if perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %} + <td>{% if att.publicly_visible %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %} <a href="{% url 'finances:subsidy_attachment_toggle_public_visibility' attachment_id=att.id %}" class="small">Make it {% if att.publicly_visible %}in{% endif %}visible</a></td> + {% if perms.scipost.can_manage_subsidies %} + <td><a href="{% url 'finances:subsidyattachment_update' pk=att.id %}"><span class="text-warning">Update</span></a></td> + <td><a href="{% url 'finances:subsidyattachment_delete' pk=att.id %}"><span class="text-danger">Delete</span></a></td> + {% endif %} + {% endif %} + </tr> {% endif %} - {% empty %} + {% empty %} <tr> <td>No attachment found</td> </tr> - {% endfor %} - </table> - </div> + {% endfor %} + </table> + </div> </div> -- GitLab