SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit d588b774 authored by Jean-Sébastien Caux's avatar Jean-Sébastien Caux
Browse files

Rechange display in profile_merge

parent bf92ec3f
No related branches found
No related tags found
No related merge requests found
...@@ -14,27 +14,32 @@ ...@@ -14,27 +14,32 @@
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<h1 class="highlight">Merge Profiles {{ profile_to_merge.id }} and {{ profile_to_merge_into.id }}</h1> <h1 class="highlight">Merge Profiles {{ profile_to_merge.id }} and {{ profile_to_merge_into.id }}</h1>
</div> </div>
<div class="col-lg-6"> </div>
<h3 class="mb-3">Profile {{ profile_to_merge.id }}</h3> <div class="row">
{% include 'profiles/_profile_card.html' with profile=profile_to_merge %} <div class="col-12">
</div> <h3 class="highlight">Profile {{ profile_to_merge.id }}</h3>
<div class="col-lg-6"> {% include 'profiles/_profile_card.html' with profile=profile_to_merge %}
<h3 class="mb-3">Profile {{ profile_to_merge_into.id }}</h3> </div>
{% include 'profiles/_profile_card.html' with profile=profile_to_merge_into %} </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"> <div class="row">
<hr> <div class="col-12">
<h3 class="highlight">Merge:</h3> <h3 class="highlight">Merge:</h3>
<form method="post"> <form method="post">
{% csrf_token %} {% csrf_token %}
{{ merge_form|bootstrap }} {{ merge_form|bootstrap }}
<input class="btn btn-primary" type="submit" value="Confirm merge"> <input class="btn btn-primary" type="submit" value="Confirm merge">
</form> </form>
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment