From d1248b98ef5eb8864198d6689a565cb3f82232b1 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 15 Apr 2019 08:55:15 +0200
Subject: [PATCH] Template style: app funders
---
funders/templates/funders/base.html | 16 +-
funders/templates/funders/funder_details.html | 24 +-
.../funders/funder_link_organization.html | 54 ++---
funders/templates/funders/funder_list.html | 18 +-
.../templates/funders/funders_dashboard.html | 226 +++++++++---------
funders/templates/funders/grant_form.html | 24 +-
.../funders/query_crossref_for_funder.html | 50 ++--
7 files changed, 206 insertions(+), 206 deletions(-)
diff --git a/funders/templates/funders/base.html b/funders/templates/funders/base.html
index 535389ee4..781af8ec8 100644
--- a/funders/templates/funders/base.html
+++ b/funders/templates/funders/base.html
@@ -1,13 +1,13 @@
{% extends 'scipost/base.html' %}
{% block breadcrumb %}
- <div class="breadcrumb-container">
- <div class="container">
- <nav class="breadcrumb hidden-sm-down">
- {% block breadcrumb_items %}
- <a href="{% url 'funders:funders' %}" class="breadcrumb-item">Funders</a>
- {% endblock %}
- </nav>
- </div>
+ <div class="breadcrumb-container">
+ <div class="container">
+ <nav class="breadcrumb hidden-sm-down">
+ {% block breadcrumb_items %}
+ <a href="{% url 'funders:funders' %}" class="breadcrumb-item">Funders</a>
+ {% endblock %}
+ </nav>
</div>
+ </div>
{% endblock %}
diff --git a/funders/templates/funders/funder_details.html b/funders/templates/funders/funder_details.html
index 9fd9b51b2..96d41887d 100644
--- a/funders/templates/funders/funder_details.html
+++ b/funders/templates/funders/funder_details.html
@@ -3,27 +3,27 @@
{% block pagetitle %}: Funder details{% endblock pagetitle %}
{% block breadcrumb_items %}
- {{ block.super }}
- <span class="breadcrumb-item">{{ funder.name }}</span>
+ {{ block.super }}
+ <span class="breadcrumb-item">{{ funder.name }}</span>
{% endblock %}
{% block content %}
-<h1 class="highlight">Funder {{ funder.name }}</h1>
+ <h1 class="highlight">Funder {{ funder.name }}</h1>
-<h3>All Publications related to {{ funder.name }}</h3>
-<ul>
+ <h3>All Publications related to {{ funder.name }}</h3>
+ <ul>
{% for publication in funder.all_related_publications %}
- <li>
- <a href="{{ publication.get_absolute_url }}">{{ publication.title }}</a>
- <br>by {{ publication.author_list }},
- <br>{{ publication.citation }}
- </li>
+ <li>
+ <a href="{{ publication.get_absolute_url }}">{{ publication.title }}</a>
+ <br>by {{ publication.author_list }},
+ <br>{{ publication.citation }}
+ </li>
{% empty %}
- <li>No publications</li>
+ <li>No publications</li>
{% endfor %}
-</ul>
+ </ul>
{% endblock content %}
diff --git a/funders/templates/funders/funder_link_organization.html b/funders/templates/funders/funder_link_organization.html
index edf30b799..7df175325 100644
--- a/funders/templates/funders/funder_link_organization.html
+++ b/funders/templates/funders/funder_link_organization.html
@@ -5,40 +5,40 @@
{% load bootstrap %}
{% block breadcrumb_items %}
-{{ block.super }}
-<span class="breadcrumb-item">{{ funder.name }}</span>
+ {{ block.super }}
+ <span class="breadcrumb-item">{{ funder.name }}</span>
{% endblock %}
{% block content %}
-<h1>Funder: link to Organization</h1>
-<div class="row">
- <div class="col-4">
- <table class="table">
- <tbody>
- <tr><td>Name:</td><td>{{ funder.name }}</td></tr>
- <tr><td>Acronym:</td><td>{{ funder.acronym }}</td></tr>
- <tr><td>Identifier:</td><td>{{ funder.identifier }}</td></tr>
- <tr><td>Organization:</td><td>{{ funder.organization }}</td></tr>
- </tbody>
- </table>
+ <h1>Funder: link to Organization</h1>
+ <div class="row">
+ <div class="col-4">
+ <table class="table">
+ <tbody>
+ <tr><td>Name:</td><td>{{ funder.name }}</td></tr>
+ <tr><td>Acronym:</td><td>{{ funder.acronym }}</td></tr>
+ <tr><td>Identifier:</td><td>{{ funder.identifier }}</td></tr>
+ <tr><td>Organization:</td><td>{{ funder.organization }}</td></tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="col-6">
+ <h3>Link to:</h3>
+ <form action="{% url 'funders:link_to_organization' pk=funder.pk %}" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input type="submit" value="Link" class="btn btn-primary">
+ </form>
+ </div>
+ <div class="col-2">
+ <p>Can't find it in the selector? <a href="{% url 'organizations:organization_create' %}" target="_blank">Add a new organization to our database</a> (opens in new window)</p>
+ </div>
</div>
- <div class="col-6">
- <h3>Link to:</h3>
- <form action="{% url 'funders:link_to_organization' pk=funder.pk %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input type="submit" value="Link" class="btn btn-primary">
- </form>
- </div>
- <div class="col-2">
- <p>Can't find it in the selector? <a href="{% url 'organizations:organization_create' %}" target="_blank">Add a new organization to our database</a> (opens in new window)</p>
- </div>
-</div>
{% endblock content %}
{% block footer_script %}
-{{ block.super }}
-{{ form.media }}
+ {{ block.super }}
+ {{ form.media }}
{% endblock footer_script %}
diff --git a/funders/templates/funders/funder_list.html b/funders/templates/funders/funder_list.html
index ac4b95994..67ba2a694 100644
--- a/funders/templates/funders/funder_list.html
+++ b/funders/templates/funders/funder_list.html
@@ -3,27 +3,27 @@
{% block pagetitle %}: Funders list{% endblock pagetitle %}
{% block breadcrumb_items %}
- <span class="breadcrumb-item">Funders</span>
+ <span class="breadcrumb-item">Funders</span>
{% endblock %}
{% block content %}
-<h1 class="highlight">Funders</h1>
+ <h1 class="highlight">Funders</h1>
-{% if perms.scipost.can_view_all_funding_info %}
+ {% if perms.scipost.can_view_all_funding_info %}
<a href="{% url 'funders:funders_dashboard' %}">Go to dashboard</a>
<br><br>
-{% endif %}
+ {% endif %}
-<h3>All Funders with a SciPost publication</h3>
+ <h3>All Funders with a SciPost publication</h3>
-<ul>
+ <ul>
{% for funder in funders %}
- <li><a href="{{ funder.get_absolute_url }}">{{ funder }}</a></li>
+ <li><a href="{{ funder.get_absolute_url }}">{{ funder }}</a></li>
{% empty %}
- <li>No funders</li>
+ <li>No funders</li>
{% endfor %}
-</ul>
+ </ul>
{% endblock content %}
diff --git a/funders/templates/funders/funders_dashboard.html b/funders/templates/funders/funders_dashboard.html
index 78d6c2321..68574b03e 100644
--- a/funders/templates/funders/funders_dashboard.html
+++ b/funders/templates/funders/funders_dashboard.html
@@ -3,146 +3,146 @@
{% block pagetitle %}: Funders dashboard{% endblock pagetitle %}
{% block breadcrumb_items %}
- {{ block.super }}
- <span class="breadcrumb-item">Dashboard</span>
+ {{ block.super }}
+ <span class="breadcrumb-item">Dashboard</span>
{% endblock %}
{% load bootstrap %}
{% block content %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Funders (and associated grants)</h1>
+ <div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Funders (and associated grants)</h1>
+ </div>
</div>
-</div>
-<div class="row">
+ <div class="row">
<div class="col-12">
- <div class="tab-nav-container">
- <div class="tab-nav-inner">
- <!-- Nav tabs -->
- <ul class="nav btn-group personal-page-nav" role="tablist">
- <li class="nav-item btn btn-outline-secondary">
- <a href="#funders" class="nav-link active" data-toggle="tab">Funders</a>
- </li>
- <li class="nav-item btn btn-outline-secondary">
- <a href="#grants" class="nav-link" data-toggle="tab">Grants</a>
- </li>
- </ul>
- </div>
+ <div class="tab-nav-container">
+ <div class="tab-nav-inner">
+ <!-- Nav tabs -->
+ <ul class="nav btn-group personal-page-nav" role="tablist">
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="#funders" class="nav-link active" data-toggle="tab">Funders</a>
+ </li>
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="#grants" class="nav-link" data-toggle="tab">Grants</a>
+ </li>
+ </ul>
</div>
+ </div>
</div>
-</div>
+ </div>
-<div class="tab-content">
+ <div class="tab-content">
- <!-- Tab: Funders -->
- <div class="tab-pane active" id="funders" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <h2 class="highlight">Funders</h2>
+ <!-- Tab: Funders -->
+ <div class="tab-pane active" id="funders" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <h2 class="highlight">Funders</h2>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-12">
- <h2>Find a new funder in the Fundref registry</h2>
- <form action="{% url 'funders:query_crossref_for_funder' %}" method="post">
- {% csrf_token %}
- {{form|bootstrap}}
- <input class="btn btn-outline-secondary" type="submit" value="Search">
- </form>
- <br/>
- <h2>Funders in the SciPost database</h2>
- <table class="table table-hover mb-5">
- <thead class="thead-default">
- <tr>
- <th>Name</th>
- <th>Acronym</th>
- <th>Identifier</th>
- <th>Organization</th>
- <th>Actions</th>
- </tr>
- </thead>
- <tbody id="accordion" role="tablist" aria-multiselectable="true">
- {% for funder in funders %}
- <tr>
- <td>{{ funder.name }}</td>
- <td>{{ funder.acronym }}</td>
- <td>{{ funder.identifier }}</td>
- <td>{{ funder.organization }}</td>
- <td>
- <ul>
- <li><a href="{% url 'funders:link_to_organization' pk=funder.id %}">{% if not funder.organization %}Link to an{% else %}Edit the{% endif %} Organization</a></li>
- <li><a href="{% url 'funders:funder_publications' funder.id %}">See all Publications for Funder</a></li>
- </td>
- </tr>
- {% empty %}
- <tr>
- <td colspan="4">No funders found</td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
+ <div class="row">
+ <div class="col-12">
+ <h2>Find a new funder in the Fundref registry</h2>
+ <form action="{% url 'funders:query_crossref_for_funder' %}" method="post">
+ {% csrf_token %}
+ {{form|bootstrap}}
+ <input class="btn btn-outline-secondary" type="submit" value="Search">
+ </form>
+ <br/>
+ <h2>Funders in the SciPost database</h2>
+ <table class="table table-hover mb-5">
+ <thead class="thead-default">
+ <tr>
+ <th>Name</th>
+ <th>Acronym</th>
+ <th>Identifier</th>
+ <th>Organization</th>
+ <th>Actions</th>
+ </tr>
+ </thead>
+ <tbody id="accordion" role="tablist" aria-multiselectable="true">
+ {% for funder in funders %}
+ <tr>
+ <td>{{ funder.name }}</td>
+ <td>{{ funder.acronym }}</td>
+ <td>{{ funder.identifier }}</td>
+ <td>{{ funder.organization }}</td>
+ <td>
+ <ul>
+ <li><a href="{% url 'funders:link_to_organization' pk=funder.id %}">{% if not funder.organization %}Link to an{% else %}Edit the{% endif %} Organization</a></li>
+ <li><a href="{% url 'funders:funder_publications' funder.id %}">See all Publications for Funder</a></li>
+ </td>
+ </tr>
+ {% empty %}
+ <tr>
+ <td colspan="4">No funders found</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
</div>
</div>
- </div>
- <!-- Tab: Grants -->
- <div class="tab-pane" id="grants" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <h2 class="highlight">Grants</h2>
+ <!-- Tab: Grants -->
+ <div class="tab-pane" id="grants" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <h2 class="highlight">Grants</h2>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-12">
- <h2>Add a grant</h2>
- <form action="{% url 'funders:add_grant' %}" method="post">
- {% csrf_token %}
- {{grant_form|bootstrap}}
- <input class="btn btn-outline-secondary" type="submit" value="Add">
- </form>
- <br/>
- <h2>Grants in the SciPost database</h2>
- <table class="table table-hover mb-5">
- <thead class="thead-default">
- <tr>
- <th>Funder Name</th>
- <th>Recipient</th>
- <th>Number</th>
- </tr>
- </thead>
- <tbody id="accordion" role="tablist" aria-multiselectable="true">
- {% for grant in grants %}
- <tr>
- <td>{{ grant.funder.name }}</td>
- {% if grant.recipient %}
- <td>{{ grant.recipient }}</td>
- {% elif grant.recipient_name %}
- <td>{{ grant.recipient_name }}</td>
- {% else %}
- <td></td>
- {% endif %}
- <td>{{ grant.number }}</td>
- </tr>
- {% empty %}
- <tr>
- <td colspan="3">No grants found</td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
+ <div class="row">
+ <div class="col-12">
+ <h2>Add a grant</h2>
+ <form action="{% url 'funders:add_grant' %}" method="post">
+ {% csrf_token %}
+ {{grant_form|bootstrap}}
+ <input class="btn btn-outline-secondary" type="submit" value="Add">
+ </form>
+ <br/>
+ <h2>Grants in the SciPost database</h2>
+ <table class="table table-hover mb-5">
+ <thead class="thead-default">
+ <tr>
+ <th>Funder Name</th>
+ <th>Recipient</th>
+ <th>Number</th>
+ </tr>
+ </thead>
+ <tbody id="accordion" role="tablist" aria-multiselectable="true">
+ {% for grant in grants %}
+ <tr>
+ <td>{{ grant.funder.name }}</td>
+ {% if grant.recipient %}
+ <td>{{ grant.recipient }}</td>
+ {% elif grant.recipient_name %}
+ <td>{{ grant.recipient_name }}</td>
+ {% else %}
+ <td></td>
+ {% endif %}
+ <td>{{ grant.number }}</td>
+ </tr>
+ {% empty %}
+ <tr>
+ <td colspan="3">No grants found</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
</div>
</div>
</div>
-</div>
{% endblock content %}
diff --git a/funders/templates/funders/grant_form.html b/funders/templates/funders/grant_form.html
index 65f59883b..dd5c57e97 100644
--- a/funders/templates/funders/grant_form.html
+++ b/funders/templates/funders/grant_form.html
@@ -6,20 +6,20 @@
{% block content %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Create new Grant</h1>
+ <div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Create new Grant</h1>
+ </div>
</div>
-</div>
-<div class="row">
+ <div class="row">
<div class="col-12">
- <form method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input class="btn btn-primary" type="submit" value="Submit">
- </form>
- </div>
-</div>
+ <form method="post">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input class="btn btn-primary" type="submit" value="Submit">
+ </form>
+ </div>
+ </div>
{% endblock content %}
diff --git a/funders/templates/funders/query_crossref_for_funder.html b/funders/templates/funders/query_crossref_for_funder.html
index 7387f76ae..5c87ceb23 100644
--- a/funders/templates/funders/query_crossref_for_funder.html
+++ b/funders/templates/funders/query_crossref_for_funder.html
@@ -6,34 +6,34 @@
{% block content %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Query Crossref Fundref Registry for Funders</h1>
- <form action="{% url 'funders:query_crossref_for_funder' %}" method="post">
- {% csrf_token %}
- {{form|bootstrap}}
- <input class="btn btn-outline-secondary" type="submit" value="Search">
- </form>
- {% if response_headers %}
+ <div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Query Crossref Fundref Registry for Funders</h1>
+ <form action="{% url 'funders:query_crossref_for_funder' %}" method="post">
+ {% csrf_token %}
+ {{form|bootstrap}}
+ <input class="btn btn-outline-secondary" type="submit" value="Search">
+ </form>
+ {% if response_headers %}
<p>{{ response_headers }}</p>
- {% endif %}
- {% if response_text %}
+ {% endif %}
+ {% if response_text %}
<p>{{ response_text }}</p>
- {% endif %}
- {% if response %}
+ {% endif %}
+ {% if response %}
<p>{{ response }}</p>
<ul>
{% for item in response.message.items %}
- <li>
- {{ item.name }}, {{ item.id }}, {{ item.uri }}
- <form action="{% url 'funders:add_funder' %}" method="post">
- {% csrf_token %}
- <input name='name' style="width: 64%" value='{{ item.name }}'>
- <input name='acronym' style="width: 64%" placeholder='acronym (if known)'>
- <input name='identifier' style="width: 64%" value='{{ item.uri }}'>
- <input class="btn btn-outline-secondary" type="submit" value="Add this funder">
- </form>
- </li>
+ <li>
+ {{ item.name }}, {{ item.id }}, {{ item.uri }}
+ <form action="{% url 'funders:add_funder' %}" method="post">
+ {% csrf_token %}
+ <input name='name' style="width: 64%" value='{{ item.name }}'>
+ <input name='acronym' style="width: 64%" placeholder='acronym (if known)'>
+ <input name='identifier' style="width: 64%" value='{{ item.uri }}'>
+ <input class="btn btn-outline-secondary" type="submit" value="Add this funder">
+ </form>
+ </li>
{% endfor %}
</ul>
<form action="{% url 'funders:add_funder' %}" method="post">
@@ -41,9 +41,9 @@
{{funder_form|bootstrap}}
<input class="btn btn-outline-secondary" type="submit" value="Submit">
</form>
- {% endif %}
+ {% endif %}
+ </div>
</div>
-</div>
{% endblock content %}
--
GitLab