From a3e915941eb6ae5f64ca4be70e95029e1ddacc10 Mon Sep 17 00:00:00 2001
From: Kai Schlamp <kai.schlamp@gmail.com>
Date: Wed, 16 Aug 2023 11:03:54 +0000
Subject: [PATCH] Introduce batch transfer layout

---
 .../{batch_transfer_job_form.js => batch_transfer.js}      | 0
 .../batch_transfer/batch_transfer_job_detail.html          | 2 +-
 .../templates/batch_transfer/batch_transfer_job_form.html  | 7 +------
 .../templates/batch_transfer/batch_transfer_job_list.html  | 2 +-
 .../templates/batch_transfer/batch_transfer_layout.html    | 6 ++++++
 .../batch_transfer/batch_transfer_task_detail.html         | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)
 rename adit/batch_transfer/static/batch_transfer/{batch_transfer_job_form.js => batch_transfer.js} (100%)
 create mode 100644 adit/batch_transfer/templates/batch_transfer/batch_transfer_layout.html

diff --git a/adit/batch_transfer/static/batch_transfer/batch_transfer_job_form.js b/adit/batch_transfer/static/batch_transfer/batch_transfer.js
similarity index 100%
rename from adit/batch_transfer/static/batch_transfer/batch_transfer_job_form.js
rename to adit/batch_transfer/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
index 85bcc41f..b565aba4 100644
--- 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
index e5e0d5d8..9f753e3c 100644
--- 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
index a6b75988..f85a417d 100644
--- 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
new file mode 100644
index 00000000..af798382
--- /dev/null
+++ 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
index 57dd3327..4e57960d 100644
--- 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 %}