Ubuntu CI Dashboard

Merge lp:~cjohnston/qa-dashboard/custom-page-titles into lp:qa-dashboard

  1. custom-page-titles
  2. Merge into dev
Proposed by Chris Johnston
Status: Superseded
Proposed branch: lp:~cjohnston/qa-dashboard/custom-page-titles
Merge into: lp:qa-dashboard
Prerequisite: lp:~cjohnston/qa-dashboard/dashboard-smoke-2-smoke
Diff against target: 304 lines (+43/-12) (has conflicts)
17 files modified
bootspeed/templates/bootspeed/arch_overview.html (+3/-1)
bootspeed/templates/bootspeed/image_chart.html (+2/-0)
bootspeed/templates/bootspeed/image_list.html (+3/-1)
bootspeed/templates/bootspeed/image_overview.html (+3/-1)
bootspeed/templates/bootspeed/machine_data.html (+3/-1)
bootspeed/templates/bootspeed/machine_raw_data.html (+3/-1)
bootspeed/templates/bootspeed/overview.html (+2/-0)
common/templates/404.html (+2/-0)
common/templates/500.html (+2/-0)
common/templates/layout.html (+1/-1)
smoke/templates/api_help.html (+3/-1)
smoke/templates/smoke/build_overview.html (+2/-1)
smoke/templates/smoke/overview.html (+2/-0)
smoke/templates/smoke/result_logs.html (+3/-1)
smoke/templates/smoke/results.html (+4/-2)
sru/templates/sru/overview.html (+3/-1)
sru/templates/sru/overview_kernel.html (+2/-0)
Conflict adding files to tests.  Created directory.
Conflict because tests is not versioned, but has versioned children.  Versioned directory.
Contents conflict in tests/test_bootspeed_api.py
To merge this branch: bzr merge lp:~cjohnston/qa-dashboard/custom-page-titles
Reviewer Review Type Date Requested Status
Joe Talbott Pending
Review via email: mp+141850@code.launchpad.net

This proposal supersedes a proposal from 2012-12-20.

This proposal has been superseded by a proposal from 2013-01-04.

Commit message

Adds custom page titles to each page in the dashboard.

To post a comment you must log in.
Revision history for this message
Joe Talbott (joetalbott) wrote : Posted in a previous version of this proposal

Looks good, thanks.

review: Approve
lp:~cjohnston/qa-dashboard/custom-page-titles updated
201. By Chris Johnston

[r=Joe Talbott] Removes old test stuff that is no longer needed. from Chris Johnston

202. By Chris Johnston

Updates copyright

203. By Chris Johnston

forgot something

204. By Chris Johnston

Makes bootspeed charts wider and makes background color easier to see against.

205. By Chris Johnston

Moves management common commands to common app

206. By Chris Johnston

Removes empty dashboard/templatetags

207. By Chris Johnston

Add SRU app

208. By Chris Johnston

Removes dashboard app, adds smoke app

209. By Chris Johnston

Fixes imports

210. By Chris Johnston

more cleanup

211. By Chris Johnston

testing

212. By Chris Johnston

Final cleanups

213. By Chris Johnston

Adds custom page titles for each page

214. By Chris Johnston

