[Pkg-debile-commits] [debile-web] 08/16: Improve the display of the reports pages

[Sylvestre Ledru]

This is an automated email from the git hooks/post-receive script.

sylvestre pushed a commit to branch update-usuability
in repository debile-web.

commit 02c4a1bb9046d194c5a09d5a43a860011c55b7f4
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Wed Aug 28 14:57:16 2013 +0200

    Improve the display of the reports pages
---
 templates/report.html               |    1 +
 templates/report_desc_binary.html   |    4 ++--
 templates/report_desc_source.html   |    4 ++--
 templates/report_list_fragment.html |   23 ++++++++++++++++++++---
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/templates/report.html b/templates/report.html
index 3a71701..2953d69 100644
--- a/templates/report.html
+++ b/templates/report.html
@@ -29,6 +29,7 @@
 {% endif %}
 
 <h1>Full Log</h1>
+<a name="full_log" />
 <pre>
 {% for line in log %}{{line}}{% endfor %}</pre>
 {% endblock %}
diff --git a/templates/report_desc_binary.html b/templates/report_desc_binary.html
index 8fe251c..58d6f38 100644
--- a/templates/report_desc_binary.html
+++ b/templates/report_desc_binary.html
@@ -35,10 +35,10 @@
         </div>
         <div class='desc_line'>
             <div class='desc_key'>job log</div>
-            <div class='desc_value'><a href='{{log_link}}'>text_format</a></div>
+            <div class='desc_value'><a href='{{log_link}}'>Text format</a></div>
         </div>
         <div class='desc_line'>
             <div class='desc_key'>firehose report</div>
-            <div class='desc_value'><a href='{{firehose_link}}'>XML_format</a></div>
+            <div class='desc_value'><a href='{{firehose_link}}'>XML format</a></div>
         </div>
     </div>
diff --git a/templates/report_desc_source.html b/templates/report_desc_source.html
index e7dad40..64e76c7 100644
--- a/templates/report_desc_source.html
+++ b/templates/report_desc_source.html
@@ -27,10 +27,10 @@
 		<h3>Downloads</h3>
         <div class='desc_line'>
             <div class='desc_key'>job log</div>
-            <div class='desc_value'><a href='{{log_link}}'>text_format</a></div>
+            <div class='desc_value'><a href='{{log_link}}'>Text format</a></div>
         </div>
         <div class='desc_line'>
             <div class='desc_key'>firehose report</div>
-            <div class='desc_value'><a href='{{firehose_link}}'>XML_format</a></div>
+            <div class='desc_value'><a href='{{firehose_link}}'>XML format</a></div>
         </div>
     </div>
diff --git a/templates/report_list_fragment.html b/templates/report_list_fragment.html
index d043d7b..9083d09 100644
--- a/templates/report_list_fragment.html
+++ b/templates/report_list_fragment.html
@@ -1,11 +1,16 @@
     <table>
         <tr>
             <th>Type</th>
-            <th>Status</th>
+            <th>Version</th>
             <th>Machine</th>
             <th>Results</th>
         </tr>
+{% set typebuild = '' %}
+
 {% for jobinfo in jobinfolist %}
+{# Add an empty line between the normal build + static analyzers #}
+{% if typebuildprev == "build" and typebuildprev != jobinfo.job.type %}<tr><td colspan="4"> </td></tr>{% endif %}
+
         <tr class='job {% if jobinfo.job.is_finished() %}{% if jobinfo.job.failed %}failed{% else %}success{% endif %}{% endif %}'>
             <td>
                 {% if jobinfo.job.is_finished() %}
@@ -14,7 +19,7 @@
                 {{jobinfo.job.type}}{% if jobinfo.job.subtype %}/{{jobinfo.job.subtype}}{% endif %} <em>({{jobinfo.job.arch}})</em>
                 {% endif %}
             </td>
-            <td>{{jobinfo.status}}</td>
+            <td>{{package.version}}</td>
             <td>
                 {% if jobinfo.job.machine %}
                 <a href = '{{jobinfo.job_machine_link}}' >{{jobinfo.job.machine.name}}</a>
@@ -22,7 +27,19 @@
 				not assigned yet
                 {% endif %}
             </td>
-            <td>{% if jobinfo.job.is_finished() %}{% if jobinfo.job.failed %}✗ Errors found{% else %}✓ Nothing found{% endif %}{% endif %}</td>
+            <td>{% if jobinfo.job.is_finished() %}
+	      {% if jobinfo.job.type == "build" %} {# Build of the package package #}
+	          {% if jobinfo.job.failed %}Failed{% else %}Uploaded{% endif %}
+	      {% else %} {# Analyzers #}
+                  {% if jobinfo.job.failed %}<a href='{{jobinfo.job_link}}#full_log'>✗ Errors found</a>{% else %}✓ Nothing found{% endif %}
+	      {% endif %}
+	      {% else %}
+	      Needs-Build
+	      {% endif %}
+	    </td>
+
+{% set typebuildprev = jobinfo.job.type %}
+
         </tr>
 {% endfor %}
 {% if jobinfolist|length == 0 %}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-web.git