Introduce batch transfer layout

openradx · Aug 16, 2023 · a3e9159 · a3e9159
1 parent fef9037
commit a3e9159
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/...batch_transfer/batch_transfer_job_form.js → ...r/static/batch_transfer/batch_transfer.js b/...batch_transfer/batch_transfer_job_form.js → ...r/static/batch_transfer/batch_transfer.js
diff --git a/adit/batch_transfer/templates/batch_transfer/batch_transfer_job_detail.html b/adit/batch_transfer/templates/batch_transfer/batch_transfer_job_detail.html
@@ -1,4 +1,4 @@
-{% extends "core/core_layout.html" %}
+{% extends "batch_transfer/batch_transfer_layout.html" %}
 {% load dicom_job_status_css_class from core_extras %}
 {% load render_table from django_tables2 %}
 {% load job_control_panel from batch_transfer_extras %}

diff --git a/adit/batch_transfer/templates/batch_transfer/batch_transfer_job_form.html b/adit/batch_transfer/templates/batch_transfer/batch_transfer_job_form.html
@@ -1,10 +1,5 @@
-{% extends "core/core_layout.html" %}
-{% load static from static %}
+{% extends "batch_transfer/batch_transfer_layout.html" %}
 {% load crispy from crispy_forms_tags %}
-{% block script %}
-    {{ block.super }}
-    <script src="{% static 'batch_transfer/batch_transfer_job_form.js' %}"></script>
-{% endblock script %}
 {% block heading %}
     <div class="d-flex justify-content-between align-items-start">
         <h4 class="mb-3">

diff --git a/adit/batch_transfer/templates/batch_transfer/batch_transfer_job_list.html b/adit/batch_transfer/templates/batch_transfer/batch_transfer_job_list.html
@@ -1,4 +1,4 @@
-{% extends "core/core_layout.html" %}
+{% extends "batch_transfer/batch_transfer_layout.html" %}
 {% block heading %}
     <div class="d-flex justify-content-between align-items-start">
         <h4 class="mb-3">Batch Transfer Jobs</h4>

diff --git a/adit/batch_transfer/templates/batch_transfer/batch_transfer_layout.html b/adit/batch_transfer/templates/batch_transfer/batch_transfer_layout.html
@@ -0,0 +1,6 @@
+{% extends "core/core_layout.html" %}
+{% load static from static %}
+{% block script %}
+    {{ block.super }}
+    <script src="{% static 'batch_transfer/batch_transfer.js' %}"></script>
+{% endblock script %}
diff --git a/adit/batch_transfer/templates/batch_transfer/batch_transfer_task_detail.html b/adit/batch_transfer/templates/batch_transfer/batch_transfer_task_detail.html
@@ -1,4 +1,4 @@
-{% extends "core/core_layout.html" %}
+{% extends "batch_transfer/batch_transfer_layout.html" %}
 {% block heading %}
     <h4 class="mb-3">Batch Transfer Task</h4>
 {% endblock heading %}