From 98e47b74cb9512f269f734c6989844101f15f937 Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Thu, 8 Jan 2026 14:09:38 -0600 Subject: Extract common UI elements to a macro. --- uploader/templates/background-jobs/delete-job.html | 29 ++-------------------- .../templates/background-jobs/job-summary.html | 29 ++-------------------- .../background-jobs/macro-display-job-details.html | 29 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 54 deletions(-) create mode 100644 uploader/templates/background-jobs/macro-display-job-details.html diff --git a/uploader/templates/background-jobs/delete-job.html b/uploader/templates/background-jobs/delete-job.html index 6dc2144..242c775 100644 --- a/uploader/templates/background-jobs/delete-job.html +++ b/uploader/templates/background-jobs/delete-job.html @@ -1,5 +1,6 @@ {%extends "background-jobs/base.html"%} {%from "flash_messages.html" import flash_all_messages%} +{%from "background-jobs/macro-display-job-details.html" import display_job_details%} {%block title%}Background Jobs{%endblock%} @@ -22,33 +23,7 @@

Are you sure you want to delete the job below?

- - - - - - - - - - - - - - - - - - - - - - - - - - -
Job ID{{job.job_id}}
Type{{job.metadata["job-type"]}}
Created{{display_datetime(job.created)}}
Expires{{display_datetime(job.expires)}}
Status{{job.metadata.status}}
+ {{display_job_details(job, display_datetime)}}
diff --git a/uploader/templates/background-jobs/job-summary.html b/uploader/templates/background-jobs/job-summary.html index cffa785..e46f963 100644 --- a/uploader/templates/background-jobs/job-summary.html +++ b/uploader/templates/background-jobs/job-summary.html @@ -1,5 +1,6 @@ {%extends "background-jobs/base.html"%} {%from "flash_messages.html" import flash_all_messages%} +{%from "background-jobs/macro-display-job-details.html" import display_job_details%} {%block title%}Background Jobs{%endblock%} @@ -20,33 +21,7 @@

background jobs: summary

- - - - - - - - - - - - - - - - - - - - - - - - - - -
Job ID{{job.job_id}}
Type{{job.metadata["job-type"]}}
Created{{display_datetime(job.created)}}
Expires{{display_datetime(job.expires)}}
Status{{job.metadata.status}}
+ {{display_job_details(job, display_datetime)}}
diff --git a/uploader/templates/background-jobs/macro-display-job-details.html b/uploader/templates/background-jobs/macro-display-job-details.html new file mode 100644 index 0000000..82e33c0 --- /dev/null +++ b/uploader/templates/background-jobs/macro-display-job-details.html @@ -0,0 +1,29 @@ +{%macro display_job_details(job, display_datetime)%} + + + + + + + + + + + + + + + + + + + + + + + + + + +
Job ID{{job.job_id}}
Type{{job.metadata["job-type"]}}
Created{{display_datetime(job.created)}}
Expires{{display_datetime(job.expires)}}
Status{{job.metadata.status}}
+{%endmacro%} -- cgit 1.4.1