Merge lp:~cjohnston/qa-dashboard/misc-bootspeed-fixes into lp:qa-dashboard

Proposed by Chris Johnston
Status: Merged
Approved by: Joe Talbott
Approved revision: 187
Merged at revision: 184
Proposed branch: lp:~cjohnston/qa-dashboard/misc-bootspeed-fixes
Merge into: lp:qa-dashboard
Diff against target: 159 lines (+20/-20)
10 files modified
bootspeed/templates/bootspeed/arch_overview.html (+5/-0)
bootspeed/templates/bootspeed/image_chart.html (+2/-2)
bootspeed/templates/bootspeed/image_list.html (+3/-3)
bootspeed/templates/bootspeed/image_overview.html (+1/-1)
bootspeed/templates/bootspeed/nav.html (+1/-7)
bootspeed/templates/bootspeed/overview.html (+1/-1)
bootspeed/views.py (+1/-0)
dashboard/templates/smoke/build_overview.html (+2/-2)
dashboard/templates/smoke/result_logs.html (+2/-2)
dashboard/templates/smoke/results.html (+2/-2)
To merge this branch: bzr merge lp:~cjohnston/qa-dashboard/misc-bootspeed-fixes
Reviewer Review Type Date Requested Status
Joe Talbott Approve
Review via email: mp+139926@code.launchpad.net

Commit message

Minor fixes to theme and charts for bootspeed.

Description of the change

* Adds active class to nav in bootspeed
* Fixes minor theming issues on bootspeed pages
* Changes std to stddev

To post a comment you must log in.
186. By Chris Johnston

remove minor code change

187. By Chris Johnston

Revert change

Revision history for this message
Joe Talbott (joetalbott) wrote :

