diff --git a/unittest-logs/unittestweb/templates/base.html b/unittest-logs/unittestweb/templates/base.html new file mode 100755 index 0000000..a906e0c --- /dev/null +++ b/unittest-logs/unittestweb/templates/base.html @@ -0,0 +1,113 @@ + + + +Topfails + + + + + + + + + + + + + + + + + + + + +
+
+
+
Mozilla Tinderbox Topfails Dashboard
+
+ + + + + + + +
+{% block content %} +{% endblock %} +
+ + diff --git a/unittest-logs/unittestweb/templates/viewer/Help.html b/unittest-logs/unittestweb/templates/viewer/Help.html index 724d90a..b03ed04 100755 --- a/unittest-logs/unittestweb/templates/viewer/Help.html +++ b/unittest-logs/unittestweb/templates/viewer/Help.html @@ -1,45 +1,5 @@ - - - -Help - - - - - - - - - -
-
+{% extends "base.html" %} +{% block content %}
This web site provides the bird eye view of top failures and other details of Firefox unit tests  from the  Tinderbox daily runs.

Meaning of the Left navigation links
@@ -58,7 +18,4 @@ DIV,UL,OL /* Left */
Example queries for advanced users 2 days failures
Example queries for advanced users 24 hours failures
Example queries for advanced users 1 month failures
-
- - - +{% endblock %} diff --git a/unittest-logs/unittestweb/templates/viewer/changeset.html b/unittest-logs/unittestweb/templates/viewer/changeset.html index 969506c..ca8c307 100755 --- a/unittest-logs/unittestweb/templates/viewer/changeset.html +++ b/unittest-logs/unittestweb/templates/viewer/changeset.html @@ -1,6 +1,9 @@ -

Changeset {{ changeset }}

+{% extends "base.html" %} +{% block content %} +

Changeset {{ changeset }}

    {% for build in builds %}
  • {{ build.tree }}: {{ build.get_os_display }}: {{ build.get_status_display }}
    • {% endfor %}
+{% endblock %} diff --git a/unittest-logs/unittestweb/templates/viewer/changesets.html b/unittest-logs/unittestweb/templates/viewer/changesets.html index 51e542a..f2208fa 100755 --- a/unittest-logs/unittestweb/templates/viewer/changesets.html +++ b/unittest-logs/unittestweb/templates/viewer/changesets.html @@ -1,6 +1,9 @@ -

Changesets

+{% extends "base.html" %} +{% block content %} +

Changesets

    {% for c in changesets %}
  • {{ c }}
    • {% endfor %}
+{% endblock %} diff --git a/unittest-logs/unittestweb/templates/viewer/failswindow.html b/unittest-logs/unittestweb/templates/viewer/failswindow.html index 9678701..4c6647c 100644 --- a/unittest-logs/unittestweb/templates/viewer/failswindow.html +++ b/unittest-logs/unittestweb/templates/viewer/failswindow.html @@ -1,7 +1,10 @@ -

Failed tests from last {{n}} {{d}} up to now

+{% extends "base.html" %} +{% block content %} +

Failed tests from last {{n}} {{d}} up to now

{% for f in failures %} {% endfor %}
CountTest name
{{ f.0 }}{{ f.1 }}
+{% endblock %} diff --git a/unittest-logs/unittestweb/templates/viewer/index.html b/unittest-logs/unittestweb/templates/viewer/index.html index 0833683..ff2fdd9 100755 --- a/unittest-logs/unittestweb/templates/viewer/index.html +++ b/unittest-logs/unittestweb/templates/viewer/index.html @@ -1,96 +1,15 @@ - +{% extends "base.html" %} +{% block content %} - - - - - - - - - - - - - - - - -
- -
- -
-
-
Firefox Central Tinderbox Topfails Dashboard
-
- -
- - - + li { + padding-bottom: 10px; } + +

Most recent test failures

+
    +{% for f in failures %} +
  • {{ f.build.startdate|date:"Y-m-d H:i" }} {{ f.build.tree.name }} {{ f.build.get_os_display }}: {{ f.name }}, + timeline + - {{ f.description }}
    • +{% endfor %} +
+{% endblock %} diff --git a/unittest-logs/unittestweb/templates/viewer/latest.html b/unittest-logs/unittestweb/templates/viewer/latest.html index 4ef5f0a..ff2fdd9 100755 --- a/unittest-logs/unittestweb/templates/viewer/latest.html +++ b/unittest-logs/unittestweb/templates/viewer/latest.html @@ -1,4 +1,10 @@ -

Most recent test failures

+{% extends "base.html" %} +{% block content %} + +

Most recent test failures

    {% for f in failures %}
  • {{ f.build.startdate|date:"Y-m-d H:i" }} {{ f.build.tree.name }} {{ f.build.get_os_display }}: {{ f.name }}, @@ -6,3 +12,4 @@ - {{ f.description }}
    • {% endfor %}
