From e29110747e4f3f09d4d6f82dff2aaf30a44b7654 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Wed, 19 Sep 2018 19:15:58 +0200
Subject: [PATCH] Move Organization details to outside of organization_list
---
partners/templates/partners/base.html | 15 +++++++++
.../partners/organization_detail.html | 22 +++++--------
.../templates/partners/organization_list.html | 31 ++++++++++++++-----
.../partners/supporting_partners.html | 17 +++++-----
4 files changed, 54 insertions(+), 31 deletions(-)
create mode 100644 partners/templates/partners/base.html
diff --git a/partners/templates/partners/base.html b/partners/templates/partners/base.html
new file mode 100644
index 000000000..171e8e539
--- /dev/null
+++ b/partners/templates/partners/base.html
@@ -0,0 +1,15 @@
+{% extends 'scipost/base.html' %}
+
+{% block body_class %}{{ block.super }} partners{% endblock %}
+
+{% block breadcrumb %}
+ <div class="container-outside header">
+ <div class="container">
+ <nav class="breadcrumb hidden-sm-down">
+ {% block breadcrumb_items %}
+ <a href="{% url 'partners:partners' %}" class="breadcrumb-item">Partners</a>
+ {% endblock %}
+ </nav>
+ </div>
+ </div>
+{% endblock %}
diff --git a/partners/templates/partners/organization_detail.html b/partners/templates/partners/organization_detail.html
index 2a14930af..7669c892c 100644
--- a/partners/templates/partners/organization_detail.html
+++ b/partners/templates/partners/organization_detail.html
@@ -1,32 +1,24 @@
-{% extends 'scipost/base.html' %}
+{% extends 'partners/base.html' %}
{% load bootstrap %}
{% block pagetitle %}: Organization details{% endblock pagetitle %}
{% block breadcrumb_items %}
- {{ block.super }}
- <span class="breadcrumb-item">{{ organization }}</span>
+{{ block.super }}
+<a href="{% url 'partners:organization_list' %}" class="breadcrumb-item">Organizations</a>
+<span class="breadcrumb-item">{{ organization }}</span>
{% endblock %}
{% block content %}
-<h1 class="highlight">Organization {{ organization }}</h1>
-
+<h1 class="highlight">{{ organization }}</h1>
<div class="row">
<div class="col-12">
- <h3>Publications associated to this Organization:</h3>
- <ul>
- {% for publication in organization.get_publications %}
- <li>
- <a href="{{ publication.get_absolute_url }}">{{ publication.title }}</a>
- <br>by {{ publication.author_list }},
- <br>{{ publication.citation }}
- </li>
- {% endfor %}
- </ul>
+ {% include 'partners/_organization_card.html' with org=organization %}
</div>
</div>
+
{% endblock content %}
diff --git a/partners/templates/partners/organization_list.html b/partners/templates/partners/organization_list.html
index 3f3a79d72..50fef4f21 100644
--- a/partners/templates/partners/organization_list.html
+++ b/partners/templates/partners/organization_list.html
@@ -1,10 +1,25 @@
-{% extends 'scipost/base.html' %}
+{% extends 'partners/base.html' %}
{% block pagetitle %}: Organizations{% endblock pagetitle %}
{% load staticfiles %}
{% load partners_extras %}
+{% block headsup %}
+<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">Organizations</span>
+{% endblock %}
+
{% block content %}
<div class="row">
<div class="col-12">
@@ -20,6 +35,10 @@
</div>
+
+
+
+
<div class="row">
<div class="col-12">
<p>Click on a row to see more details about the Organization</p>
@@ -35,9 +54,9 @@
<th>Partner?</th>
</tr>
</thead>
- <tbody id="accordion" role="tablist" aria-multiselectable="true">
+ <tbody>
{% 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;">
+ <tr class="table-row" data-href="{% url 'partners: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>
@@ -67,11 +86,6 @@
{% endif %}
<td></td>
</tr>
- <tr id="collapse{{ org.id }}" class="collapse" role="tabpanel" aria-labbeledby="heading{{ org.id }}" style="background-color: #fff;">
- <td colspan="4">
- {% include 'partners/_organization_card.html' with org=org %}
- </td>
- </tr>
{% empty %}
<tr><td colspan="4">No organizations found</td></tr>
{% endfor %}
@@ -80,4 +94,5 @@
</div>
</div>
+
{% endblock content %}
diff --git a/partners/templates/partners/supporting_partners.html b/partners/templates/partners/supporting_partners.html
index 65ec345bf..eae38ebca 100644
--- a/partners/templates/partners/supporting_partners.html
+++ b/partners/templates/partners/supporting_partners.html
@@ -1,4 +1,4 @@
-{% extends 'scipost/base.html' %}
+{% extends 'partners/base.html' %}
{% block pagetitle %}: Supporting Partners{% endblock pagetitle %}
@@ -7,17 +7,18 @@
{% load scipost_extras %}
-{% block breadcrumb %}
- <div class="container-outside header">
- <div class="container">
- <h1>SciPost Supporting Partners</h1>
- </div>
- </div>
+{% block breadcrumb_items %}
+{{ block.super }}
{% endblock %}
-
{% block content %}
+<div class="container-outside header">
+ <div class="container">
+ <h1>SciPost Supporting Partners</h1>
+ </div>
+</div>
+
{% if perms.scipost.can_manage_SPB %}
<div class="row">
<div class="col-12">
--
GitLab