Rework batch query layouts

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

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/...tatic/batch_query/batch_query_job_form.js → ...h_query/static/batch_query/batch_query.js b/...tatic/batch_query/batch_query_job_form.js → ...h_query/static/batch_query/batch_query.js
diff --git a/adit/batch_query/templates/batch_query/batch_query_job_detail.html b/adit/batch_query/templates/batch_query/batch_query_job_detail.html
@@ -1,4 +1,4 @@
-{% extends "core/core_layout.html" %}
+{% extends "batch_query/batch_query_layout.html" %}
 {% load dicom_job_status_css_class from core_extras %}
 {% load render_table from django_tables2 %}
 {% load job_control_panel from batch_query_extras %}

diff --git a/adit/batch_query/templates/batch_query/batch_query_job_form.html b/adit/batch_query/templates/batch_query/batch_query_job_form.html
@@ -1,10 +1,5 @@
-{% extends "core/core_layout.html" %}
-{% load static from static %}
+{% extends "batch_query/batch_query_layout.html" %}
 {% load crispy from crispy_forms_tags %}
-{% block script %}
-    {{ block.super }}
-    <script src="{% static 'batch_query/batch_query_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_query/templates/batch_query/batch_query_job_list.html b/adit/batch_query/templates/batch_query/batch_query_job_list.html
@@ -1,4 +1,4 @@
-{% extends "core/core_layout.html" %}
+{% extends "batch_query/batch_query_layout.html" %}
 {% block heading %}
     <div class="d-flex justify-content-between align-items-start">
         <h4 class="mb-3">Batch Query Jobs</h4>

diff --git a/adit/batch_query/templates/batch_query/batch_query_layout.html b/adit/batch_query/templates/batch_query/batch_query_layout.html
@@ -0,0 +1,6 @@
+{% extends "core/core_layout.html" %}
+{% load static from static %}
+{% block script %}
+    {{ block.super }}
+    <script src="{% static 'batch_query/batch_query.js' %}"></script>
+{% endblock script %}
diff --git a/adit/batch_query/templates/batch_query/batch_query_result_list.html b/adit/batch_query/templates/batch_query/batch_query_result_list.html
@@ -1,4 +1,4 @@
-{% extends "core/core_layout.html" %}
+{% extends "batch_query/batch_query_layout.html" %}
 {% load render_table from django_tables2 %}
 {% block heading %}
     <div class="d-flex justify-content-between align-items-start">

diff --git a/adit/batch_query/templates/batch_query/batch_query_task_detail.html b/adit/batch_query/templates/batch_query/batch_query_task_detail.html
@@ -1,4 +1,4 @@
-{% extends "core/core_layout.html" %}
+{% extends "batch_query/batch_query_layout.html" %}
 {% load dicom_task_status_css_class from core_extras %}
 {% load crispy from crispy_forms_tags %}
 {% load render_table from django_tables2 %}