almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-04-29 17:52:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix layout of history deletion modals

Browse source
This commit is contained in:
Baptiste Jonglez 2021-07-17 13:42:45 +02:00 committed by zorun
parent c69b8d66eb
commit 82f3f067ef
2 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ihatemoney/templates/forms.html
View file

@ -130,9 +130,6 @@
{% include "display_errors.html" %} {% include "display_errors.html" %}
{{ form.hidden_tag() }} {{ form.hidden_tag() }}
{{ input(form.password, inline=True) }} {{ input(form.password, inline=True) }}
<div class="actions">
<button class="btn btn-danger">{{ _("Confirm deletion") }}</button>
</div>
{% endmacro %} {% endmacro %}
@ -141,9 +138,6 @@
{% include "display_errors.html" %} {% include "display_errors.html" %}
{{ form.hidden_tag() }} {{ form.hidden_tag() }}
{{ input(form.password) }} {{ input(form.password) }}
<div class="actions">
<button class="btn btn-danger">{{ _("Confirm deletion") }}</button>
</div>
{% endmacro %} {% endmacro %}

18
ihatemoney/templates/history.html
View file

@ -43,7 +43,7 @@
<!-- Modal --> <!-- Modal -->
<div id="confirm-ip-delete" class="modal fade show" role="dialog"> <div id="confirm-ip-delete" class="modal fade show" role="dialog">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <form class="modal-content" action="{{ url_for(".strip_ip_addresses") }}" method="post">
<div class="modal-header"> <div class="modal-header">
<h3 class="modal-title">{{ _('Confirm Remove IP Adresses') }}</h3> <h3 class="modal-title">{{ _('Confirm Remove IP Adresses') }}</h3>
<a href="#" class="close" data-dismiss="modal">&times;</a> <a href="#" class="close" data-dismiss="modal">&times;</a>
@ -51,36 +51,34 @@
<div class="modal-body"> <div class="modal-body">
<p>{{ _("Are you sure you want to delete all recorded IP addresses from this project? <p>{{ _("Are you sure you want to delete all recorded IP addresses from this project?
The rest of the project history will be unaffected. This action cannot be undone.") }}</p> The rest of the project history will be unaffected. This action cannot be undone.") }}</p>
{{ forms.delete_ip_addresses(delete_form) }}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-danger">{{ _("Confirm deletion") }}</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">{{ _("Close") }}</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ _("Close") }}</button>
<form action="{{ url_for(".strip_ip_addresses") }}" method="post"> </div>
{{ forms.delete_ip_addresses(delete_form) }}
</form> </form>
</div> </div>
</div> </div>
</div>
</div>
<!-- Modal --> <!-- Modal -->
<div id="confirm-erase" class="modal fade show" role="dialog"> <div id="confirm-erase" class="modal fade show" role="dialog">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <form class="modal-content" action="{{ url_for(".erase_history") }}" method="post">
<div class="modal-header"> <div class="modal-header">
<h3 class="modal-title">{{ _('Delete Confirmation') }}</h3> <h3 class="modal-title">{{ _('Delete Confirmation') }}</h3>
<a href="#" class="close" data-dismiss="modal">&times;</a> <a href="#" class="close" data-dismiss="modal">&times;</a>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>{{ _("Are you sure you want to erase all history for this project? This action cannot be undone.") }}</p> <p>{{ _("Are you sure you want to erase all history for this project? This action cannot be undone.") }}</p>
{{ forms.delete_project_history(delete_form) }}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-danger">{{ _("Confirm deletion") }}</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">{{ _("Close") }}</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ _("Close") }}</button>
<form action="{{ url_for(".erase_history") }}" method="post"> </div>
{{ forms.delete_project_history(delete_form) }}
</form> </form>
</div> </div>
</div> </div>
</div>
</div>
{% endmacro %} {% endmacro %}
{% macro owers_changed(event, add) %} {% macro owers_changed(event, add) %}