diff options
| author | Frederick Muriuki Muriithi | 2026-01-08 14:09:38 -0600 |
|---|---|---|
| committer | Frederick Muriuki Muriithi | 2026-01-08 14:09:38 -0600 |
| commit | 98e47b74cb9512f269f734c6989844101f15f937 (patch) | |
| tree | 2615e09439276f3db98c9f654eed7341f97d7fdd /uploader | |
| parent | 4d7d1e2b6111bd17c6db6a9a270018b6b66a49f9 (diff) | |
| download | gn-uploader-98e47b74cb9512f269f734c6989844101f15f937.tar.gz | |
Extract common UI elements to a macro.
Diffstat (limited to 'uploader')
3 files changed, 33 insertions, 54 deletions
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 @@ <p class="text-danger">Are you sure you want to delete the job below?</p> - <table class="table"> - <thead> - </thead> - - <tbody> - <tr> - <th class="table-primary">Job ID</th> - <td>{{job.job_id}}</td> - </tr> - <tr> - <th class="table-primary">Type</th> - <td>{{job.metadata["job-type"]}}</td> - </tr> - <tr> - <th class="table-primary">Created</th> - <td>{{display_datetime(job.created)}}</td> - </tr> - <tr> - <th class="table-primary">Expires</th> - <td>{{display_datetime(job.expires)}}</td> - </tr> - <tr> - <th class="table-primary">Status</th> - <td>{{job.metadata.status}}</td> - </tr> - </tbody> - </table> + {{display_job_details(job, display_datetime)}} </div> <div class="row"> 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 @@ <div class="row"> <h2 class="heading">background jobs: summary</h2> - <table class="table"> - <thead> - </thead> - - <tbody> - <tr> - <th class="table-primary">Job ID</th> - <td>{{job.job_id}}</td> - </tr> - <tr> - <th class="table-primary">Type</th> - <td>{{job.metadata["job-type"]}}</td> - </tr> - <tr> - <th class="table-primary">Created</th> - <td>{{display_datetime(job.created)}}</td> - </tr> - <tr> - <th class="table-primary">Expires</th> - <td>{{display_datetime(job.expires)}}</td> - </tr> - <tr> - <th class="table-primary">Status</th> - <td>{{job.metadata.status}}</td> - </tr> - </tbody> - </table> + {{display_job_details(job, display_datetime)}} </div> <div class="row"> 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)%} +<table class="table"> + <thead> + </thead> + + <tbody> + <tr> + <th class="table-primary">Job ID</th> + <td>{{job.job_id}}</td> + </tr> + <tr> + <th class="table-primary">Type</th> + <td>{{job.metadata["job-type"]}}</td> + </tr> + <tr> + <th class="table-primary">Created</th> + <td>{{display_datetime(job.created)}}</td> + </tr> + <tr> + <th class="table-primary">Expires</th> + <td>{{display_datetime(job.expires)}}</td> + </tr> + <tr> + <th class="table-primary">Status</th> + <td>{{job.metadata.status}}</td> + </tr> + </tbody> +</table> +{%endmacro%} |