+{% endblock %} diff --git a/unittest-logs/unittestweb/templates/viewer/test.html b/unittest-logs/unittestweb/templates/viewer/test.html index de4954d..de350d0 100755 --- a/unittest-logs/unittestweb/templates/viewer/test.html +++ b/unittest-logs/unittestweb/templates/viewer/test.html @@ -1,4 +1,6 @@ -

Test results for {{ test }}

+{% extends "base.html" %} +{% block content %} +

Test results for {{ test }}

    • {% for f in failures %}{% ifchanged f.build.id %}
  • @@ -6,3 +8,4 @@
      {% endifchanged %}
    • {{ f.description }}
      • {% endfor %}
    +{% endblock %} diff --git a/unittest-logs/unittestweb/templates/viewer/tests.html b/unittest-logs/unittestweb/templates/viewer/tests.html index 92807f4..04bdb22 100755 --- a/unittest-logs/unittestweb/templates/viewer/tests.html +++ b/unittest-logs/unittestweb/templates/viewer/tests.html @@ -1,6 +1,14 @@ -

    All known failing tests

    +{% extends "base.html" %} +{% block content %} + + +

    All known failing tests

      {% for t in tests %}
    • {{ t }}
      • {% endfor %}
    +{% endblock %} diff --git a/unittest-logs/unittestweb/templates/viewer/topfails.html b/unittest-logs/unittestweb/templates/viewer/topfails.html index 9f4af33..d5bd477 100755 --- a/unittest-logs/unittestweb/templates/viewer/topfails.html +++ b/unittest-logs/unittestweb/templates/viewer/topfails.html @@ -1,7 +1,10 @@ -

    Top 25 failing tests

    +{% extends "base.html" %} +{% block content %} +

    Top 25 failing tests

    {% for f in failures %} {% endfor %}
    CountTest name
    {{ f.0 }}{{ f.1 }}
    +{% endblock %} diff --git a/unittest-logs/unittestweb/templates/viewer/topfails.rar b/unittest-logs/unittestweb/templates/viewer/topfails.rar new file mode 100755 index 0000000..52c1cfb Binary files /dev/null and b/unittest-logs/unittestweb/templates/viewer/topfails.rar differ diff --git a/unittest-logs/unittestweb/templates/viewer/tree.html b/unittest-logs/unittestweb/templates/viewer/tree.html index c915113..7133671 100755 --- a/unittest-logs/unittestweb/templates/viewer/tree.html +++ b/unittest-logs/unittestweb/templates/viewer/tree.html @@ -1,6 +1,9 @@ -

    {{ tree }}

    +{% extends "base.html" %} +{% block content %} +

    {{ tree }}

      {% for build in newestbuilds %}
    • {{ build.get_os_display }}: {{ build.get_status_display }}
      • {% endfor %}
    +{% endblock %} diff --git a/unittest-logs/unittestweb/templates/viewer/trees.html b/unittest-logs/unittestweb/templates/viewer/trees.html index f68e635..51e1767 100755 --- a/unittest-logs/unittestweb/templates/viewer/trees.html +++ b/unittest-logs/unittestweb/templates/viewer/trees.html @@ -1,7 +1,10 @@ -

    Trees

    +{% extends "base.html" %} +{% block content %} + +

    Trees

    - +{% endblock %} diff --git a/unittest-logs/unittestweb/urls.py b/unittest-logs/unittestweb/urls.py index d892f63..103516e 100755 --- a/unittest-logs/unittestweb/urls.py +++ b/unittest-logs/unittestweb/urls.py @@ -18,4 +18,5 @@ urlpatterns = patterns('unittestweb.viewer.views', (r'^failswindow$','failswindow'), (r'^latest$','latest'), (r'^Help$','Help'), + (r'^base$','base'), ) diff --git a/unittest-logs/unittestweb/viewer/views.py b/unittest-logs/unittestweb/viewer/views.py index 5596907..6ab5dfc 100755 --- a/unittest-logs/unittestweb/viewer/views.py +++ b/unittest-logs/unittestweb/viewer/views.py @@ -9,6 +9,14 @@ def latest(request): failures = get_list_or_404(Tests.objects.all().order_by('-build__starttime')[:10]) return render_to_response('viewer/latest.html', {'failures': failures}) +def index(request): + failures = get_list_or_404(Tests.objects.all().order_by('-build__starttime')[:10]) + return render_to_response('viewer/index.html', {'failures': failures}) + +def base(request): + return render_to_response('viewer/base.html') + + def trees(request): alltrees = Trees.objects.all().order_by('name') return render_to_response('viewer/trees.html', {'trees': alltrees})