about summary refs log tree commit diff
path: root/uploader/templates
diff options
context:
space:
mode:
Diffstat (limited to 'uploader/templates')
-rw-r--r--uploader/templates/background-jobs/default-success-page.html17
-rw-r--r--uploader/templates/background-jobs/job-summary.html14
-rw-r--r--uploader/templates/base.html2
3 files changed, 8 insertions, 25 deletions
diff --git a/uploader/templates/background-jobs/default-success-page.html b/uploader/templates/background-jobs/default-success-page.html
deleted file mode 100644
index 5732456..0000000
--- a/uploader/templates/background-jobs/default-success-page.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{%extends "phenotypes/base.html"%}
-{%from "flash_messages.html" import flash_all_messages%}
-
-{%block title%}Background Jobs: Success{%endblock%}
-
-{%block pagetitle%}Background Jobs: Success{%endblock%}
-
-{%block contents%}
-{{flash_all_messages()}}
-
-<div class="row">
-  <p>Job <strong>{{job.job_id}}</strong>,
-    {%if job.get("metadata", {}).get("job-type")%}
-    of type '<em>{{job.metadata["job-type"]}}</em>
-    {%endif%}' completed successfully.</p>
-</div>
-{%endblock%}
diff --git a/uploader/templates/background-jobs/job-summary.html b/uploader/templates/background-jobs/job-summary.html
index fe62d5d..c2c2d6b 100644
--- a/uploader/templates/background-jobs/job-summary.html
+++ b/uploader/templates/background-jobs/job-summary.html
@@ -25,18 +25,13 @@
 </div>
 
 <div class="row">
+  {%if view_under_construction%}
   <div class="col">
     <a href="#"
        class="btn btn-info not-implemented"
        title="Update the expiry date and time for this job.">update expiry</a>
   </div>
 
-  <div class="col">
-    <a href="{{url_for('background-jobs.delete_single', job_id=job.job_id)}}"
-       class="btn btn-danger"
-       title="Delete this job.">delete</a>
-  </div>
-
   {%if job.metadata.status in ("stopped",)%}
   <div class="col">
     <a href="#"
@@ -44,6 +39,13 @@
        title="Create a new copy of this job, and run the copy.">Run Copy</a>
   </div>
   {%endif%}
+  {%endif%}
+
+  <div class="col">
+    <a href="{{url_for('background-jobs.delete_single', job_id=job.job_id)}}"
+       class="btn btn-danger"
+       title="Delete this job.">delete</a>
+  </div>
 </div>
 
 <div class="row">
diff --git a/uploader/templates/base.html b/uploader/templates/base.html
index dd097de..ae4ecef 100644
--- a/uploader/templates/base.html
+++ b/uploader/templates/base.html
@@ -32,7 +32,6 @@
       <nav id="header-nav">
         <ul class="nav">
           {%if user_logged_in()%}
-          {%if view_under_construction%}
           <li>
             <a href="{{url_for('background-jobs.list_jobs')}}"
                title="User's background jobs.">
@@ -43,7 +42,6 @@
               Background jobs
             </a>
           </li>
-          {%endif%}
 
           <li>
             <a href="{{url_for('oauth2.logout')}}"