[Pkg-debile-commits] [debile-web] 01/01: Improve status granuality

[Jon Severinsson]

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

jonno-guest pushed a commit to branch master
in repository debile-web.

commit 56780ec026901832aa1e7a26fda974a8301226a3
Author: Jon Severinsson <jon at severinsson.net>
Date:   Sun Mar 30 20:16:42 2014 +0200

    Improve status granuality
---
 templates/job.html                  | 22 ++++++++++++++++++----
 templates/job_list_fragment.html    | 22 ++++++++++++++++++----
 templates/source_list_fragment.html | 14 ++++++++------
 3 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/templates/job.html b/templates/job.html
index 1f6ef69..5253f46 100644
--- a/templates/job.html
+++ b/templates/job.html
@@ -68,15 +68,29 @@
                 {% if job.finished_at %}
                     {% if job.check.build %}
                         {# Builds #}
-                        {% if job.failed %}Failed{% else %}Uploaded{% endif %}
+                        {% if job.failed is None %}
+                            ⧖ Upload Pending
+                        {% elif job.failed %}
+                            ✗ Failed
+                        {% else %}
+                            ✓ Uploaded
+                        {% endif %}
                     {% else %}
                         {# Analyzers #}
-                        {% if job.failed %}✗ Errors found{% else %}✓ No errors found{% endif %}
+                        {% if job.failed is None %}
+                            ⧖ Upload Pending
+                        {% elif job.failed %}
+                            ✗ Errors found
+                        {% else %}
+                            ✓ No errors found
+                        {% endif %}
                     {% endif %}
+                {% elif job.assigned_at %}
+                    ⧖ Building
                 {% elif job.externally_blocked or job.depedencies %}
-                    Dep-Wait
+                    ∞ Dep-Wait
                 {% else %}
-                    Needs-Build
+                    ⌚ Needs-Build
                 {% endif %}
             </div>
         </div>
diff --git a/templates/job_list_fragment.html b/templates/job_list_fragment.html
index 39825d7..fda44af 100644
--- a/templates/job_list_fragment.html
+++ b/templates/job_list_fragment.html
@@ -41,15 +41,29 @@
                 {% if info.job.finished_at %}
                     {% if info.job.check.build %}
                         {# Builds #}
-                        {% if info.job.failed %}Failed{% else %}Uploaded{% endif %}
+                        {% if info.job.failed is None %}
+                            ⧖ Upload Pending
+                        {% elif info.job.failed %}
+                            ✗ Failed
+                        {% else %}
+                            ✓ Uploaded
+                        {% endif %}
                     {% else %}
                         {# Analyzers #}
-                        {% if info.job.failed %}✗ Errors found{% else %}✓ No errors found{% endif %}
+                        {% if info.job.failed is None %}
+                            ⧖ Upload Pending
+                        {% elif info.job.failed %}
+                            ✗ Errors found
+                        {% else %}
+                            ✓ No errors found
+                        {% endif %}
                     {% endif %}
+                {% elif info.job.assigned_at %}
+                    ⧖ Building
                 {% elif info.job.externally_blocked or info.job.depedencies %}
-                    Dep-Wait
+                    ∞ Dep-Wait
                 {% else %}
-                    Needs-Build
+                    ⌚ Needs-Build
                 {% endif %}
             </td>
         </tr>
diff --git a/templates/source_list_fragment.html b/templates/source_list_fragment.html
index c5cd65e..4a08b7f 100644
--- a/templates/source_list_fragment.html
+++ b/templates/source_list_fragment.html
@@ -30,17 +30,19 @@
             <td>
                 {% for job in info.source.jobs %}
                     {% if job.finished_at %}
-                        {% if job.failed %}
+                        {% if job.failed is None %}
+                            ⧖
+                        {% elif job.failed %}
                             ✗
                         {% else %}
                             ✓
                         {% endif %}
+                    {% elif job.assigned_at %}
+                        ⧖
+                    {% elif job.externally_blocked or job.depedencies %}
+                        ∞
                     {% else %}
-                        {% if job.assigned_at %}
-                            ⧖
-                        {% else %}
-                            ⌚
-                        {% endif %}
+                        ⌚
                     {% endif %}
                 {% endfor %}
             </td>

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