From f7a94f0b7d4f49449d0794b5946cc2a87de811d9 Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Wed, 20 Jan 2021 21:49:04 +1100
Subject: [PATCH] allow job log to have links embedded, and label num files
 when N/A better

---
 templates/joblog.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/templates/joblog.html b/templates/joblog.html
index 80abeaf..b9859a3 100644
--- a/templates/joblog.html
+++ b/templates/joblog.html
@@ -37,17 +37,17 @@
 		<label class="form-control-plaintext col-lg-2">Current File:</label>
 		<label class="form-control-plaintext col-lg-10">{{job.current_file}}</label>
 	</div>
+    <div class="row col-lg-12">
+         <label class="form-control-plaintext col-lg-2">Files in pass:</label>
     {% if job.num_files and job.num_files > 0 %}
-        <div class="row col-lg-12">
-            <label class="form-control-plaintext col-lg-2">Files in pass:</label>
-            <div class="col-lg-10 px-0">
-                {% set prog=(job.current_file_num/job.num_files*100)|round|int %}
-                <div class="progress" style="height:80%">
-                    <div class="progress-bar bg-info" role="progressbar" style="width: {{prog}}%;" aria-valuenow="{{prog}}" aria-valuemin="0" aria-valuemax="100">{{job.current_file_num}} of {{job.num_files}} - {{prog}}%</div>
-                </div>
-        {% else %}
-            N/A
-        {% endif %}
+         <div class="col-lg-10 px-0">
+            {% set prog=(job.current_file_num/job.num_files*100)|round|int %}
+            <div class="progress" style="height:80%">
+                <div class="progress-bar bg-info" role="progressbar" style="width: {{prog}}%;" aria-valuenow="{{prog}}" aria-valuemin="0" aria-valuemax="100">{{job.current_file_num}} of {{job.num_files}} - {{prog}}%</div>
+            </div>
+    {% else %}
+        <label class="form-control-plaintext col-lg-10">N/A</label>
+    {% endif %}
 	</div>
 	</div>
     <div class="row col-lg-12">
@@ -55,7 +55,7 @@
             <thead><tr class="thead-light"><th>When</th><th>Details</th></tr></thead>
             <tbody>
             {% for log in logs %}
-                <tr><td>{{log.log_date|vicdate}}</td><td>{{log.log}}</td></tr>
+                <tr><td>{{log.log_date|vicdate}}</td><td>{{log.log|safe}}</td></tr>
             {% endfor %}
             </tbody>
         </table>