Looks good, Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bootspeed/templates/bootspeed/arch_overview.html'
2--- bootspeed/templates/bootspeed/arch_overview.html 2012-12-13 00:19:32 +0000
3+++ bootspeed/templates/bootspeed/arch_overview.html 2012-12-14 15:29:21 +0000
4@@ -15,6 +15,11 @@
5 {% endblock extra_headers %}
6
7 {% block content %}
8+<div class='grid_15'>
9+ <h2>
10+ Bootspeed for {{ arch }}
11+ </h2>
12+</div>
13 {% include "bootspeed/nav.html" %}
14 <div class='grid_13'>
15 {% for r in result %}
16
17=== modified file 'bootspeed/templates/bootspeed/image_chart.html'
18--- bootspeed/templates/bootspeed/image_chart.html 2012-11-05 19:19:55 +0000
19+++ bootspeed/templates/bootspeed/image_chart.html 2012-12-14 15:29:21 +0000
20@@ -6,9 +6,9 @@
21 {% endblock extra_headers %}
22
23 {% block content %}
24-<div>
25+<div class='grid_15'>
26 <h2>
27- Bootspeed. {{ image.build_number }}
28+ Bootspeed for {{ image.build_number }}
29 </h2>
30 </div>
31 {% include "bootspeed/dygraphs-divs.html" %}
32
33=== modified file 'bootspeed/templates/bootspeed/image_list.html'
34--- bootspeed/templates/bootspeed/image_list.html 2012-11-05 19:55:04 +0000
35+++ bootspeed/templates/bootspeed/image_list.html 2012-12-14 15:29:21 +0000
36@@ -12,12 +12,12 @@
37 });
38 //]]>
39 </script>
40-{% include "bootspeed/nav.html" %}
41-<div class='grid_13'>
42+<div class='grid_15'>
43 <h2>
44- Arch Overview.
45+ Arch Overview
46 </h2>
47 </div>
48+{% include "bootspeed/nav.html" %}
49 <div class='grid_13'>
50 <table class='data-table'>
51 <thead>
52
53=== modified file 'bootspeed/templates/bootspeed/image_overview.html'
54--- bootspeed/templates/bootspeed/image_overview.html 2012-11-20 02:23:46 +0000
55+++ bootspeed/templates/bootspeed/image_overview.html 2012-12-14 15:29:21 +0000
56@@ -14,7 +14,7 @@
57 </script>
58 <div class='grid_15'>
59 <h2>
60- Image Overview.
61+ Image Overview
62 </h2>
63 </div>
64 <div class='grid_13'>
65
66=== modified file 'bootspeed/templates/bootspeed/nav.html'
67--- bootspeed/templates/bootspeed/nav.html 2012-11-30 04:25:28 +0000
68+++ bootspeed/templates/bootspeed/nav.html 2012-12-14 15:29:21 +0000
69@@ -1,16 +1,10 @@
70-
71-<div>
72- <h2>
73- Bootspeed for {{ arch }}
74- </h2>
75-</div>
76 <div class='grid_2'>
77 <h3 class='nav-title'>
78 Architecture
79 </h3>
80 <ul class='left_nav'>
81 {% for arch in arches %}
82- <li>
83+ <li{% if active = arch %} class="active"{% endif %}>
84 <a href='{% url bootspeed_arch_overview arch %}'>
85 {{ arch }}
86 </a>
87
88=== modified file 'bootspeed/templates/bootspeed/overview.html'
89--- bootspeed/templates/bootspeed/overview.html 2012-11-20 02:23:46 +0000
90+++ bootspeed/templates/bootspeed/overview.html 2012-12-14 15:29:21 +0000
91@@ -14,7 +14,7 @@
92 </script>
93 <div class='grid_15'>
94 <h2>
95- Bootspeed.
96+ Bootspeed
97 </h2>
98 </div>
99 <div class='grid_2'>
100
101=== modified file 'bootspeed/views.py'
102--- bootspeed/views.py 2012-12-13 02:32:26 +0000
103+++ bootspeed/views.py 2012-12-14 15:29:21 +0000
104@@ -169,6 +169,7 @@
105 'result': result,
106 'arch': arch,
107 'arches': arches,
108+ 'active': arch,
109 }
110 return render_to_response('bootspeed/arch_overview.html', data)
111
112
113=== modified file 'dashboard/templates/smoke/build_overview.html'
114--- dashboard/templates/smoke/build_overview.html 2012-12-06 19:01:30 +0000
115+++ dashboard/templates/smoke/build_overview.html 2012-12-14 15:29:21 +0000
116@@ -28,9 +28,9 @@
117 Image {{run.build_no}}
118 </span>
119 </div>
120- <h3>
121+ <h2>
122 Summary of smoke testing for Ubuntu image {{run.build_no}}
123- </h3>
124+ </h2>
125 <table border='0'>
126 <tr>
127 <td>Image Pass Rate:</td>
128
129=== modified file 'dashboard/templates/smoke/result_logs.html'
130--- dashboard/templates/smoke/result_logs.html 2012-12-06 13:11:34 +0000
131+++ dashboard/templates/smoke/result_logs.html 2012-12-14 15:29:21 +0000
132@@ -40,9 +40,9 @@
133 Logs
134 </span>
135 </div>
136- <h3>
137+ <h2>
138 Result Logs
139- </h3>
140+ </h2>
141 <table class='data-table'>
142 <thead>
143 <tr>
144
145=== modified file 'dashboard/templates/smoke/results.html'
146--- dashboard/templates/smoke/results.html 2012-12-06 19:01:30 +0000
147+++ dashboard/templates/smoke/results.html 2012-12-14 15:29:21 +0000
148@@ -36,9 +36,9 @@
149 Results for {{image.run.flavor}}-{{image.variant}}-{{image.arch}}
150 </span>
151 </div>
152- <h3>
153+ <h2>
154 Results
155- </h3>
156+ </h2>
157 <table border='0'>
158 <tr>
159 <td>Pass Rate:</td>

Subscribers

People subscribed via source and target branches