From 0315abff17734dbf43ee85bec93aaebf630126bc Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 15 Apr 2019 09:06:27 +0200
Subject: [PATCH] Template style: app organizations
---
.../organizations/_organization_card.html | 390 +++++++++---------
.../_organization_details_contents.html | 18 +-
.../organizations/_organization_event_li.html | 2 +-
.../organizations/activate_account.html | 14 +-
.../templates/organizations/base.html | 16 +-
.../organizations/contact_detail.html | 110 ++---
.../contactperson_confirm_delete.html | 30 +-
.../organizations/contactperson_form.html | 22 +-
.../organizations/contactperson_list.html | 68 +--
.../contactrole_confirm_delete.html | 30 +-
.../organizations/contactrole_form.html | 26 +-
.../templates/organizations/dashboard.html | 368 ++++++++---------
.../organization_add_contact.html | 16 +-
.../organization_confirm_delete.html | 24 +-
.../organizations/organization_create.html | 16 +-
.../organizations/organization_detail.html | 56 +--
.../organizations/organization_list.html | 246 +++++------
.../organizations/organization_update.html | 16 +-
.../organizations/organizationevent_form.html | 26 +-
.../organizations/organizationevent_list.html | 68 +--
20 files changed, 781 insertions(+), 781 deletions(-)
diff --git a/organizations/templates/organizations/_organization_card.html b/organizations/templates/organizations/_organization_card.html
index e4faa6fd3..6d31fe52c 100644
--- a/organizations/templates/organizations/_organization_card.html
+++ b/organizations/templates/organizations/_organization_card.html
@@ -4,13 +4,13 @@
{% load organizations_extras %}
{% 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 %}
{% is_scipost_admin request.user as is_scipost_admin %}
@@ -27,7 +27,7 @@ $(document).ready(function($) {
</li>
<li class="nav-item">
<a class="nav-link active" id="publications-{{ org.id }}-tab" data-toggle="tab" href="#publications-{{ org.id }}" role="tab" aria-controls="publications-{{ org.id }}" aria-selected="true">Publications{% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
- & PubFractions{% endif %}</a>
+ & PubFractions{% endif %}</a>
</li>
<li class="nav-item">
<a class="nav-link" id="authors-{{ org.id }}-tab" data-toggle="tab" href="#authors-{{ org.id }}" role="tab" aria-controls="authors-{{ org.id }}" aria-selected="true">Associated Authors</a>
@@ -36,14 +36,14 @@ $(document).ready(function($) {
<a class="nav-link" id="support-{{ org.id }}-tab" data-toggle="tab" href="#support-{{ org.id }}" role="tab" aria-controls="support-{{ org.id }}" aria-selected="true">Support history</a>
</li>
{% if perms.scipost.can_manage_organizations or perms.scipost.can_add_contactperson %}
- <li class="nav-item">
- <a class="nav-link" id="contacts-{{ org.id }}-tab" data-toggle="tab" href="#contacts-{{ org.id }}" role="tab" aria-controls="contacts-{{ org.id }}" aria-selected="true">Contacts</a>
- </li>
+ <li class="nav-item">
+ <a class="nav-link" id="contacts-{{ org.id }}-tab" data-toggle="tab" href="#contacts-{{ org.id }}" role="tab" aria-controls="contacts-{{ org.id }}" aria-selected="true">Contacts</a>
+ </li>
{% endif %}
{% if perms.scipost.can_manage_organizations %}
- <li class="nav-item">
- <a class="nav-link" id="events-{{ org.id }}-tab" data-toggle="tab" href="#events-{{ org.id }}" role="tab" aria-controls="events-{{ org.id }}" aria-selected="true">Events</a>
- </li>
+ <li class="nav-item">
+ <a class="nav-link" id="events-{{ org.id }}-tab" data-toggle="tab" href="#events-{{ org.id }}" role="tab" aria-controls="events-{{ org.id }}" aria-selected="true">Events</a>
+ </li>
{% endif %}
</ul>
@@ -51,12 +51,12 @@ $(document).ready(function($) {
<div class="tab-pane pt-4" id="details-{{ org.id }}" role="tabpanel" aria-labelledby="details-{{ org.id }}-tab">
{% if perms.scipost.can_manage_organizations %}
- <h3>Manage this organization:</h3>
- <ul>
- <li><a href="{% url 'organizations:organization_update' pk=org.id %}">Update</a></li>
- <li><a href="{% url 'organizations:organization_delete' pk=org.id %}">Delete</a></li>
- </ul>
- <hr/>
+ <h3>Manage this organization:</h3>
+ <ul>
+ <li><a href="{% url 'organizations:organization_update' pk=org.id %}">Update</a></li>
+ <li><a href="{% url 'organizations:organization_delete' pk=org.id %}">Delete</a></li>
+ </ul>
+ <hr/>
{% endif %}
<h3>Details:</h3>
@@ -65,16 +65,16 @@ $(document).ready(function($) {
<h3>Funder Registry instances associated to this Organization:</h3>
<ul>
{% for funder in org.funder_set.all %}
- <li>{{ funder }}</li>
+ <li>{{ funder }}</li>
{% empty %}
- <li>No Funder Registry instance found<br/><br/>
- <strong class="text-danger">Without a Funder Registry instance, we cannot record funding acknowledgements to this Organization with Crossref.</strong>
- <p>Are you a representative of this Organization? We advise you to:</p>
- <ul>
- <li>Make sure your Organization gets included in <a href="https://www.crossref.org/services/funder-registry/" target="_blank">Crossref's Funder Registry</a>;</li>
- <li>After inclusion, <a href="mailto:admin@scipost.org?subject=Inclusion of {{ organization }} {% if organization.acronym %}({{ organization.acronym }}){% endif %} in the Funder Registry">contact our administration</a> with this information so that we can update our records.</li>
- </ul>
- </li>
+ <li>No Funder Registry instance found<br/><br/>
+ <strong class="text-danger">Without a Funder Registry instance, we cannot record funding acknowledgements to this Organization with Crossref.</strong>
+ <p>Are you a representative of this Organization? We advise you to:</p>
+ <ul>
+ <li>Make sure your Organization gets included in <a href="https://www.crossref.org/services/funder-registry/" target="_blank">Crossref's Funder Registry</a>;</li>
+ <li>After inclusion, <a href="mailto:admin@scipost.org?subject=Inclusion of {{ organization }} {% if organization.acronym %}({{ organization.acronym }}){% endif %} in the Funder Registry">contact our administration</a> with this information so that we can update our records.</li>
+ </ul>
+ </li>
{% endfor %}
</ul>
@@ -82,24 +82,24 @@ $(document).ready(function($) {
<div class="tab-pane show active pt-4" id="publications-{{ org.id }}" role="tabpanel" aria-labelledby="publications-{{ org.id }}-tab">
<h3>Publications associated to this Organization{% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
- <span class="text-muted small">(with total PubFractions <i class="fa fa-info-circle" data-toggle="tooltip" data-html="true" title="" data-original-title="Fraction of a publication's funding/institutional support associated to a given Organization"></i>)</span>{% endif %}:</h3>
+ <span class="text-muted small">(with total PubFractions <i class="fa fa-info-circle" data-toggle="tooltip" data-html="true" title="" data-original-title="Fraction of a publication's funding/institutional support associated to a given Organization"></i>)</span>{% endif %}:</h3>
{% for pubyear in pubyears %}
- <h4>{{ pubyear }}{% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
- <span class="text-muted small">(total pubfractions: {{ org|pubfractions_in_year:pubyear }})</span>{% endif %}</h4>
- <ul>
- {% for publication in org.get_publications %}
- {% if publication.publication_date|date:'Y'|add:"0" == pubyear %}
- <li>
- <a href="{{ publication.get_absolute_url }}">{{ publication.title }}</a>
- <br>by {{ publication.author_list }},
- <br>{{ publication.citation }}
- {% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
- <br><span class="text-muted small">Pubfraction: {{ org|pubfraction_for_publication:publication }}</span>
- {% endif %}
- </li>
- {% endif %}
- {% endfor %}
- </ul>
+ <h4>{{ pubyear }}{% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
+ <span class="text-muted small">(total pubfractions: {{ org|pubfractions_in_year:pubyear }})</span>{% endif %}</h4>
+ <ul>
+ {% for publication in org.get_publications %}
+ {% if publication.publication_date|date:'Y'|add:"0" == pubyear %}
+ <li>
+ <a href="{{ publication.get_absolute_url }}">{{ publication.title }}</a>
+ <br>by {{ publication.author_list }},
+ <br>{{ publication.citation }}
+ {% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
+ <br><span class="text-muted small">Pubfraction: {{ org|pubfraction_for_publication:publication }}</span>
+ {% endif %}
+ </li>
+ {% endif %}
+ {% endfor %}
+ </ul>
{% endfor %}
</div>
@@ -108,36 +108,36 @@ $(document).ready(function($) {
<div class="col-lg-6">
<h3>Associated Authors:</h3>
{% for profile in org.get_author_profiles %}
- {% if profile.contributor %}
- <li><a href="{{ profile.contributor.get_absolute_url }}">{{ profile }}</a></li>
- {% else %}
- <li>{{ profile }}</li>
- {% endif %}
+ {% if profile.contributor %}
+ <li><a href="{{ profile.contributor.get_absolute_url }}">{{ profile }}</a></li>
+ {% else %}
+ <li>{{ profile }}</li>
+ {% endif %}
{% empty %}
- <li>No Profile found</li>
+ <li>No Profile found</li>
{% endfor %}
</div>
{% if org.children.all|length > 0 %}
- <div class="col-lg-6">
- <h3>Associated authors from sub-organizations:</h3>
- <ul>
- {% for child in org.children.all %}
- <li>{{ child }}:
- <ul>
- {% for profile in child.get_author_profiles %}
- {% if profile.contributor %}
- <li><a href="{{ profile.contributor.get_absolute_url }}">{{ profile }}</a></li>
- {% else %}
- <li>{{ profile }}</li>
- {% endif %}
- {% empty %}
- <li>No Profile found</li>
- {% endfor %}
- </ul>
- </li>
- {% endfor %}
- </ul>
- </div>
+ <div class="col-lg-6">
+ <h3>Associated authors from sub-organizations:</h3>
+ <ul>
+ {% for child in org.children.all %}
+ <li>{{ child }}:
+ <ul>
+ {% for profile in child.get_author_profiles %}
+ {% if profile.contributor %}
+ <li><a href="{{ profile.contributor.get_absolute_url }}">{{ profile }}</a></li>
+ {% else %}
+ <li>{{ profile }}</li>
+ {% endif %}
+ {% empty %}
+ <li>No Profile found</li>
+ {% endfor %}
+ </ul>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
{% endif %}
</div>
</div>
@@ -146,141 +146,141 @@ $(document).ready(function($) {
<div class="tab-pane pt-4" id="support-{{ org.id }}" role="tabpanel" aria-labelledby="support-{{ org.id }}-tab">
<h3>Support history</h3>
{% if org.subsidy_set.all|length > 0 or org.children.all|length > 0 %}
- {% if org.subsidy_set.all|length > 0 %}
- <p>List of the subsidies (in one form or another) which SciPost has received from this Organization. Click on a row to see more details.</p>
- <table class="table table-hover mb-5">
- <thead class="thead-default">
- <tr>
- <th>Type</th>
- <th>Amount</th>
- <th>Date</th>
- </tr>
- </thead>
- <tbody>
- {% for subsidy in org.subsidy_set.all %}
- <tr class="table-row" data-href="{% url 'finances:subsidy_details' pk=subsidy.id %}" style="cursor: pointer;">
- <td>{{ subsidy.get_subsidy_type_display }}</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 %}</td>
- <td>{{ subsidy.date }}{% if subsidy.date_until %} until {{ subsidy.date_until }}{% endif %}</td>
- </tr>
- {% endfor %}
- <tr style="border-top: 2px solid black">
- <td>Total support obtained:</td>
- <td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %}€{{ org.get_total_subsidies_obtained }}{% else %}-{% endif %}</td>
- <td colspan="2">
- </tr>
- </tbody>
- </table>
- {% endif %}
- {% if org.children.all|length > 0 %}
- <p>See subsidies obtained from related organizations
- <ul>
- {% for child in org.children.all %}
- <li><a href="{{ child.get_absolute_url }}">{{ child }}</a></li>
- {% endfor %}
- </ul>
- </p>
- {% endif %}
+ {% if org.subsidy_set.all|length > 0 %}
+ <p>List of the subsidies (in one form or another) which SciPost has received from this Organization. Click on a row to see more details.</p>
+ <table class="table table-hover mb-5">
+ <thead class="thead-default">
+ <tr>
+ <th>Type</th>
+ <th>Amount</th>
+ <th>Date</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for subsidy in org.subsidy_set.all %}
+ <tr class="table-row" data-href="{% url 'finances:subsidy_details' pk=subsidy.id %}" style="cursor: pointer;">
+ <td>{{ subsidy.get_subsidy_type_display }}</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 %}</td>
+ <td>{{ subsidy.date }}{% if subsidy.date_until %} until {{ subsidy.date_until }}{% endif %}</td>
+ </tr>
+ {% endfor %}
+ <tr style="border-top: 2px solid black">
+ <td>Total support obtained:</td>
+ <td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %}€{{ org.get_total_subsidies_obtained }}{% else %}-{% endif %}</td>
+ <td colspan="2">
+ </tr>
+ </tbody>
+ </table>
+ {% endif %}
+ {% if org.children.all|length > 0 %}
+ <p>See subsidies obtained from related organizations
+ <ul>
+ {% for child in org.children.all %}
+ <li><a href="{{ child.get_absolute_url }}">{{ child }}</a></li>
+ {% endfor %}
+ </ul>
+ </p>
+ {% endif %}
{% else %}
- <p><strong>This Organization has <span class="text-danger">not yet</span> supported SciPost.</strong></p>
+ <p><strong>This Organization has <span class="text-danger">not yet</span> supported SciPost.</strong></p>
{% endif %}
</div>
{% if perms.scipost.can_manage_organizations or perms.scipost.can_add_contactperson or "can_view_org_contacts" in user_org_perms %}
- <div class="tab-pane pt-4" id="contacts-{{ org.id }}" role="tabpanel" aria-labelledby="contacts-{{ org.id }}-tab">
- <h3>Contacts (with explicit role)</h3>
- {% if perms.scipost.can_manage_organizations %}
- <ul>
- <li><a href="{% url 'organizations:add_contact' organization_id=org.id %}">Add a new Contact</a></li>
- </ul>
- {% endif %}
- <table class="table">
- <tr>
- <th>Name</th>
- <th>Kind</th>
- <th>Date from</th>
- <th>Date until</th>
- {% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
- <th>Account<br/>active?</th>
- <th>Actions</th>
- {% endif %}
- </tr>
- {% for contactrole in org.contactrole_set.all %}
- <tr>
- <td>{{ contactrole.contact }}</td>
- <td>{{ contactrole.get_kind_display }}</td>
- <td>{{ contactrole.date_from|date:"Y-m-d" }}</td>
- <td>{{ contactrole.date_until|date:"Y-m-d" }}</td>
- {% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
- <td>{% if contactrole.contact.user.is_active %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
- <td>
- <ul class="list-unstyled">
- {% if perms.scipost.can_manage_organizations %}
- <li><a href="{% url 'organizations:email_contactrole' contactrole_id=contactrole.id %}">Email (generic)</a></li>
- <li><a href="{% url 'organizations:email_contactrole' contactrole_id=contactrole.id mail='renewal' %}">Email (subsidy renewal)</a></li>
- {% endif %}
+ <div class="tab-pane pt-4" id="contacts-{{ org.id }}" role="tabpanel" aria-labelledby="contacts-{{ org.id }}-tab">
+ <h3>Contacts (with explicit role)</h3>
+ {% if perms.scipost.can_manage_organizations %}
+ <ul>
+ <li><a href="{% url 'organizations:add_contact' organization_id=org.id %}">Add a new Contact</a></li>
+ </ul>
+ {% endif %}
+ <table class="table">
+ <tr>
+ <th>Name</th>
+ <th>Kind</th>
+ <th>Date from</th>
+ <th>Date until</th>
+ {% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
+ <th>Account<br/>active?</th>
+ <th>Actions</th>
+ {% endif %}
+ </tr>
+ {% for contactrole in org.contactrole_set.all %}
+ <tr>
+ <td>{{ contactrole.contact }}</td>
+ <td>{{ contactrole.get_kind_display }}</td>
+ <td>{{ contactrole.date_from|date:"Y-m-d" }}</td>
+ <td>{{ contactrole.date_until|date:"Y-m-d" }}</td>
{% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
- <li><a href="{% url 'organizations:contactrole_update' pk=contactrole.id %}"><span class="text-warning">Update</span></a></li>
+ <td>{% if contactrole.contact.user.is_active %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ <td>
+ <ul class="list-unstyled">
+ {% if perms.scipost.can_manage_organizations %}
+ <li><a href="{% url 'organizations:email_contactrole' contactrole_id=contactrole.id %}">Email (generic)</a></li>
+ <li><a href="{% url 'organizations:email_contactrole' contactrole_id=contactrole.id mail='renewal' %}">Email (subsidy renewal)</a></li>
+ {% endif %}
+ {% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
+ <li><a href="{% url 'organizations:contactrole_update' pk=contactrole.id %}"><span class="text-warning">Update</span></a></li>
+ {% endif %}
+ {% if perms.scipost.can_manage_organizations %}
+ <li><a href="{% url 'organizations:contactrole_delete' pk=contactrole.id %}"><span class="text-danger">Delete</span></a></li>
+ {% endif %}
+ </ul>
+ </td>
{% endif %}
- {% if perms.scipost.can_manage_organizations %}
- <li><a href="{% url 'organizations:contactrole_delete' pk=contactrole.id %}"><span class="text-danger">Delete</span></a></li>
- {% endif %}
- </ul>
- </td>
- {% endif %}
- </tr>
- {% endfor %}
- </table>
+ </tr>
+ {% endfor %}
+ </table>
- <h3>Contact persons</h3>
- {% if perms.scipost.can_manage_organizations or perms.scipost.can_add_contactperson %}
- <ul>
- <li><a href="{% url 'organizations:contactperson_create' organization_id=org.id %}">Add/suggest a contact person for this Organization</a></li>
- </ul>
- {% endif %}
- <table class="table">
- {% for contactperson in org.contactperson_set.all %}
- <tr>
- <td>{{ contactperson }}</td>
- <td>{{ contactperson.email }}</td>
- <td>{{ contactperson.role }}</td>
- {% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
- <td>
- <ul class="list-unstyled">
- {% if perms.scipost.can_manage_organizations %}
- <li><a href="{% url 'organizations:email_contactperson' contactperson_id=contactperson.id %}">Email (initial)</a></li>
- <li><a href="{% url 'organizations:email_contactperson' contactperson_id=contactperson.id mail='followup' %}">Email (followup)</a></li>
- <li><a href="{% url 'organizations:add_contact' organization_id=org.id contactperson_id=contactperson.id %}"><span class="text-success">Upgrade to Contact</span></a></li>
+ <h3>Contact persons</h3>
+ {% if perms.scipost.can_manage_organizations or perms.scipost.can_add_contactperson %}
+ <ul>
+ <li><a href="{% url 'organizations:contactperson_create' organization_id=org.id %}">Add/suggest a contact person for this Organization</a></li>
+ </ul>
+ {% endif %}
+ <table class="table">
+ {% for contactperson in org.contactperson_set.all %}
+ <tr>
+ <td>{{ contactperson }}</td>
+ <td>{{ contactperson.email }}</td>
+ <td>{{ contactperson.role }}</td>
+ {% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
+ <td>
+ <ul class="list-unstyled">
+ {% if perms.scipost.can_manage_organizations %}
+ <li><a href="{% url 'organizations:email_contactperson' contactperson_id=contactperson.id %}">Email (initial)</a></li>
+ <li><a href="{% url 'organizations:email_contactperson' contactperson_id=contactperson.id mail='followup' %}">Email (followup)</a></li>
+ <li><a href="{% url 'organizations:add_contact' organization_id=org.id contactperson_id=contactperson.id %}"><span class="text-success">Upgrade to Contact</span></a></li>
+ {% endif %}
+ <li><a href="{% url 'organizations:contactperson_update' pk=contactperson.id %}"><span class="text-warning">Update</span></a></li>
+ <li><a href="{% url 'organizations:contactperson_delete' pk=contactperson.id %}"><span class="text-danger">Delete</span></a></li>
+ </ul>
+ </td>
{% endif %}
- <li><a href="{% url 'organizations:contactperson_update' pk=contactperson.id %}"><span class="text-warning">Update</span></a></li>
- <li><a href="{% url 'organizations:contactperson_delete' pk=contactperson.id %}"><span class="text-danger">Delete</span></a></li>
- </ul>
- </td>
- {% endif %}
- </tr>
- {% empty %}
- <tr>
- <td>No contact person defined</td>
- </tr>
- {% endfor %}
- </table>
- </div>
+ </tr>
+ {% empty %}
+ <tr>
+ <td>No contact person defined</td>
+ </tr>
+ {% endfor %}
+ </table>
+ </div>
{% endif %}
{% if perms.scipost.can_manage_organizations %}
- <div class="tab-pane pt-4" id="events-{{ org.id }}" role="tabpanel" aria-labelledby="events-{{ org.id }}-tab">
- <h3>Events</h3>
- <ul>
- <li><a href="{% url 'organizations:organizationevent_create' pk=org.id %}">Add an event</a></li>
- </ul>
- <ul>
- {% for event in org.organizationevent_set.all %}
- {% include 'organizations/_organization_event_li.html' with event=event %}
- {% empty %}
- <li>No event found</li>
- {% endfor %}
- </ul>
- </div>
+ <div class="tab-pane pt-4" id="events-{{ org.id }}" role="tabpanel" aria-labelledby="events-{{ org.id }}-tab">
+ <h3>Events</h3>
+ <ul>
+ <li><a href="{% url 'organizations:organizationevent_create' pk=org.id %}">Add an event</a></li>
+ </ul>
+ <ul>
+ {% for event in org.organizationevent_set.all %}
+ {% include 'organizations/_organization_event_li.html' with event=event %}
+ {% empty %}
+ <li>No event found</li>
+ {% endfor %}
+ </ul>
+ </div>
{% endif %}
</div>
diff --git a/organizations/templates/organizations/_organization_details_contents.html b/organizations/templates/organizations/_organization_details_contents.html
index 3e54d17a1..a396d2a2c 100644
--- a/organizations/templates/organizations/_organization_details_contents.html
+++ b/organizations/templates/organizations/_organization_details_contents.html
@@ -5,9 +5,9 @@
<td>Name</td><td>{{ org.name }}</td>
</tr>
{% if org.name_original %}
- <tr>
- <td>Name (original vn)</td><td>{{ org.name_original }}</td>
- </tr>
+ <tr>
+ <td>Name (original vn)</td><td>{{ org.name_original }}</td>
+ </tr>
{% endif %}
<tr>
<td>Acronym</td><td>{{ org.acronym }}</td>
@@ -31,14 +31,14 @@
<td>Crossref Org ID (link)</td><td>{% if org.crossref_json.org_id %}<a href="https://crossref.org" target="_blank">{{ org.crossref_json.org_id }}{% else %}No Crossref Org ID found{% endif %}</td>
</tr>
{% if org.parent %}
- <tr>
- <td>Parent</td><td><a href="{{ org.parent.get_absolute_url }}">{{ org.parent }}</a></td>
- </tr>
+ <tr>
+ <td>Parent</td><td><a href="{{ org.parent.get_absolute_url }}">{{ org.parent }}</a></td>
+ </tr>
{% endif %}
{% if org.superseded_by %}
- <tr>
- <td>Superseded by</td><td><a href="{{ org.superseded_by.get_absolute_url }}">{{ org.superseded_by }}</a></td>
- </tr>
+ <tr>
+ <td>Superseded by</td><td><a href="{{ org.superseded_by.get_absolute_url }}">{{ org.superseded_by }}</a></td>
+ </tr>
{% endif %}
</table>
</div>
diff --git a/organizations/templates/organizations/_organization_event_li.html b/organizations/templates/organizations/_organization_event_li.html
index ec28cba2e..9ee69200a 100644
--- a/organizations/templates/organizations/_organization_event_li.html
+++ b/organizations/templates/organizations/_organization_event_li.html
@@ -2,6 +2,6 @@
<div class="font-weight-bold">{{ event.get_event_display }} <small class="text-muted">noted {{ event.noted_on }} {% if event.noted_by %}by {{ event.noted_by }}{% endif %}</small>
</div>
{% if event.comments %}
- <div>{{ event.comments|linebreaks }}</div>
+ <div>{{ event.comments|linebreaks }}</div>
{% endif %}
</li>
diff --git a/organizations/templates/organizations/activate_account.html b/organizations/templates/organizations/activate_account.html
index aa948a060..54721f15b 100644
--- a/organizations/templates/organizations/activate_account.html
+++ b/organizations/templates/organizations/activate_account.html
@@ -6,15 +6,15 @@
{% block content %}
-<h1 class="highlight">Activate Account</h1>
-<div class="row justify-content-center">
+ <h1 class="highlight">Activate Account</h1>
+ <div class="row justify-content-center">
<div class="col-md-8">
- <h2>{{ contact.get_title_display }} {{ contact.user.first_name }} {{ contact.user.last_name }}</h2>
- <h3>{{ contact.user.email }}</h3>
+ <h2>{{ contact.get_title_display }} {{ contact.user.first_name }} {{ contact.user.last_name }}</h2>
+ <h3>{{ contact.user.email }}</h3>
</div>
-</div>
+ </div>
-<div class="row justify-content-center">
+ <div class="row justify-content-center">
<div class="col-md-8 mb-5">
<form method="post">
{% csrf_token %}
@@ -22,6 +22,6 @@
<input class="btn btn-primary" type="submit" value="Activate"/>
</form>
</div>
-</div>
+ </div>
{% endblock content %}
diff --git a/organizations/templates/organizations/base.html b/organizations/templates/organizations/base.html
index d50b53a53..e5d364f4d 100644
--- a/organizations/templates/organizations/base.html
+++ b/organizations/templates/organizations/base.html
@@ -5,13 +5,13 @@
{% block breadcrumb %}
- <div class="breadcrumb-container">
- <div class="container">
- <nav class="breadcrumb">
- {% block breadcrumb_items %}
- <a href="{% url 'organizations:organizations' %}" class="breadcrumb-item">Organizations</a>
- {% endblock %}
- </nav>
- </div>
+ <div class="breadcrumb-container">
+ <div class="container">
+ <nav class="breadcrumb">
+ {% block breadcrumb_items %}
+ <a href="{% url 'organizations:organizations' %}" class="breadcrumb-item">Organizations</a>
+ {% endblock %}
+ </nav>
</div>
+ </div>
{% endblock %}
diff --git a/organizations/templates/organizations/contact_detail.html b/organizations/templates/organizations/contact_detail.html
index a52811e18..5e67b5060 100644
--- a/organizations/templates/organizations/contact_detail.html
+++ b/organizations/templates/organizations/contact_detail.html
@@ -5,66 +5,66 @@
{% block pagetitle %}: Contact details{% endblock pagetitle %}
{% block breadcrumb_items %}
-{{ block.super }}
-<span class="breadcrumb-item">Contacts</span>
-<span class="breadcrumb-item">{{ contact }}</span>
+ {{ block.super }}
+ <span class="breadcrumb-item">Contacts</span>
+ <span class="breadcrumb-item">{{ contact }}</span>
{% endblock %}
{% block content %}
-<div class="row">
- <div class="col-12">
- <h3 class="highlight">Contact details</h3>
- <table class="table">
- <tr>
- <td>Name</td>
- <td>{{ contact.user.last_name }}, {{ contact.get_title_display }} {{ contact.user.first_name }}</td>
- </tr>
- <tr>
- <td>Email</td>
- <td>{{ contact.user.email }}</td>
- </tr>
- <tr>
- <td>Account active?</td>
- <td>{% if contact.user.is_active %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
- </tr>
- <tr>
- <td>Account created</td>
- <td>{{ contact.user.date_joined }}</td>
- </tr>
- <tr>
- <td>Last login</td>
- <td>{{ contact.user.last_login }}</td>
- </tr>
- </table>
+ <div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Contact details</h3>
+ <table class="table">
+ <tr>
+ <td>Name</td>
+ <td>{{ contact.user.last_name }}, {{ contact.get_title_display }} {{ contact.user.first_name }}</td>
+ </tr>
+ <tr>
+ <td>Email</td>
+ <td>{{ contact.user.email }}</td>
+ </tr>
+ <tr>
+ <td>Account active?</td>
+ <td>{% if contact.user.is_active %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ </tr>
+ <tr>
+ <td>Account created</td>
+ <td>{{ contact.user.date_joined }}</td>
+ </tr>
+ <tr>
+ <td>Last login</td>
+ <td>{{ contact.user.last_login }}</td>
+ </tr>
+ </table>
- <h4>Roles:</h4>
- <table class="table">
- <tr>
- <th>Organization</th>
- <th>Kind</th>
- <th>Date from</th>
- <th>Date until</th>
- <th>Actions</th>
- </tr>
- {% for contactrole in contact.roles.all %}
- <tr>
- <td><a href="{{ contactrole.organization.get_absolute_url }}">{{ contactrole.organization }}</a></td>
- <td>{{ contactrole.get_kind_display }}</td>
- <td>{{ contactrole.date_from|date:"Y-m-d" }}</td>
- <td>{{ contactrole.date_until|date:"Y-m-d" }}</td>
- <td>
- <ul class="list-unstyled">
- {% if perms.scipost.can_manage_organizations %}
- <li><a href="{% url 'organizations:contactrole_update' pk=contactrole.id %}"><span class="text-warning">Update</span></a></li>
- <li><a href="{% url 'organizations:contactrole_delete' pk=contactrole.id %}"><span class="text-danger">Delete</span></a></li>
- {% endif %}
- </ul>
- </td>
- </tr>
- {% endfor %}
- </table>
+ <h4>Roles:</h4>
+ <table class="table">
+ <tr>
+ <th>Organization</th>
+ <th>Kind</th>
+ <th>Date from</th>
+ <th>Date until</th>
+ <th>Actions</th>
+ </tr>
+ {% for contactrole in contact.roles.all %}
+ <tr>
+ <td><a href="{{ contactrole.organization.get_absolute_url }}">{{ contactrole.organization }}</a></td>
+ <td>{{ contactrole.get_kind_display }}</td>
+ <td>{{ contactrole.date_from|date:"Y-m-d" }}</td>
+ <td>{{ contactrole.date_until|date:"Y-m-d" }}</td>
+ <td>
+ <ul class="list-unstyled">
+ {% if perms.scipost.can_manage_organizations %}
+ <li><a href="{% url 'organizations:contactrole_update' pk=contactrole.id %}"><span class="text-warning">Update</span></a></li>
+ <li><a href="{% url 'organizations:contactrole_delete' pk=contactrole.id %}"><span class="text-danger">Delete</span></a></li>
+ {% endif %}
+ </ul>
+ </td>
+ </tr>
+ {% endfor %}
+ </table>
+ </div>
</div>
-</div>
{% endblock content %}
diff --git a/organizations/templates/organizations/contactperson_confirm_delete.html b/organizations/templates/organizations/contactperson_confirm_delete.html
index 7f1d9fa12..5ee7f8cc5 100644
--- a/organizations/templates/organizations/contactperson_confirm_delete.html
+++ b/organizations/templates/organizations/contactperson_confirm_delete.html
@@ -3,28 +3,28 @@
{% load bootstrap %}
{% block breadcrumb_items %}
-{{ block.super }}
-<span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
-<span class="breadcrumb-item">Confirm deletetion</span>
+ {{ block.super }}
+ <span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
+ <span class="breadcrumb-item">Confirm deletetion</span>
{% endblock %}
{% block pagetitle %}: Delete Contact Person{% endblock pagetitle %}
{% block content %}
-<div class="row">
+ <div class="row">
<div class="col-12">
- <h1 class="highlight">Delete Contact Person</h1>
- {{ object }}
+ <h1 class="highlight">Delete Contact Person</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 Contact Person?</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 Contact Person?</h3>
- <input type="submit" class="btn btn-danger" value="Yes, delete it" />
- </form>
</div>
-</div>
{% endblock content %}
diff --git a/organizations/templates/organizations/contactperson_form.html b/organizations/templates/organizations/contactperson_form.html
index 029203f09..c062581e6 100644
--- a/organizations/templates/organizations/contactperson_form.html
+++ b/organizations/templates/organizations/contactperson_form.html
@@ -3,22 +3,22 @@
{% load bootstrap %}
{% block breadcrumb_items %}
-{{ block.super }}
-<span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
-<span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new Contact Person{% endif %}</span>
+ {{ block.super }}
+ <span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
+ <span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new Contact Person{% endif %}</span>
{% endblock %}
{% block pagetitle %}: Contact Person{% 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 %}
diff --git a/organizations/templates/organizations/contactperson_list.html b/organizations/templates/organizations/contactperson_list.html
index 4267de192..5c38a7e3a 100644
--- a/organizations/templates/organizations/contactperson_list.html
+++ b/organizations/templates/organizations/contactperson_list.html
@@ -5,45 +5,45 @@
{% load bootstrap %}
{% block breadcrumb_items %}
-{{ block.super }}
-<span class="breadcrumb-item">Contact Persons</span>
+ {{ block.super }}
+ <span class="breadcrumb-item">Contact Persons</span>
{% endblock %}
{% block content %}
-<div class="row">
- <div class="col-12">
- <h3 class="highlight">Contact Persons</h3>
- <p>Contact Persons are by definition employees of an Organization, who play a role of potential relevance to SciPost's sponsoring efforts. SciPost Admin takes charge of contacting Contact Persons listed here, to try to promote them to registered Contacts (members of the Sponsors Board).</p>
- <p>Do you people who you think should appear on this list?</p>
- <p>Are they not in our list of registered Contacts (which you can view on your <a href="{% url 'organizations:dashboard' %}" target="_blank">dashboard</a> under the Sponsors Board tab)?</p>
- <p>Then please help us out: <a href="{% url 'organizations:contactperson_create' %}">add a Contact Person</a> instance.</p>
+ <div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Contact Persons</h3>
+ <p>Contact Persons are by definition employees of an Organization, who play a role of potential relevance to SciPost's sponsoring efforts. SciPost Admin takes charge of contacting Contact Persons listed here, to try to promote them to registered Contacts (members of the Sponsors Board).</p>
+ <p>Do you people who you think should appear on this list?</p>
+ <p>Are they not in our list of registered Contacts (which you can view on your <a href="{% url 'organizations:dashboard' %}" target="_blank">dashboard</a> under the Sponsors Board tab)?</p>
+ <p>Then please help us out: <a href="{% url 'organizations:contactperson_create' %}">add a Contact Person</a> instance.</p>
- <table class="table">
- <thead class="thead-default">
- <tr>
- <td>Name</td>
- <td>Organization</td>
- <td>Role</td>
- <td>Actions</td>
- </tr>
- </thead>
- <tbody>
- {% for cp in object_list %}
- <tr>
- <td>{{ cp.last_name }}, {{ cp.get_title_display }} {{ cp.first_name }}</td>
- <td><a href="{{ cp.organization.get_absolute_url }}">{{ cp.organization }}</a></td>
- <td>{{ cp.role }}</td>
- <td>
- <ul class="list-unstyled">
- <li><a href="{% url 'organizations:contactperson_update' pk=cp.id %}"><span class="text-warning">Update</span></a></li>
- </ul>
- </td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
+ <table class="table">
+ <thead class="thead-default">
+ <tr>
+ <td>Name</td>
+ <td>Organization</td>
+ <td>Role</td>
+ <td>Actions</td>
+ </tr>
+ </thead>
+ <tbody>
+ {% for cp in object_list %}
+ <tr>
+ <td>{{ cp.last_name }}, {{ cp.get_title_display }} {{ cp.first_name }}</td>
+ <td><a href="{{ cp.organization.get_absolute_url }}">{{ cp.organization }}</a></td>
+ <td>{{ cp.role }}</td>
+ <td>
+ <ul class="list-unstyled">
+ <li><a href="{% url 'organizations:contactperson_update' pk=cp.id %}"><span class="text-warning">Update</span></a></li>
+ </ul>
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
</div>
-</div>
{% endblock content %}
diff --git a/organizations/templates/organizations/contactrole_confirm_delete.html b/organizations/templates/organizations/contactrole_confirm_delete.html
index f0d3ccfbc..91a803e56 100644
--- a/organizations/templates/organizations/contactrole_confirm_delete.html
+++ b/organizations/templates/organizations/contactrole_confirm_delete.html
@@ -3,28 +3,28 @@
{% load bootstrap %}
{% block breadcrumb_items %}
-{{ block.super }}
-<span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
-<span class="breadcrumb-item">Confirm deletetion</span>
+ {{ block.super }}
+ <span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
+ <span class="breadcrumb-item">Confirm deletetion</span>
{% endblock %}
{% block pagetitle %}: Delete ContactRole{% endblock pagetitle %}
{% block content %}
-<div class="row">
+ <div class="row">
<div class="col-12">
- <h1 class="highlight">Delete ContactRole</h1>
- {{ object }}
+ <h1 class="highlight">Delete ContactRole</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 ContactRole?</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 ContactRole?</h3>
- <input type="submit" class="btn btn-danger" value="Yes, delete it" />
- </form>
</div>
-</div>
{% endblock content %}
diff --git a/organizations/templates/organizations/contactrole_form.html b/organizations/templates/organizations/contactrole_form.html
index 40988e470..a4ea44531 100644
--- a/organizations/templates/organizations/contactrole_form.html
+++ b/organizations/templates/organizations/contactrole_form.html
@@ -3,27 +3,27 @@
{% load bootstrap %}
{% block breadcrumb_items %}
-{{ block.super }}
-<span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
-<span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new ContactRole{% endif %}</span>
+ {{ block.super }}
+ <span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
+ <span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new ContactRole{% endif %}</span>
{% endblock %}
{% block pagetitle %}: ContactRole{% 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/organizations/templates/organizations/dashboard.html b/organizations/templates/organizations/dashboard.html
index ee8558a14..d1176626f 100644
--- a/organizations/templates/organizations/dashboard.html
+++ b/organizations/templates/organizations/dashboard.html
@@ -5,216 +5,216 @@
{% block pagetitle %}: organizations dashboard{% endblock pagetitle %}
{% 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 content %}
-<div class="row">
- <div class="col-12">
- {% if request.user.org_contact %}
- <h1 class="highlight">Welcome to your Organizations dashboard, {{ request.user.org_contact.get_title_display }} {{ request.user.last_name }}</h1>
- {% elif perms.scipost.can_manage_organizations %}
- <h1 class="highlight">Organizations dashboard</h1>
- {% endif %}
+ <div class="row">
+ <div class="col-12">
+ {% if request.user.org_contact %}
+ <h1 class="highlight">Welcome to your Organizations dashboard, {{ request.user.org_contact.get_title_display }} {{ request.user.last_name }}</h1>
+ {% elif perms.scipost.can_manage_organizations %}
+ <h1 class="highlight">Organizations dashboard</h1>
+ {% endif %}
+ </div>
</div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <div class="tab-nav-container">
- <div class="tab-nav-inner">
- <ul class="nav btn-group personal-page-nav" role="tablist">
- {% if request.user.org_contact %}
- <li class="nav-item btn btn-outline-secondary">
- <a href="#account" class="nav-link" data-toggle="tab">Account</a>
- </li>
- <li class="nav-item btn btn-outline-secondary">
- <a href="#own_roles" class="nav-link active" data-toggle="tab">Your roles</a>
- </li>
- <li class="nav-item btn btn-outline-secondary">
- <a href="#subsidies" class="nav-link" data-toggle="tab">Subsidies<br/><span class="small text-muted">[from your Orgs]</span></a>
- </li>
- {% endif %}
- <li class="nav-item btn btn-outline-secondary">
- <a href="{% url 'finances:subsidies' %}" class="nav-link" target="_blank">Subsidies<br/><span class="small text-muted">[full list]</span></a>
- </li>
- <li class="nav-item btn btn-outline-secondary">
- <a href="{% url 'forums:forums' %}" class="nav-link" target="_blank">Forums<br/><span class="small text-muted">[discussion boards<br/>and meetings]</span></a>
- </li>
- <li class="nav-item btn btn-outline-secondary">
- <a href="#board" class="nav-link" data-toggle="tab">Sponsors Board<br/><span class="small text-muted">[registered Contacts]</span></a>
- </li>
- <li class="nav-item btn btn-outline-secondary">
- <a href="{% url 'organizations:contactperson_list' %}" class="nav-link" target="_blank">Contact Persons<br/><span class="small text-muted">[unregistered contacts]</span></a>
- </li>
- {% if perms.scipost.can_manage_organizations %}
- <li class="nav-item btn btn-outline-secondary">
- <a href="{% url 'organizations:organizationevent_list' %}" class="nav-link" target="_blank">Events</a>
- </li>
- {% endif %}
- </ul>
+
+ <div class="row">
+ <div class="col-12">
+ <div class="tab-nav-container">
+ <div class="tab-nav-inner">
+ <ul class="nav btn-group personal-page-nav" role="tablist">
+ {% if request.user.org_contact %}
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="#account" class="nav-link" data-toggle="tab">Account</a>
+ </li>
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="#own_roles" class="nav-link active" data-toggle="tab">Your roles</a>
+ </li>
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="#subsidies" class="nav-link" data-toggle="tab">Subsidies<br/><span class="small text-muted">[from your Orgs]</span></a>
+ </li>
+ {% endif %}
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="{% url 'finances:subsidies' %}" class="nav-link" target="_blank">Subsidies<br/><span class="small text-muted">[full list]</span></a>
+ </li>
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="{% url 'forums:forums' %}" class="nav-link" target="_blank">Forums<br/><span class="small text-muted">[discussion boards<br/>and meetings]</span></a>
+ </li>
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="#board" class="nav-link" data-toggle="tab">Sponsors Board<br/><span class="small text-muted">[registered Contacts]</span></a>
+ </li>
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="{% url 'organizations:contactperson_list' %}" class="nav-link" target="_blank">Contact Persons<br/><span class="small text-muted">[unregistered contacts]</span></a>
+ </li>
+ {% if perms.scipost.can_manage_organizations %}
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="{% url 'organizations:organizationevent_list' %}" class="nav-link" target="_blank">Events</a>
+ </li>
+ {% endif %}
+ </ul>
+ </div>
</div>
</div>
</div>
-</div>
-<div class="tab-content">
+ <div class="tab-content">
- <div class="tab-pane" id="account" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <h2 class="highlight">Your account</h2>
+ <div class="tab-pane" id="account" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <h2 class="highlight">Your account</h2>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-12">
- <p>{{ request.user.org_contact }}</p>
+ <div class="row">
+ <div class="col-12">
+ <p>{{ request.user.org_contact }}</p>
- <h3>Update your personal data or password</h3>
- <ul>
- <li><a href="{% url 'scipost:update_personal_data' %}">Update your personal data</a></li>
- <li><a href="{% url 'scipost:password_change' %}">Change your password</a></li>
- </ul>
+ <h3>Update your personal data or password</h3>
+ <ul>
+ <li><a href="{% url 'scipost:update_personal_data' %}">Update your personal data</a></li>
+ <li><a href="{% url 'scipost:password_change' %}">Change your password</a></li>
+ </ul>
+ </div>
</div>
</div>
- </div>
- <div class="tab-pane{% if request.user.org_contact %} active{% endif %}" id="own_roles" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <h2 class="highlight">Your Organizations-related roles</h2>
- <p>Click on an Organization's name to see its details.</p>
- <table class="table">
- <tr>
- <th>Organization</th>
- <th>Role kind</th>
- <th>Date from</th>
- <th>Date until</th>
- <th>Actions</th>
- </tr>
- {% for role in own_roles %}
- <tr>
- <td><a href="{{ role.organization.get_absolute_url }}">{{ role.organization }}</a></td>
- <td>{{ role.get_kind_display }}</td>
- <td>{{ role.date_from|date:"Y-m-d" }}</td>
- <td>{{ role.date_until|date:"Y-m-d" }}</td>
- <td><a href="{% url 'organizations:contactrole_update' pk=role.id %}"><span class="text-warning">Update</span></a></td>
- </tr>
- {% empty %}
- <tr>
- <td>No role has been defined</td>
- </tr>
- {% endfor %}
- </table>
+ <div class="tab-pane{% if request.user.org_contact %} active{% endif %}" id="own_roles" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <h2 class="highlight">Your Organizations-related roles</h2>
+ <p>Click on an Organization's name to see its details.</p>
+ <table class="table">
+ <tr>
+ <th>Organization</th>
+ <th>Role kind</th>
+ <th>Date from</th>
+ <th>Date until</th>
+ <th>Actions</th>
+ </tr>
+ {% for role in own_roles %}
+ <tr>
+ <td><a href="{{ role.organization.get_absolute_url }}">{{ role.organization }}</a></td>
+ <td>{{ role.get_kind_display }}</td>
+ <td>{{ role.date_from|date:"Y-m-d" }}</td>
+ <td>{{ role.date_until|date:"Y-m-d" }}</td>
+ <td><a href="{% url 'organizations:contactrole_update' pk=role.id %}"><span class="text-warning">Update</span></a></td>
+ </tr>
+ {% empty %}
+ <tr>
+ <td>No role has been defined</td>
+ </tr>
+ {% endfor %}
+ </table>
+ </div>
</div>
</div>
- </div>
- <div class="tab-pane" id="subsidies" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <h2 class="highlight">Subsidies from your Organizations</h2>
+ <div class="tab-pane" id="subsidies" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <h2 class="highlight">Subsidies from your Organizations</h2>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-12">
- <ul>
- {% for role in request.user.org_contact.roles.all %}
- <li>
- <h4>{{ role.organization }}</h4>
-
- {% if role.organization.subsidy_set.all|length > 0 %}
- <p>List of the subsidies (in one form or another) which SciPost has received from this Organization. Click on a row to see more details.</p>
- <table class="table table-hover mb-5">
- <thead class="thead-default">
- <tr>
- <th>Type</th>
- <th>Amount</th>
- <th>Date</th>
- </tr>
- </thead>
- <tbody>
- {% for subsidy in role.organization.subsidy_set.all %}
- <tr class="table-row" data-href="{% url 'finances:subsidy_details' pk=subsidy.id %}" style="cursor: pointer;">
- <td>{{ subsidy.get_subsidy_type_display }}</td>
- <td>€{{ subsidy.amount }}</td>
- <td>{{ subsidy.date }}{% if subsidy.date_until %} until {{ subsidy.date_until }}{% endif %}</td>
- </tr>
- {% endfor %}
- <tr style="border-top: 2px solid black">
- <td>Total support obtained:</td>
- <td>€{{ role.organization.get_total_subsidies_obtained }}</td>
- <td colspan="2">
- </tr>
- </tbody>
- </table>
- {% else %}
- <p><strong>This Organization has <span class="text-danger">not yet</span> supported SciPost.</strong></p>
- {% endif %}
- </li>
- {% empty %}
- <li>No Organization found</li>
- {% endfor %}
- </ul>
+ <div class="row">
+ <div class="col-12">
+ <ul>
+ {% for role in request.user.org_contact.roles.all %}
+ <li>
+ <h4>{{ role.organization }}</h4>
+
+ {% if role.organization.subsidy_set.all|length > 0 %}
+ <p>List of the subsidies (in one form or another) which SciPost has received from this Organization. Click on a row to see more details.</p>
+ <table class="table table-hover mb-5">
+ <thead class="thead-default">
+ <tr>
+ <th>Type</th>
+ <th>Amount</th>
+ <th>Date</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for subsidy in role.organization.subsidy_set.all %}
+ <tr class="table-row" data-href="{% url 'finances:subsidy_details' pk=subsidy.id %}" style="cursor: pointer;">
+ <td>{{ subsidy.get_subsidy_type_display }}</td>
+ <td>€{{ subsidy.amount }}</td>
+ <td>{{ subsidy.date }}{% if subsidy.date_until %} until {{ subsidy.date_until }}{% endif %}</td>
+ </tr>
+ {% endfor %}
+ <tr style="border-top: 2px solid black">
+ <td>Total support obtained:</td>
+ <td>€{{ role.organization.get_total_subsidies_obtained }}</td>
+ <td colspan="2">
+ </tr>
+ </tbody>
+ </table>
+ {% else %}
+ <p><strong>This Organization has <span class="text-danger">not yet</span> supported SciPost.</strong></p>
+ {% endif %}
+ </li>
+ {% empty %}
+ <li>No Organization found</li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
</div>
- </div>
- <div class="tab-pane" id="board" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <h2 class="highlight">Sponsors Board</h2>
+ <div class="tab-pane" id="board" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <h2 class="highlight">Sponsors Board</h2>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-12">
- <p>The Sponsors Board is composed of all registered Organization Contacts.</p>
- <p>Do you know people who you think should appear on this list? Help us by checking if they are already on our <a href="{% url 'organizations:contactperson_list' %}" target="_blank">list of Contact Persons</a>, and if not, please add them!</p>
- <h3>Active Contacts</h3>
- <table class="table">
- <thead class="thead-default">
- <tr>
- <th>Name</th>
- <th>Organization(s) / role(s)</th>
- {% if perms.scipost.can_manage_organizations %}
- <th>Account<br/>active?</th>
- {% endif %}
- </tr>
- </thead>
- <tbody>
- {% for contact in contacts %}
- <tr>
- <td><a href="{% url 'organizations:contact_details' pk=contact.id %}">{{ contact }}</a></td>
- <td>
- <ul class="list-group list-group-flush">
- {% for role in contact.roles.all %}
- <li class="list-group-item"><a href="{{ role.organization.get_absolute_url }}" target="_blank">{{ role.organization }}</a> / {{ role.get_kind_display }}</li>
- {% empty %}
- <li class="list-group-item">No Organization found</li>
- {% endfor %}
- </ul>
- </td>
- {% if perms.scipost.can_manage_organizations %}
- <td>{% if contact.user.is_active %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
- {% endif %}
- </tr>
- {% empty %}
- <tr><td>No contact found</td></tr>
- {% endfor %}
- </tbody>
- </table>
+ <div class="row">
+ <div class="col-12">
+ <p>The Sponsors Board is composed of all registered Organization Contacts.</p>
+ <p>Do you know people who you think should appear on this list? Help us by checking if they are already on our <a href="{% url 'organizations:contactperson_list' %}" target="_blank">list of Contact Persons</a>, and if not, please add them!</p>
+ <h3>Active Contacts</h3>
+ <table class="table">
+ <thead class="thead-default">
+ <tr>
+ <th>Name</th>
+ <th>Organization(s) / role(s)</th>
+ {% if perms.scipost.can_manage_organizations %}
+ <th>Account<br/>active?</th>
+ {% endif %}
+ </tr>
+ </thead>
+ <tbody>
+ {% for contact in contacts %}
+ <tr>
+ <td><a href="{% url 'organizations:contact_details' pk=contact.id %}">{{ contact }}</a></td>
+ <td>
+ <ul class="list-group list-group-flush">
+ {% for role in contact.roles.all %}
+ <li class="list-group-item"><a href="{{ role.organization.get_absolute_url }}" target="_blank">{{ role.organization }}</a> / {{ role.get_kind_display }}</li>
+ {% empty %}
+ <li class="list-group-item">No Organization found</li>
+ {% endfor %}
+ </ul>
+ </td>
+ {% if perms.scipost.can_manage_organizations %}
+ <td>{% if contact.user.is_active %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ {% endif %}
+ </tr>
+ {% empty %}
+ <tr><td>No contact found</td></tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
</div>
</div>
- </div>
-</div>
+ </div>
{% endblock content %}
diff --git a/organizations/templates/organizations/organization_add_contact.html b/organizations/templates/organizations/organization_add_contact.html
index 061b24c32..3556c48fc 100644
--- a/organizations/templates/organizations/organization_add_contact.html
+++ b/organizations/templates/organizations/organization_add_contact.html
@@ -1,8 +1,8 @@
{% extends 'scipost/base.html' %}
{% block breadcrumb_items %}
- {{block.super}}
- <span class="breadcrumb-item">Add Contact</span>
+ {{block.super}}
+ <span class="breadcrumb-item">Add Contact</span>
{% endblock %}
{% block pagetitle %}{{block.super}} Add Contact{% endblock pagetitle %}
@@ -11,23 +11,23 @@
{% block content %}
-<div class="row">
+ <div class="row">
<div class="col-12">
- <h1 class="highlight">Add Contact for Organization {{ organization }}</h1>
+ <h1 class="highlight">Add Contact for Organization {{ organization }}</h1>
</div>
-</div>
+ </div>
-<div class="row">
+ <div class="row">
<div class="col-12">
<form method="post">
{% csrf_token %}
<div class="mb-5">
- {{ form|bootstrap }}
+ {{ form|bootstrap }}
</div>
<input class="btn btn-primary" type="submit" value="Submit"/>
</form>
</div>
-</div>
+ </div>
{% endblock content %}
diff --git a/organizations/templates/organizations/organization_confirm_delete.html b/organizations/templates/organizations/organization_confirm_delete.html
index 600b75bb3..a986020cf 100644
--- a/organizations/templates/organizations/organization_confirm_delete.html
+++ b/organizations/templates/organizations/organization_confirm_delete.html
@@ -5,20 +5,20 @@
{% block pagetitle %}: Delete Organization{% endblock pagetitle %}
{% block content %}
-<div class="row">
+ <div class="row">
<div class="col-12">
- <h1 class="highlight">Delete Organization</h1>
- {{ object }}
+ <h1 class="highlight">Delete Organization</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 Organization?</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 Organization?</h3>
- <input type="submit" class="btn btn-danger" value="Yes, delete it" />
- </form>
</div>
-</div>
{% endblock content %}
diff --git a/organizations/templates/organizations/organization_create.html b/organizations/templates/organizations/organization_create.html
index 4f2622f41..5eb0e716b 100644
--- a/organizations/templates/organizations/organization_create.html
+++ b/organizations/templates/organizations/organization_create.html
@@ -5,13 +5,13 @@
{% block pagetitle %}: Create Organization{% endblock pagetitle %}
{% block content %}
-<div class="row">
- <div class="col-12">
- <form action="{% url 'organizations:organization_create' %}" method="post" enctype="multipart/form-data">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input type="submit" value="Submit" class="btn btn-primary">
- </form>
+ <div class="row">
+ <div class="col-12">
+ <form action="{% url 'organizations:organization_create' %}" method="post" enctype="multipart/form-data">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input type="submit" value="Submit" class="btn btn-primary">
+ </form>
+ </div>
</div>
-</div>
{% endblock content %}
diff --git a/organizations/templates/organizations/organization_detail.html b/organizations/templates/organizations/organization_detail.html
index 5382e4944..17be41da8 100644
--- a/organizations/templates/organizations/organization_detail.html
+++ b/organizations/templates/organizations/organization_detail.html
@@ -5,42 +5,42 @@
{% block pagetitle %}: Organization details{% endblock pagetitle %}
{% block breadcrumb_items %}
-{{ block.super }}
-<span class="breadcrumb-item">{{ organization }}</span>
+ {{ block.super }}
+ <span class="breadcrumb-item">{{ organization }}</span>
{% endblock %}
{% block content %}
-<div class="card bg-light">
+ <div class="card bg-light">
<div class="card-body">
- <img src="{{ organization.country.flag }}" style="width:20px;" alt="{{ organization.country }} flag"/>
- <small class="text-muted">[{{ organization.country }}]</small> {{ organization.get_country_display }}
- <h2 class="mb-0 mt-2">{{ organization.full_name }} <small>{% if organization.acronym %}[{{ organization.acronym }}]{% endif %}</small></h2>
-
- {% if organization.parent %}
- <small class="text-muted">Parent: <a href="{{ organization.parent.get_absolute_url }}">{{ organization.parent }}</a></small>
- {% endif %}
- {% if organization.children.all %}
- <br>
- <small class="text-muted">
- Parent of:
- {% for child in organization.children.all %}
- <a href="{{ child.get_absolute_url }}">{{ child }}</a>{% if not forloop.last %}, {% endif %}
- {% endfor %}
- </small>
- {% endif %}
- {% if organization.superseded_by %}
- <br>
- <small class="text-muted">Superseded by {{ organization.superseded_by }}</small>
- {% endif %}
+ <img src="{{ organization.country.flag }}" style="width:20px;" alt="{{ organization.country }} flag"/>
+ <small class="text-muted">[{{ organization.country }}]</small> {{ organization.get_country_display }}
+ <h2 class="mb-0 mt-2">{{ organization.full_name }} <small>{% if organization.acronym %}[{{ organization.acronym }}]{% endif %}</small></h2>
+
+ {% if organization.parent %}
+ <small class="text-muted">Parent: <a href="{{ organization.parent.get_absolute_url }}">{{ organization.parent }}</a></small>
+ {% endif %}
+ {% if organization.children.all %}
+ <br>
+ <small class="text-muted">
+ Parent of:
+ {% for child in organization.children.all %}
+ <a href="{{ child.get_absolute_url }}">{{ child }}</a>{% if not forloop.last %}, {% endif %}
+ {% endfor %}
+ </small>
+ {% endif %}
+ {% if organization.superseded_by %}
+ <br>
+ <small class="text-muted">Superseded by {{ organization.superseded_by }}</small>
+ {% endif %}
</div>
-</div>
+ </div>
-<div class="row">
- <div class="col-12">
- {% include 'organizations/_organization_card.html' with org=organization pubyears=pubyears %}
+ <div class="row">
+ <div class="col-12">
+ {% include 'organizations/_organization_card.html' with org=organization pubyears=pubyears %}
+ </div>
</div>
-</div>
{% endblock content %}
diff --git a/organizations/templates/organizations/organization_list.html b/organizations/templates/organizations/organization_list.html
index 4cce72c17..89ffb6bf8 100644
--- a/organizations/templates/organizations/organization_list.html
+++ b/organizations/templates/organizations/organization_list.html
@@ -11,148 +11,148 @@
{% is_scipost_admin request.user as is_scipost_admin %}
{% block headsup %}
-<script type="text/javascript">
-$(document).ready(function($) {
- $(".table-row").click(function() {
- window.document.location = $(this).data("href");
- });
-});
-</script>
-<link rel="stylesheet" href="{% static 'flags/sprite-hq.css' %}">
+ <script type="text/javascript">
+ $(document).ready(function($) {
+ $(".table-row").click(function() {
+ window.document.location = $(this).data("href");
+ });
+ });
+ </script>
+ <link rel="stylesheet" href="{% static 'flags/sprite-hq.css' %}">
{% endblock headsup %}
{% block breadcrumb_items %}
-{{ block.super }}
-<span class="breadcrumb-item">Organizations</span>
+ {{ block.super }}
+ <span class="breadcrumb-item">Organizations</span>
{% endblock %}
{% block content %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Organizations</h1>
- {% if perms.scipost.can_manage_organizations %}
- <h3>Management actions:</h3>
- <ul>
- <li><a href="{% url 'organizations:dashboard' %}">Go to the dashboard</a></li>
- <li><a href="{% url 'organizations:organization_create' %}">Create a new Organization instance</a></li>
- <li><a href="{% url 'funders:funders_dashboard' %}">Link Funders to Organizations</a> ({{ nr_funders_wo_organization }} found in need of linking)</li>
- </ul>
- {% endif %}
+ <div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Organizations</h1>
+ {% if perms.scipost.can_manage_organizations %}
+ <h3>Management actions:</h3>
+ <ul>
+ <li><a href="{% url 'organizations:dashboard' %}">Go to the dashboard</a></li>
+ <li><a href="{% url 'organizations:organization_create' %}">Create a new Organization instance</a></li>
+ <li><a href="{% url 'funders:funders_dashboard' %}">Link Funders to Organizations</a> ({{ nr_funders_wo_organization }} found in need of linking)</li>
+ </ul>
+ {% endif %}
+ </div>
</div>
-</div>
-<div class="row">
- <div class="col-12">
- <h3>This page lists Organizations which have benefitted from SciPost's publishing activities.</h3>
+ <div class="row">
+ <div class="col-12">
+ <h3>This page lists Organizations which have benefitted from SciPost's publishing activities.</h3>
+ </div>
</div>
-</div>
-<div class="row">
- <div class="col-5">
- <p>Organizations are linked through appearing in a publication's author affiliations, grant-giving agencies or explicit support acknowledgements.</p>
- <p>For each Organization, the NAP (number of associated publications) is given (you can order in decreasing/increasing NAP using the header arrows).</p>
- </div>
- <div class="col-1"></div>
- <div class="col-5">
- <p>Click on a row to see more details about the Organization, including per-year breakdowns of:</p>
- <ul>
- <li>associated publications</li>
- {% if is_scipost_admin %}
- <li>associated support fractions</li>
- {% endif %}
- <li>associated authors</li>
- <li>partnership history</li>
- </ul>
+ <div class="row">
+ <div class="col-5">
+ <p>Organizations are linked through appearing in a publication's author affiliations, grant-giving agencies or explicit support acknowledgements.</p>
+ <p>For each Organization, the NAP (number of associated publications) is given (you can order in decreasing/increasing NAP using the header arrows).</p>
+ </div>
+ <div class="col-1"></div>
+ <div class="col-5">
+ <p>Click on a row to see more details about the Organization, including per-year breakdowns of:</p>
+ <ul>
+ <li>associated publications</li>
+ {% if is_scipost_admin %}
+ <li>associated support fractions</li>
+ {% endif %}
+ <li>associated authors</li>
+ <li>partnership history</li>
+ </ul>
+ </div>
</div>
-</div>
-<div class="row">
- <div class="col-3">
- <h3>Click on flag to view by Country</h3>
- <p><a href="{% url 'organizations:organizations' %}">View all</a></p>
- </div>
- <div class="col-8">
- <ul>
- {% for code in countrycodes %}
- {% get_country code as country_obj %}
- <li style="display: inline-block;">
- <a href="{% add_get_parameters country=code %}"><i class="{{ country_obj.flag_css }}" aria-label="{{ country_obj.code }}" data-toggle="tooltip" title="{{ country_obj.name }}"></i></a>
- </li>
- {% endfor %}
- </ul>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <table class="table table-hover mb-5">
- <thead class="thead-default">
- <tr>
- <th><a href="{% add_get_parameters order_by='country' %}">Country</a></th>
- <th><a href="{% add_get_parameters order_by='name' %}">Name</a> <small>[acronym]</small></th>
- <th>NAP <i class="fa fa-info-circle" data-toggle="tooltip" data-html="true" title="" data-original-title="Number of associated publications<br/>For details, click on the Organization and consult the Associated Publications tab"></i>
- {% if request.GET.ordering != 'asc' %}
- <a href="{% add_get_parameters order_by='nap' ordering='asc' %}"><i class="fa fa-sort-asc"></i></a>
- {% else %}
- <a href="{% url 'organizations:organizations' %}"><i class="fa fa-sort-asc"></i></a>
- {% endif %}
- {% if request.GET.ordering != 'desc' %}
- <a href="{% add_get_parameters order_by='nap' ordering='desc' %}"><i class="fa fa-sort-desc"></i></a>
- {% else %}
- <a href="{% url 'organizations:organizations' %}"><i class="fa fa-sort-desc"></i></a>
- {% endif %}
-</th>
- <th>SciPost sponsor?</th>
- </tr>
- </thead>
- <tbody>
- {% for org in object_list %}
- <tr class="table-row" data-href="{% url 'organizations:organization_details' pk=org.id %}" target="_blank" style="cursor: pointer;">
- <td><img src="{{ org.country.flag }}" alt="{{ org.country }} flag"/> <span class="text-muted"><small>[{{ org.country }}]</small></span> {{ org.get_country_display }}</td>
- <td>
- {{ org.full_name }} <small>{% if org.acronym %}[{{ org.acronym }}]{% endif %}</small>
- {% if org.parent %}
- <small class="text-muted"><p>Parent: {{ org.parent }}</p></small>
- {% endif %}
- {% if org.children.all %}
- <small class="text-muted">
- <p>Parent of:
- {% for child in org.children.all %}
- {{ child }}{% if not forloop.last %}, {% endif %}
- {% endfor %}
- </p>
- </small>
- {% endif %}
- {% if org.superseded_by %}
- <small class="text-muted"><p>Superseded by {{ org.superseded_by }}</p></small>
- {% endif %}
- </td>
- <td>{{ org.cf_nr_associated_publications }}</td>
- {% if org.has_current_subsidy %}
- <td class="bg-success">Yes, current</td>
- {% elif org.subsidy_set.all|length > 0 %}
- <td class="bg-primary text-white">Yes, past</td>
- {% else %}
- <td class="bg-warning">Not yet</td>
- {% endif %}
- <td></td>
- </tr>
- {% empty %}
- <tr><td colspan="4">No organizations found</td></tr>
+ <div class="row">
+ <div class="col-3">
+ <h3>Click on flag to view by Country</h3>
+ <p><a href="{% url 'organizations:organizations' %}">View all</a></p>
+ </div>
+ <div class="col-8">
+ <ul>
+ {% for code in countrycodes %}
+ {% get_country code as country_obj %}
+ <li style="display: inline-block;">
+ <a href="{% add_get_parameters country=code %}"><i class="{{ country_obj.flag_css }}" aria-label="{{ country_obj.code }}" data-toggle="tooltip" title="{{ country_obj.name }}"></i></a>
+ </li>
{% endfor %}
- </tbody>
- </table>
+ </ul>
+ </div>
+ </div>
- {% if is_paginated %}
+ <div class="row">
<div class="col-12">
- {% include 'partials/pagination.html' with page_obj=page_obj %}
- </div>
- {% endif %}
+ <table class="table table-hover mb-5">
+ <thead class="thead-default">
+ <tr>
+ <th><a href="{% add_get_parameters order_by='country' %}">Country</a></th>
+ <th><a href="{% add_get_parameters order_by='name' %}">Name</a> <small>[acronym]</small></th>
+ <th>NAP <i class="fa fa-info-circle" data-toggle="tooltip" data-html="true" title="" data-original-title="Number of associated publications<br/>For details, click on the Organization and consult the Associated Publications tab"></i>
+ {% if request.GET.ordering != 'asc' %}
+ <a href="{% add_get_parameters order_by='nap' ordering='asc' %}"><i class="fa fa-sort-asc"></i></a>
+ {% else %}
+ <a href="{% url 'organizations:organizations' %}"><i class="fa fa-sort-asc"></i></a>
+ {% endif %}
+ {% if request.GET.ordering != 'desc' %}
+ <a href="{% add_get_parameters order_by='nap' ordering='desc' %}"><i class="fa fa-sort-desc"></i></a>
+ {% else %}
+ <a href="{% url 'organizations:organizations' %}"><i class="fa fa-sort-desc"></i></a>
+ {% endif %}
+ </th>
+ <th>SciPost sponsor?</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for org in object_list %}
+ <tr class="table-row" data-href="{% url 'organizations:organization_details' pk=org.id %}" target="_blank" style="cursor: pointer;">
+ <td><img src="{{ org.country.flag }}" alt="{{ org.country }} flag"/> <span class="text-muted"><small>[{{ org.country }}]</small></span> {{ org.get_country_display }}</td>
+ <td>
+ {{ org.full_name }} <small>{% if org.acronym %}[{{ org.acronym }}]{% endif %}</small>
+ {% if org.parent %}
+ <small class="text-muted"><p>Parent: {{ org.parent }}</p></small>
+ {% endif %}
+ {% if org.children.all %}
+ <small class="text-muted">
+ <p>Parent of:
+ {% for child in org.children.all %}
+ {{ child }}{% if not forloop.last %}, {% endif %}
+ {% endfor %}
+ </p>
+ </small>
+ {% endif %}
+ {% if org.superseded_by %}
+ <small class="text-muted"><p>Superseded by {{ org.superseded_by }}</p></small>
+ {% endif %}
+ </td>
+ <td>{{ org.cf_nr_associated_publications }}</td>
+ {% if org.has_current_subsidy %}
+ <td class="bg-success">Yes, current</td>
+ {% elif org.subsidy_set.all|length > 0 %}
+ <td class="bg-primary text-white">Yes, past</td>
+ {% else %}
+ <td class="bg-warning">Not yet</td>
+ {% endif %}
+ <td></td>
+ </tr>
+ {% empty %}
+ <tr><td colspan="4">No organizations found</td></tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+ {% if is_paginated %}
+ <div class="col-12">
+ {% include 'partials/pagination.html' with page_obj=page_obj %}
+ </div>
+ {% endif %}
+ </div>
</div>
-</div>
{% endblock content %}
diff --git a/organizations/templates/organizations/organization_update.html b/organizations/templates/organizations/organization_update.html
index 8e3107e41..daa17797b 100644
--- a/organizations/templates/organizations/organization_update.html
+++ b/organizations/templates/organizations/organization_update.html
@@ -5,13 +5,13 @@
{% block pagetitle %}: Update Organization{% endblock pagetitle %}
{% block content %}
-<div class="row">
- <div class="col-12">
- <form action="{% url 'organizations:organization_update' pk=object.id %}" method="post" enctype="multipart/form-data">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input type="submit" value="Submit" class="btn btn-primary">
- </form>
+ <div class="row">
+ <div class="col-12">
+ <form action="{% url 'organizations:organization_update' pk=object.id %}" method="post" enctype="multipart/form-data">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input type="submit" value="Submit" class="btn btn-primary">
+ </form>
+ </div>
</div>
-</div>
{% endblock content %}
diff --git a/organizations/templates/organizations/organizationevent_form.html b/organizations/templates/organizations/organizationevent_form.html
index 67f73112b..3a809ded8 100644
--- a/organizations/templates/organizations/organizationevent_form.html
+++ b/organizations/templates/organizations/organizationevent_form.html
@@ -3,27 +3,27 @@
{% load bootstrap %}
{% block breadcrumb_items %}
-{{ block.super }}
-<span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
-<span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new OrganizationEvent{% endif %}</span>
+ {{ block.super }}
+ <span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
+ <span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new OrganizationEvent{% endif %}</span>
{% endblock %}
{% block pagetitle %}: OrganizationEvent{% 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/organizations/templates/organizations/organizationevent_list.html b/organizations/templates/organizations/organizationevent_list.html
index 85610bef6..6596e57f1 100644
--- a/organizations/templates/organizations/organizationevent_list.html
+++ b/organizations/templates/organizations/organizationevent_list.html
@@ -5,46 +5,46 @@
{% load bootstrap %}
{% block breadcrumb_items %}
-{{ block.super }}
-<span class="breadcrumb-item">Organization Events</span>
+ {{ block.super }}
+ <span class="breadcrumb-item">Organization Events</span>
{% endblock %}
{% block content %}
-<div class="row">
- <div class="col-12">
- <h3 class="highlight">Organization Events</h3>
-
- <table class="table">
- <thead class="thead-default">
- <tr>
- <th>Organization</th>
- <th>Event</th>
- <th>Comments</th>
- <th>Noted on</th>
- <th>Noted by</th>
- </tr>
- </thead>
- <tbody>
- {% for event in object_list %}
- <tr>
- <td><a href="{% url 'organizations:organization_details' pk=event.organization.id %}">{{ event.organization }}</a></td>
- <td>{{ event.get_event_display }}</td>
- <td>{{ event.comments|linebreaks }}</td>
- <td>{{ event.noted_on }}</td>
- <td>{{ event.noted_by }}</td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
-
- {% if is_paginated %}
+ <div class="row">
<div class="col-12">
- {% include 'partials/pagination.html' with page_obj=page_obj %}
- </div>
- {% endif %}
+ <h3 class="highlight">Organization Events</h3>
+
+ <table class="table">
+ <thead class="thead-default">
+ <tr>
+ <th>Organization</th>
+ <th>Event</th>
+ <th>Comments</th>
+ <th>Noted on</th>
+ <th>Noted by</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for event in object_list %}
+ <tr>
+ <td><a href="{% url 'organizations:organization_details' pk=event.organization.id %}">{{ event.organization }}</a></td>
+ <td>{{ event.get_event_display }}</td>
+ <td>{{ event.comments|linebreaks }}</td>
+ <td>{{ event.noted_on }}</td>
+ <td>{{ event.noted_by }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+ {% if is_paginated %}
+ <div class="col-12">
+ {% include 'partials/pagination.html' with page_obj=page_obj %}
+ </div>
+ {% endif %}
+ </div>
</div>
-</div>
{% endblock content %}
--
GitLab