Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[OSIS-9022] osis-async modal migration BS5 #29

Merged
merged 2 commits into from
May 6, 2024
Merged

[OSIS-9022] osis-async modal migration BS5 #29

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f1bace
[OSIS-9022] osis-async modal migration BS5
Apr 11, 2024
5c57bca
Merge branch 'dev' into feature/OA-9022
mathieuzen May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions osis_async/templates/osis_async/modal_async_progress.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@
{% endif %}
>
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">×</button>
{% block modal_title %}{% endblock modal_title %}
<button type="button" class="close hide-bs3-element" data-dismiss="modal">×</button>
{% block modal_title %}{% endblock modal_title %}
<button type="button" class="btn-close d-none display-bs5-element"
data-dismiss="modal" data-bs-dismiss="modal" aria-label="{% trans 'close' %}"></button>
</div>
<div class="modal-body">
<div class="progress">
Expand Down Expand Up @@ -68,7 +70,7 @@
</div>
<div class="modal-footer">
{% block modal_footer %}
<button type="button" class="btn btn-secondary" data-dismiss="modal">{% trans 'Ok' %}</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" data-bs-dismiss="modal">{% trans 'Ok' %}</button>
{% endblock %}
</div>
</div>
Loading