Merge branch 'master' into manage_button

This commit is contained in:
Pierre-antoine Comby 2020-03-23 15:40:01 +01:00
commit 4e17b50e35
1 changed files with 11 additions and 11 deletions

View File

@ -33,6 +33,16 @@ SPDX-License-Identifier: GPL-2.0-or-later
</div> </div>
<div class="row"> <div class="row">
<div class="col-xl-4" id="note_infos_div">
<div class="card border-success shadow mb-4">
<img src="/media/pic/default.png"
id="profile_pic" alt="" class="img-fluid rounded mx-auto d-block">
<div class="card-body text-center">
<span id="user_note"></span>
</div>
</div>
</div>
<div class="col-md-4" id="emitters_div" style="display: none;"> <div class="col-md-4" id="emitters_div" style="display: none;">
<div class="card border-success shadow mb-4"> <div class="card border-success shadow mb-4">
<div class="card-header"> <div class="card-header">
@ -50,16 +60,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
</div> </div>
</div> </div>
<div class="col-xl-4" id="note_infos_div">
<div class="card border-success shadow mb-4">
<img src="/media/pic/default.png"
id="profile_pic" alt="" class="img-fluid rounded mx-auto d-block">
<div class="card-body text-center">
<span id="user_note"></span>
</div>
</div>
</div>
{% if "note.notespecial"|not_empty_model_list %} {% if "note.notespecial"|not_empty_model_list %}
<div class="col-md-4" id="external_div" style="display: none;"> <div class="col-md-4" id="external_div" style="display: none;">
<div class="card border-success shadow mb-4"> <div class="card border-success shadow mb-4">
@ -170,8 +170,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
}); });
$("#type_transfer").click(function() { $("#type_transfer").click(function() {
$("#emitters_div").show();
$("#external_div").hide(); $("#external_div").hide();
$("#emitters_div").show();
$("#dests_div").attr('class', 'col-md-4'); $("#dests_div").attr('class', 'col-md-4');
$("#dest_title").text("{% trans "Select receivers" %}"); $("#dest_title").text("{% trans "Select receivers" %}");
}); });