From d588b774bad297930bb3abb38004505a169c1eaa Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 5 Nov 2018 11:05:32 +0100
Subject: [PATCH] Rechange display in profile_merge
---
.../templates/profiles/profile_merge.html | 45 ++++++++++---------
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/profiles/templates/profiles/profile_merge.html b/profiles/templates/profiles/profile_merge.html
index 3b1bdcfca..12cc944d6 100644
--- a/profiles/templates/profiles/profile_merge.html
+++ b/profiles/templates/profiles/profile_merge.html
@@ -14,27 +14,32 @@
{% block content %}
<div class="row">
- <div class="col-12">
- <h1 class="highlight">Merge Profiles {{ profile_to_merge.id }} and {{ profile_to_merge_into.id }}</h1>
- </div>
- <div class="col-lg-6">
- <h3 class="mb-3">Profile {{ profile_to_merge.id }}</h3>
- {% include 'profiles/_profile_card.html' with profile=profile_to_merge %}
- </div>
- <div class="col-lg-6">
- <h3 class="mb-3">Profile {{ profile_to_merge_into.id }}</h3>
- {% include 'profiles/_profile_card.html' with profile=profile_to_merge_into %}
- </div>
+ <div class="col-12">
+ <h1 class="highlight">Merge Profiles {{ profile_to_merge.id }} and {{ profile_to_merge_into.id }}</h1>
+ </div>
+</div>
+<div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Profile {{ profile_to_merge.id }}</h3>
+ {% include 'profiles/_profile_card.html' with profile=profile_to_merge %}
+ </div>
+</div>
+<div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Profile {{ profile_to_merge_into.id }}</h3>
+ {% include 'profiles/_profile_card.html' with profile=profile_to_merge_into %}
+ </div>
+</div>
- <div class="col-12">
- <hr>
- <h3 class="highlight">Merge:</h3>
- <form method="post">
- {% csrf_token %}
- {{ merge_form|bootstrap }}
- <input class="btn btn-primary" type="submit" value="Confirm merge">
- </form>
- </div>
+<div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Merge:</h3>
+ <form method="post">
+ {% csrf_token %}
+ {{ merge_form|bootstrap }}
+ <input class="btn btn-primary" type="submit" value="Confirm merge">
+ </form>
+ </div>
</div>
{% endblock content %}
--
GitLab