Merge remote-tracking branch 'upstream/main' into storage-s3

This commit is contained in:
Joachim
2021-06-19 11:53:05 +02:00
172 changed files with 3693 additions and 2147 deletions

View File

@@ -8,6 +8,7 @@
{% block content %}{% spaceless %}
<div class="block">
<h1 class="title">{% trans "Import Status" %}</h1>
<a href="{% url 'import' %}" class="has-text-weight-normal help subtitle is-link">{% trans "Back to imports" %}</a>
<dl>
<div class="is-flex">
@@ -107,7 +108,11 @@
{% endif %}
<div class="block">
{% if job.complete %}
<h2 class="title is-4">{% trans "Successfully imported" %}</h2>
{% else %}
<h2 class="title is-4">{% trans "Import Progress" %}</h2>
{% endif %}
<table class="table">
<tr>
<th>