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 }} - -{% endblock script %} {% block heading %}

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 %}

Batch Transfer Jobs

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 }} + +{% 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 %}

Batch Transfer Task

{% endblock heading %}