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

[Chris Johnston]

Adds custom page titles to each page in the dashboard.

[Joe Talbott (joetalbott)]

Looks good, thanks.

review: Approve

[lp:~cjohnston/qa-dashboard/custom-page-titles]

201. By Chris Johnston on 2013-01-04

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

202. By Chris Johnston on 2013-01-04

Updates copyright

203. By Chris Johnston on 2013-01-04

forgot something

204. By Chris Johnston on 2013-01-04

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

205. By Chris Johnston on 2013-01-05

Moves management common commands to common app

206. By Chris Johnston on 2013-01-05

Removes empty dashboard/templatetags

207. By Chris Johnston on 2013-01-05

Add SRU app

208. By Chris Johnston on 2013-01-05

Removes dashboard app, adds smoke app

209. By Chris Johnston on 2013-01-05

Fixes imports

210. By Chris Johnston on 2013-01-05

more cleanup

211. By Chris Johnston on 2013-01-05

testing

212. By Chris Johnston on 2013-01-07

Final cleanups

213. By Chris Johnston on 2013-01-07

Adds custom page titles for each page

214. By Chris Johnston on 2013-01-08

Makes spacing fix

Unmerged revisions

=== 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 @@
 {% extends "layout.html" %}
 {% load dashboard_extras staticfiles %}
 
+{% block page_name %}Bootspeed for {{ arch }}{%endblock %} 
+
 {% block extra_headers %}
 <script type="text/javascript" src='{% static "js/dygraph-combined.js" %}'></script>
 <script src="http://yui.yahooapis.com/3.6.0/build/yui/yui-min.js"></script>
@@ -29,7 +31,7 @@
 <script type="text/javascript">
 	draw_bootspeed_graph("{% url machine_results r.machine.id arch %}", "{{ r.machine.id }}");
 </script>
-<div><a href="{% url machine_data r.machine.id arch %}">Detailed View</a></div>
+<div><a href="{% url machine_data r.machine.id arch %}">Detailed view</a></div>
     {% endfor %}
 </div>
 {% endblock %}

=== 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 @@
 {% extends "layout.html" %}
 {% load dashboard_extras %}
 
+{% block page_name %}Bootspeed for {{ image.build_number }}{%endblock %} 
+
 {% block extra_headers %}
 {% include "bootspeed/dygraphs.html" %}
 {% endblock extra_headers %}

=== 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 @@
 {% extends "layout.html" %}
 {% load dashboard_extras %}
 
+{% block page_name %}Arch overview{%endblock %} 
+
 {% block content %}
 <script type='text/javascript'>
   //<![CDATA[
@@ -14,7 +16,7 @@
 </script>
 <div class='grid_15'>
   <h2>
-    Arch Overview
+    Arch overview
   </h2>
 </div>
 {% include "bootspeed/nav.html" %}

=== 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 @@
 {% extends "layout.html" %}
 {% load dashboard_extras %}
 
+{% block page_name %}Image Overview{%endblock %}
+
 {% block content %}
 <script type='text/javascript'>
   //<![CDATA[
@@ -14,7 +16,7 @@
 </script>
 <div class='grid_15'>
   <h2>
-    Image Overview
+    Image overview
   </h2>
 </div>
 <div class='grid_13'>

=== 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 @@
 {% extends "layout.html" %}
 {% load dashboard_extras staticfiles %}
 
+{% block page_name %}{{ name }} - {{ arch }} bootspeed{%endblock %}
+
 {% block extra_headers %}
 <script type="text/javascript" src='{% static "js/dygraph-combined.js" %}'></script>
 <script src="http://yui.yahooapis.com/3.6.0/build/yui/yui-min.js"></script>
@@ -22,7 +24,7 @@
   <ul class='left_nav'>
     <li>
       <a href='{% url machine_raw_data id arch %}'>
-        Raw Data
+        Raw data
       </a>
     </li>
   </ul>

=== 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 @@
 {% load dashboard_extras %}
 {% load render_table from django_tables2 %}
 