Makes spacing fix

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bootspeed/templates/bootspeed/arch_overview.html'
--- bootspeed/templates/bootspeed/arch_overview.html 2012-12-14 15:11:57 +0000
+++ bootspeed/templates/bootspeed/arch_overview.html 2013-01-04 14:44:23 +0000
@@ -1,6 +1,8 @@
1{% extends "layout.html" %}1{% extends "layout.html" %}
2{% load dashboard_extras staticfiles %}2{% load dashboard_extras staticfiles %}
33
4{% block page_name %}Bootspeed for {{ arch }}{%endblock %}
5
4{% block extra_headers %}6{% block extra_headers %}
5<script type="text/javascript" src='{% static "js/dygraph-combined.js" %}'></script>7<script type="text/javascript" src='{% static "js/dygraph-combined.js" %}'></script>
6<script src="http://yui.yahooapis.com/3.6.0/build/yui/yui-min.js"></script>8<script src="http://yui.yahooapis.com/3.6.0/build/yui/yui-min.js"></script>
@@ -29,7 +31,7 @@
29<script type="text/javascript">31<script type="text/javascript">
30 draw_bootspeed_graph("{% url machine_results r.machine.id arch %}", "{{ r.machine.id }}");32 draw_bootspeed_graph("{% url machine_results r.machine.id arch %}", "{{ r.machine.id }}");
31</script>33</script>
32<div><a href="{% url machine_data r.machine.id arch %}">Detailed View</a></div>34<div><a href="{% url machine_data r.machine.id arch %}">Detailed view</a></div>
33 {% endfor %}35 {% endfor %}
34</div>36</div>
35{% endblock %}37{% endblock %}
3638
=== modified file 'bootspeed/templates/bootspeed/image_chart.html'
--- bootspeed/templates/bootspeed/image_chart.html 2012-12-14 15:11:57 +0000
+++ bootspeed/templates/bootspeed/image_chart.html 2013-01-04 14:44:23 +0000
@@ -1,6 +1,8 @@
1{% extends "layout.html" %}1{% extends "layout.html" %}
2{% load dashboard_extras %}2{% load dashboard_extras %}
33
4{% block page_name %}Bootspeed for {{ image.build_number }}{%endblock %}
5
4{% block extra_headers %}6{% block extra_headers %}
5{% include "bootspeed/dygraphs.html" %}7{% include "bootspeed/dygraphs.html" %}
6{% endblock extra_headers %}8{% endblock extra_headers %}
79
=== modified file 'bootspeed/templates/bootspeed/image_list.html'
--- bootspeed/templates/bootspeed/image_list.html 2012-12-14 15:11:57 +0000
+++ bootspeed/templates/bootspeed/image_list.html 2013-01-04 14:44:23 +0000
@@ -1,6 +1,8 @@
1{% extends "layout.html" %}1{% extends "layout.html" %}
2{% load dashboard_extras %}2{% load dashboard_extras %}
33
4{% block page_name %}Arch overview{%endblock %}
5
4{% block content %}6{% block content %}
5<script type='text/javascript'>7<script type='text/javascript'>
6 //<![CDATA[8 //<![CDATA[
@@ -14,7 +16,7 @@
14</script>16</script>
15<div class='grid_15'>17<div class='grid_15'>
16 <h2>18 <h2>
17 Arch Overview19 Arch overview
18 </h2>20 </h2>
19</div>21</div>
20{% include "bootspeed/nav.html" %}22{% include "bootspeed/nav.html" %}
2123
=== modified file 'bootspeed/templates/bootspeed/image_overview.html'
--- bootspeed/templates/bootspeed/image_overview.html 2012-12-14 15:11:57 +0000
+++ bootspeed/templates/bootspeed/image_overview.html 2013-01-04 14:44:23 +0000
@@ -1,6 +1,8 @@
1{% extends "layout.html" %}1{% extends "layout.html" %}
2{% load dashboard_extras %}2{% load dashboard_extras %}
33
4{% block page_name %}Image Overview{%endblock %}
5
4{% block content %}6{% block content %}
5<script type='text/javascript'>7<script type='text/javascript'>
6 //<![CDATA[8 //<![CDATA[
@@ -14,7 +16,7 @@
14</script>16</script>
15<div class='grid_15'>17<div class='grid_15'>
16 <h2>18 <h2>
17 Image Overview19 Image overview
18 </h2>20 </h2>
19</div>21</div>
20<div class='grid_13'>22<div class='grid_13'>
2123
=== modified file 'bootspeed/templates/bootspeed/machine_data.html'
--- bootspeed/templates/bootspeed/machine_data.html 2012-12-12 02:58:08 +0000
+++ bootspeed/templates/bootspeed/machine_data.html 2013-01-04 14:44:23 +0000
@@ -1,6 +1,8 @@
1{% extends "layout.html" %}1{% extends "layout.html" %}
2{% load dashboard_extras staticfiles %}2{% load dashboard_extras staticfiles %}
33
4{% block page_name %}{{ name }} - {{ arch }} bootspeed{%endblock %}
5
4{% block extra_headers %}6{% block extra_headers %}
5<script type="text/javascript" src='{% static "js/dygraph-combined.js" %}'></script>7<script type="text/javascript" src='{% static "js/dygraph-combined.js" %}'></script>
6<script src="http://yui.yahooapis.com/3.6.0/build/yui/yui-min.js"></script>8<script src="http://yui.yahooapis.com/3.6.0/build/yui/yui-min.js"></script>
@@ -22,7 +24,7 @@
22 <ul class='left_nav'>24 <ul class='left_nav'>
23 <li>25 <li>
24 <a href='{% url machine_raw_data id arch %}'>26 <a href='{% url machine_raw_data id arch %}'>
25 Raw Data27 Raw data
26 </a>28 </a>
27 </li>29 </li>
28 </ul>30 </ul>
2931
=== modified file 'bootspeed/templates/bootspeed/machine_raw_data.html'
--- bootspeed/templates/bootspeed/machine_raw_data.html 2012-11-30 04:25:28 +0000
+++ bootspeed/templates/bootspeed/machine_raw_data.html 2013-01-04 14:44:23 +0000
@@ -2,6 +2,8 @@
2{% load dashboard_extras %}2{% load dashboard_extras %}
3{% load render_table from django_tables2 %}3{% load render_table from django_tables2 %}
44
5{% block page_name %}{{ name }} - {{ arch }} - raw bootspeed data{%endblock %}
6
5{% block extra_headers %}7{% block extra_headers %}
6<style>8<style>
7td {9td {
@@ -15,7 +17,7 @@
1517
16{% block content %}18{% block content %}
17<div class='grid_15'>19<div class='grid_15'>
18<h2>{{ name }} - {{ arch }} - Raw Data</h2>20<h2>{{ name }} - {{ arch }} - raw bootspeed data</h2>
19{% render_table table %}21{% render_table table %}
20</div>22</div>
21{% endblock %}23{% endblock %}
2224
=== modified file 'bootspeed/templates/bootspeed/overview.html'
--- bootspeed/templates/bootspeed/overview.html 2012-12-14 15:11:57 +0000
+++ bootspeed/templates/bootspeed/overview.html 2013-01-04 14:44:23 +0000
@@ -1,6 +1,8 @@
1{% extends "layout.html" %}1{% extends "layout.html" %}
2{% load dashboard_extras %}2{% load dashboard_extras %}
33
4{% block page_name %}Bootspeed{%endblock %}
5
4{% block content %}6{% block content %}
5<script type='text/javascript'>7<script type='text/javascript'>
6 //<![CDATA[8 //<![CDATA[
79
=== modified file 'common/templates/404.html'
--- common/templates/404.html 2012-11-14 23:03:41 +0000
+++ common/templates/404.html 2013-01-04 14:44:23 +0000
@@ -1,5 +1,7 @@
1{% extends 'layout.html' %}1{% extends 'layout.html' %}
22
3{% block page_name %}This page does not exist{%endblock %}
4
3{% block content %}5{% block content %}
4<div class="centered">6<div class="centered">
5 <h3>Page not found.</h3>7 <h3>Page not found.</h3>
68
=== modified file 'common/templates/500.html'
--- common/templates/500.html 2012-11-14 23:03:41 +0000
+++ common/templates/500.html 2013-01-04 14:44:23 +0000
@@ -1,5 +1,7 @@
1{% extends 'layout.html' %}1{% extends 'layout.html' %}
22
3{% block page_name %}Oops...{%endblock %}
4
3{% block content %}5{% block content %}
4Server Error. The site administrators have been notified.6Server Error. The site administrators have been notified.
5{% endblock content %}7{% endblock content %}
68
=== modified file 'common/templates/layout.html'
--- common/templates/layout.html 2013-01-04 14:44:23 +0000
+++ common/templates/layout.html 2013-01-04 14:44:23 +0000
@@ -8,7 +8,7 @@
8 <link href='{% static "css/grid.css" %}' rel='stylesheet' type='text/css' />8 <link href='{% static "css/grid.css" %}' rel='stylesheet' type='text/css' />
9 <link href='{% static "css/jquery.dataTables.css" %}' rel='stylesheet' type='text/css' />9 <link href='{% static "css/jquery.dataTables.css" %}' rel='stylesheet' type='text/css' />
10 <link href='{% static "css/style.css" %}' rel='stylesheet' type='text/css' />10 <link href='{% static "css/style.css" %}' rel='stylesheet' type='text/css' />
11 <title>Dashboard for Automated Testing - Ubuntu</title>11 <title>{% block page_name %}{%endblock %} | Ubuntu QA Dashboard</title>
12 <script src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js'></script>12 <script src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js'></script>
13 <script src='{% static "js/jquery.dataTables.min.js" %}'></script>13 <script src='{% static "js/jquery.dataTables.min.js" %}'></script>
14 {% block extra_headers %}14 {% block extra_headers %}
1515
=== modified file 'smoke/templates/api_help.html'
--- smoke/templates/api_help.html 2012-07-03 20:59:33 +0000
+++ smoke/templates/api_help.html 2013-01-04 14:44:23 +0000
@@ -1,8 +1,10 @@
1{% extends 'layout.html' %}1{% extends 'layout.html' %}
22
3{% block page_name %}API documentation{%endblock %}
4
3{% block content %}5{% block content %}
4<h3>6<h3>
5 API Documentation7 API documentation
6</h3>8</h3>
7<table>9<table>
8 <tr>10 <tr>
911
=== modified file 'smoke/templates/smoke/build_overview.html'
--- smoke/templates/smoke/build_overview.html 2012-12-14 19:23:53 +0000
+++ smoke/templates/smoke/build_overview.html 2013-01-04 14:44:23 +0000
@@ -1,8 +1,9 @@
1{% extends "layout.html" %}1{% extends "layout.html" %}
2{% load dashboard_extras %}2{% load dashboard_extras %}
33
4{% block page_name %}Summary of smoke testing for Ubuntu image {{run.build_no}}{%endblock %}
5
4{% block content %}6{% block content %}
5
6<script type='text/javascript'>7<script type='text/javascript'>
7 //<![CDATA[8 //<![CDATA[
8 $(document).ready(function() {9 $(document).ready(function() {
910
=== modified file 'smoke/templates/smoke/overview.html'
--- smoke/templates/smoke/overview.html 2012-12-14 18:31:08 +0000
+++ smoke/templates/smoke/overview.html 2013-01-04 14:44:23 +0000
@@ -1,6 +1,8 @@
1{% extends "layout.html" %}1{% extends "layout.html" %}
2{% load dashboard_extras %}2{% load dashboard_extras %}
33
4{% block page_name %}{% if is_flat %}Flat{% else %}Combined{% endif %} view of smoke testing for {{ release|capfirst }}{%endblock %}
5
4{% block content %}6{% block content %}
5<script type='text/javascript'>7<script type='text/javascript'>
6 //<![CDATA[8 //<![CDATA[
79
=== modified file 'smoke/templates/smoke/result_logs.html'
--- smoke/templates/smoke/result_logs.html 2012-12-14 15:11:57 +0000
+++ smoke/templates/smoke/result_logs.html 2013-01-04 14:44:23 +0000
@@ -1,6 +1,8 @@
1{% extends "layout.html" %}1{% extends "layout.html" %}
2{% load dashboard_extras %}2{% load dashboard_extras %}
33
4{% block page_name %}Result logs for {{image.run.flavor}}-{{image.variant}}-{{image.arch}} {{result.name}}{%endblock %}
5
4{% block content %}6{% block content %}
57
68
@@ -34,7 +36,7 @@
34 >>36 >>
35 </span>37 </span>
36 <span class='crumb'>38 <span class='crumb'>
37 Results for {{image.run.flavor}}-{{image.variant}}-{{image.arch}} {{result.name}}39 Result logs for {{image.run.flavor}}-{{image.variant}}-{{image.arch}} {{result.name}}
38 </span>40 </span>
39 <span class='crumb-sep'>41 <span class='crumb-sep'>
40 Logs42 Logs
4143
=== modified file 'smoke/templates/smoke/results.html'
--- smoke/templates/smoke/results.html 2012-12-14 19:23:53 +0000
+++ smoke/templates/smoke/results.html 2013-01-04 14:44:23 +0000
@@ -1,6 +1,8 @@
1{% extends "layout.html" %}1{% extends "layout.html" %}
2{% load dashboard_extras %}2{% load dashboard_extras %}
33
4{% block page_name %}Smoke testing results for {{image.run.build_no}} {{image.run.flavor}}-{{image.variant}}-{{image.arch}}{%endblock %}
5
4{% block content %}6{% block content %}
57
6<script type='text/javascript'>8<script type='text/javascript'>
@@ -17,7 +19,7 @@
17 <div id='breadcrumb'>19 <div id='breadcrumb'>
18 <span class='crumb'>20 <span class='crumb'>
19 <a href='{% url smoke_overview release %}flat/'>21 <a href='{% url smoke_overview release %}flat/'>
20 Smoke Testing22 Smoke testing
21 {{ release|capfirst }}23 {{ release|capfirst }}
22 </a>24 </a>
23 </span>25 </span>
@@ -37,7 +39,7 @@
37 </span>39 </span>
38 </div>40 </div>
39 <h2>41 <h2>
40 Results42 Results for {{image.run.build_no}} {{image.run.flavor}}-{{image.variant}}-{{image.arch}}
41 </h2>43 </h2>
42 <table border='0'>44 <table border='0'>
43 <tr>45 <tr>
4446
=== modified file 'sru/templates/sru/overview.html'
--- sru/templates/sru/overview.html 2012-12-14 18:06:44 +0000
+++ sru/templates/sru/overview.html 2013-01-04 14:44:23 +0000
@@ -1,6 +1,8 @@
1{% extends "layout.html" %}1{% extends "layout.html" %}
2{% load dashboard_extras %}2{% load dashboard_extras %}
33
4{% block page_name %}SRU testing{%endblock %}
5
4{% block content %}6{% block content %}
5<script type='text/javascript'>7<script type='text/javascript'>
6 //<![CDATA[8 //<![CDATA[
@@ -14,7 +16,7 @@
14</script>16</script>
15<div class='grid_15'>17<div class='grid_15'>
16 <h2>18 <h2>
17 SRU testing.19 SRU testing
18 <small>20 <small>
19 {% if not show_unknown %}21 {% if not show_unknown %}
20 <a href='?show_unknown=1'>Show Unknown</a>22 <a href='?show_unknown=1'>Show Unknown</a>
2123
=== modified file 'sru/templates/sru/overview_kernel.html'
--- sru/templates/sru/overview_kernel.html 2012-12-14 18:16:23 +0000
+++ sru/templates/sru/overview_kernel.html 2013-01-04 14:44:23 +0000
@@ -1,6 +1,8 @@
1{% extends "layout.html" %}1{% extends "layout.html" %}
2{% load dashboard_extras %}2{% load dashboard_extras %}
33
4{% block page_name %}Summary of SRU testing for kernel {{kernel_version}}{%endblock %}
5
4{% block content %}6{% block content %}
57
6<script type='text/javascript'>8<script type='text/javascript'>

Subscribers

People subscribed via source and target branches