From a477b380d6be72a0125767b247587f46c5a482be Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Tue, 10 Jul 2018 08:42:11 +0200
Subject: [PATCH] Improve presentation of Organizations page
---
.../partners/_organization_card.html | 24 +++++++++----------
.../templates/partners/organization_list.html | 6 +++--
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/partners/templates/partners/_organization_card.html b/partners/templates/partners/_organization_card.html
index df7ea69e4..4f65730d1 100644
--- a/partners/templates/partners/_organization_card.html
+++ b/partners/templates/partners/_organization_card.html
@@ -4,33 +4,33 @@
<div class="row">
<div class="col-12">
- <ul class="nav nav-tabs" id="organization-tab" role="tablist">
+ <ul class="nav nav-tabs" id="organization-{{ org.id }}-tab" role="tablist">
<li class="nav-item">
- <a class="nav-link" id="details-tab" data-toggle="tab" href="#details" role="tab" aria-controls="details" aria-selected="true">Details</a>
+ <a class="nav-link" id="details-{{ org.id }}-tab" data-toggle="tab" href="#details-{{ org.id }}" role="tab" aria-controls="details-{{ org.id }}" aria-selected="true">Details</a>
</li>
<li class="nav-item">
- <a class="nav-link active" id="publications-tab" data-toggle="tab" href="#publications" role="tab" aria-controls="publications" aria-selected="true">Associated Publications</a>
+ <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">Associated Publications</a>
</li>
<li class="nav-item">
- <a class="nav-link" id="authors-tab" data-toggle="tab" href="#authors" role="tab" aria-controls="authors" aria-selected="true">Associated Authors</a>
+ <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>
</li>
<li class="nav-item">
- <a class="nav-link" id="partnership-tab" data-toggle="tab" href="#partnership" role="tab" aria-controls="partnership" aria-selected="true">Partnership history</a>
+ <a class="nav-link" id="partnership-{{ org.id }}-tab" data-toggle="tab" href="#partnership-{{ org.id }}" role="tab" aria-controls="partnership-{{ org.id }}" aria-selected="true">Partnership history</a>
</li>
{% if perms.scipost.can_manage_organizations %}
<li class="nav-item">
- <a class="nav-link" id="manage-tab" data-toggle="tab" href="#manage" role="tab" aria-controls="manage" aria-selected="true">Manage</a>
+ <a class="nav-link" id="manage-{{ org.id }}-tab" data-toggle="tab" href="#manage-{{ org.id }}" role="tab" aria-controls="manage-{{ org.id }}" aria-selected="true">Manage</a>
</li>
{% endif %}
</ul>
- <div class="tab-content" id="organization-tab">
- <div class="tab-pane pt-4" id="details" role="tabpanel" aria-labelledby="details-tab">
+ <div class="tab-content" id="organization-{{ org.id }}-tab">
+ <div class="tab-pane pt-4" id="details-{{ org.id }}" role="tabpanel" aria-labelledby="details-{{ org.id }}-tab">
<h3>Details:</h3>
{% include 'partners/_organization_details_contents.html' with org=org %}
</div>
- <div class="tab-pane show active pt-4" id="publications" role="tabpanel" aria-labelledby="publications-tab">
+ <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:</h3>
<ul>
{% for publication in org.get_publications %}
@@ -43,7 +43,7 @@
</ul>
</div>
- <div class="tab-pane pt-4" id="authors" role="tabpanel" aria-labelledby="authors-tab">
+ <div class="tab-pane pt-4" id="authors-{{ org.id }}" role="tabpanel" aria-labelledby="authors-{{ org.id }}-tab">
<h3>Associated Authors:</h3>
<div class="row">
<div class="col-6">
@@ -69,11 +69,11 @@
</div>
</div>
- <div class="tab-pane pt-4" id="partnership" role="tabpanel" aria-labelledby="partnership-tab">
+ <div class="tab-pane pt-4" id="partnership-{{ org.id }}" role="tabpanel" aria-labelledby="partnership-{{ org.id }}-tab">
<h3>Partnership history:</h3>
</div>
- <div class="tab-pane pt-4" id="manage" role="tabpanel" aria-labelledby="manage-tab">
+ <div class="tab-pane pt-4" id="manage-{{ org.id }}" role="tabpanel" aria-labelledby="manage-{{ org.id }}-tab">
{% if perms.scipost.can_manage_organizations %}
<h3>Manage this organization:</h3>
<ul>
diff --git a/partners/templates/partners/organization_list.html b/partners/templates/partners/organization_list.html
index 63793aa3b..a66f76db4 100644
--- a/partners/templates/partners/organization_list.html
+++ b/partners/templates/partners/organization_list.html
@@ -18,6 +18,7 @@
<thead class="thead-default">
<tr>
<th>Country</th>
+ <th>Acronym</th>
<th>Name</th>
<th>Type</th>
</tr>
@@ -26,16 +27,17 @@
{% for org in object_list %}
<tr data-toggle="collapse" data-parent="#accordion" href="#collapse{{ org.id }}" aria-expanded="true" aria-controls="collapse{{ org.id }}" style="cursor: pointer;">
<td>{{ org.get_country_display }}</td>
+ <td>{{ org.acrynym }}</td>
<td>{{ org.name }}</td>
<td>{{ org.get_orgtype_display }}</td>
</tr>
<tr id="collapse{{ org.id }}" class="collapse" role="tabpanel" aria-labbeledby="heading{{ org.id }}" style="background-color: #fff;">
- <td colspan="3">
+ <td colspan="4">
{% include 'partners/_organization_card.html' with org=org %}
</td>
</tr>
{% empty %}
- <tr><td colspan="3">No organizations found</td></tr>
+ <tr><td colspan="4">No organizations found</td></tr>
{% endfor %}
</tbody>
</table>
--
GitLab