+{% block page_name %}{{ name }} - {{ arch }} - raw bootspeed data{%endblock %}
+
 {% block extra_headers %}
 <style>
 td {
@@ -15,7 +17,7 @@
 
 {% block content %}
 <div class='grid_15'>
-<h2>{{ name }} - {{ arch }} - Raw Data</h2>
+<h2>{{ name }} - {{ arch }} - raw bootspeed data</h2>
 {% render_table table %}
 </div>
 {% endblock %}

=== 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 @@
 {% extends "layout.html" %}
 {% load dashboard_extras %}
 
+{% block page_name %}Bootspeed{%endblock %}
+
 {% block content %}
 <script type='text/javascript'>
   //<![CDATA[

=== 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 @@
 {% extends 'layout.html' %}
 
+{% block page_name %}This page does not exist{%endblock %}
+
 {% block content %}
 <div class="centered">
   <h3>Page not found.</h3>

=== 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 @@
 {% extends 'layout.html' %}
 
+{% block page_name %}Oops...{%endblock %}
+
 {% block content %}
 Server Error.  The site administrators have been notified.
 {% endblock content %}

=== 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 @@
     <link href='{% static "css/grid.css" %}' rel='stylesheet' type='text/css' />
     <link href='{% static "css/jquery.dataTables.css" %}' rel='stylesheet' type='text/css' />
     <link href='{% static "css/style.css" %}' rel='stylesheet' type='text/css' />
-    <title>Dashboard for Automated Testing - Ubuntu</title>
+    <title>{% block page_name %}{%endblock %} | Ubuntu QA Dashboard</title>
     <script src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js'></script>
     <script src='{% static "js/jquery.dataTables.min.js" %}'></script>
     {% block extra_headers %}

=== 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 @@
 {% extends 'layout.html' %}
 
+{% block page_name %}API documentation{%endblock %}
+
 {% block content %}
 <h3>
-  API Documentation
+  API documentation
 </h3>
 <table>
   <tr>

=== 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 @@
 {% extends "layout.html" %}
 {% load dashboard_extras %}
 
+{% block page_name %}Summary of smoke testing for Ubuntu image {{run.build_no}}{%endblock %}
+
 {% block content %}
-
 <script type='text/javascript'>
   //<![CDATA[
     $(document).ready(function() {

=== 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 @@
 {% extends "layout.html" %}
 {% load dashboard_extras %}
 
+{% block page_name %}{% if is_flat %}Flat{% else %}Combined{% endif %} view of smoke testing for {{ release|capfirst }}{%endblock %}
+
 {% block content %}
 <script type='text/javascript'>
   //<![CDATA[

=== 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 @@
 {% extends "layout.html" %}
 {% load dashboard_extras %}
 
+{% block page_name %}Result logs for {{image.run.flavor}}-{{image.variant}}-{{image.arch}} {{result.name}}{%endblock %}
+
 {% block content %}
 
 
@@ -34,7 +36,7 @@
       >>
     </span>
     <span class='crumb'>
-      Results for {{image.run.flavor}}-{{image.variant}}-{{image.arch}} {{result.name}}
+      Result logs for {{image.run.flavor}}-{{image.variant}}-{{image.arch}} {{result.name}}
     </span>
     <span class='crumb-sep'>
       Logs

=== 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 @@
 {% extends "layout.html" %}
 {% load dashboard_extras %}
 
+{% block page_name %}Smoke testing results for {{image.run.build_no}} {{image.run.flavor}}-{{image.variant}}-{{image.arch}}{%endblock %}
+
 {% block content %}
 
 <script type='text/javascript'>
@@ -17,7 +19,7 @@
   <div id='breadcrumb'>
     <span class='crumb'>
       <a href='{% url smoke_overview release %}flat/'>
-        Smoke Testing
+        Smoke testing
         {{ release|capfirst }}
       </a>
     </span>
@@ -37,7 +39,7 @@
     </span>
   </div>
   <h2>
-    Results
+    Results for {{image.run.build_no}} {{image.run.flavor}}-{{image.variant}}-{{image.arch}}
   </h2>
   <table border='0'>
     <tr>

=== 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 @@
 {% extends "layout.html" %}
 {% load dashboard_extras %}
 
+{% block page_name %}SRU testing{%endblock %}
+
 {% block content %}
 <script type='text/javascript'>
   //<![CDATA[
@@ -14,7 +16,7 @@
 </script>
 <div class='grid_15'>
   <h2>
-    SRU testing.
+    SRU testing
     <small>
       {% if not show_unknown %}
       <a href='?show_unknown=1'>Show Unknown</a>

=== 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 @@
 {% extends "layout.html" %}
 {% load dashboard_extras %}
 
+{% block page_name %}Summary of SRU testing for kernel {{kernel_version}}{%endblock %}
+
 {% block content %}
 
 <script type='text/javascript'>