Skip to content

Commit

Permalink
[OSIS-9022] Mig BS5 Style for async modal
Browse files Browse the repository at this point in the history
  • Loading branch information
leboiss committed May 22, 2024
1 parent f2a026d commit 07a9946
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
3 changes: 2 additions & 1 deletion frontend/components/AsyncTask.vue
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ export default defineComponent({
background-color: #f5f5f5;
}
.label {
.label,
.badge {
margin-right: 10px;
}
Expand Down
2 changes: 1 addition & 1 deletion osis_async/static/osis_async/osis-async.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion osis_async/static/osis_async/osis-async.umd.min.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions osis_async/templates/osis_async/modal_async_progress.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
<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>
data-dismiss="modal" data-bs-dismiss="modal" aria-label="{% trans 'close' %}"></button>
</div>
<div class="modal-body">
<div class="progress">
<div class="progress-bar
progress-bar-striped
{% if task.est_termine %}
progress-bar-success
progress-bar-success bg-success
{% else %}
active
{% endif %}"
Expand All @@ -61,7 +61,7 @@
{% if task.est_termine %}
{% block task_finished %}{% endblock task_finished %}
{% else %}
<div class="alert alert-info">
<div class="alert alert-info mt-3">
<span>
{% trans 'The task is being processed. You can keep this window open to see the progress or you can close this window and check the progress at any time via the task menu.' %}
</span>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"scripts": {
"build": "vite build --outDir osis_async/static/osis_async --mode production --sourcemap true",
"watch": "vite build --outDir osis_async/static/osis_async --mode production --sourcemap true --watch",
"watch": "vite build --outDir osis_async/static/osis_async --mode production --watch",
"test": "vitest",
"lint": "eslint frontend --ext .vue,.ts,.js; vue-tsc",
"coverage": "vitest run --coverage",
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

setup(
name='OSIS Async',
version='0.9',
version='0.10',
description='Asynchronous tasks API and UI',
url='http://github.com/uclouvain/osis-async',
author='Université catholique de Louvain',
Expand Down

0 comments on commit 07a9946

Please sign in to comment.