From 4e8fa069257e5a56bcc3d8a643d4f62b97682cd9 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Thu, 2 Nov 2017 08:35:23 +0100
Subject: [PATCH] Rename Affiliation model
---
...iliation_form.html => institute_form.html} | 24 +++++++++----------
...iliation_list.html => institute_list.html} | 12 +++++-----
2 files changed, 18 insertions(+), 18 deletions(-)
rename affiliations/templates/affiliations/{affiliation_form.html => institute_form.html} (53%)
rename affiliations/templates/affiliations/{affiliation_list.html => institute_list.html} (54%)
diff --git a/affiliations/templates/affiliations/affiliation_form.html b/affiliations/templates/affiliations/institute_form.html
similarity index 53%
rename from affiliations/templates/affiliations/affiliation_form.html
rename to affiliations/templates/affiliations/institute_form.html
index 3971551d2..57d68b57f 100644
--- a/affiliations/templates/affiliations/affiliation_form.html
+++ b/affiliations/templates/affiliations/institute_form.html
@@ -2,52 +2,52 @@
{% load bootstrap %}
-{% block pagetitle %}: Affiliation details{% endblock pagetitle %}
+{% block pagetitle %}: Institutes details{% endblock pagetitle %}
{% block breadcrumb_items %}
{{ block.super }}
- <a href="{% url 'affiliations:affiliations' %}" class="breadcrumb-item">Affiliations</a>
- <span class="breadcrumb-item">Affiliation detail</span>
+ <a href="{% url 'affiliations:institutes' %}" class="breadcrumb-item">Institutes</a>
+ <span class="breadcrumb-item">Institute detail</span>
{% endblock %}
{% block content %}
-<h1>Affiliation {{ affiliation }}</h1>
+<h1>Institute {{ institute }}</h1>
<form method="post">
{% csrf_token %}
{{ form|bootstrap }}
- <input class="btn btn-primary" type="submit" value="Update Affiliation">
+ <input class="btn btn-primary" type="submit" value="Update Institute">
</form>
<br>
-<a href="javascript:;" data-toggle="toggle" data-target="#merging">Merge another affiliation into {{ affiliation }}?</a>
+<a href="javascript:;" data-toggle="toggle" data-target="#merging">Merge another institute into {{ institute }}?</a>
<div id="merging" style="display: none;">
- <h3>Merge affiliations</h3>
+ <h3>Merge institutes</h3>
<div class="card border-danger">
<div class="card-body d-flex flex-row">
<div class="p-2">
<i class="fa fa-2x fa-exclamation-triangle text-warning" aria-hidden="true"></i>
</div>
<div class="px-2">
- You better be sure what you are doing, this is a one-way street. This will merge the chosen affiliation into {{ affiliation }}. The fields of the chosen affiliation <strong>will be lost</strong> however.
+ You better be sure what you are doing, this is a one-way street. This will merge the chosen institute into {{ institute }}. The fields of the chosen institute <strong>will be lost</strong> however.
</div>
</div>
</div>
<br>
- <form action="{% url 'affiliations:merge_affiliations' affiliation.id %}" method="post">
+ <form action="{% url 'affiliations:merge_institutes' institute.id %}" method="post">
{% csrf_token %}
{{ merge_form|bootstrap }}
- <input class="btn btn-primary" type="submit" value="Merge affiliations" onclick="return confirm('Are you sure this is what you want?')">
+ <input class="btn btn-primary" type="submit" value="Merge institutes" onclick="return confirm('Are you sure this is what you want?')">
</form>
</div>
<br>
<br>
-<h3>Contributors of {{ affiliation }}</h3>
+<h3>Contributors of {{ institute }}</h3>
<ul>
- {% for contributor in affiliation.contributors.all %}
+ {% for contributor in institute.contributors.all %}
<li>{{ contributor }}</li>
{% endfor %}
</ul>
diff --git a/affiliations/templates/affiliations/affiliation_list.html b/affiliations/templates/affiliations/institute_list.html
similarity index 54%
rename from affiliations/templates/affiliations/affiliation_list.html
rename to affiliations/templates/affiliations/institute_list.html
index fc64d95fb..c40b5a8c9 100644
--- a/affiliations/templates/affiliations/affiliation_list.html
+++ b/affiliations/templates/affiliations/institute_list.html
@@ -1,25 +1,25 @@
{% extends 'scipost/_personal_page_base.html' %}
-{% block pagetitle %}: Affiliations{% endblock pagetitle %}
+{% block pagetitle %}: Institutes{% endblock pagetitle %}
{% block breadcrumb_items %}
{{ block.super }}
- <span class="breadcrumb-item">Affiliations</span>
+ <span class="breadcrumb-item">Institutes</span>
{% endblock %}
{% block content %}
-<h1>Affiliations</h1>
+<h1>All Institutes in the database</h1>
{% if is_paginated %}
{% include 'partials/pagination.html' with page_obj=page_obj %}
{% endif %}
<ul>
- {% for affiliation in object_list %}
- <li><a href="{% url 'affiliations:affiliation_details' affiliation.id %}">{{ affiliation }}</a></li>
+ {% for institute in object_list %}
+ <li><a href="{% url 'affiliations:institute_details' institute.id %}">{{ institute }}</a></li>
{% empty %}
- <li><em>There are no Affiliations known yet.</em><li>
+ <li><em>There are no Institutes known yet.</em><li>
{% endfor %}
</ul>
{% if is_paginated %}
--
GitLab