Merge lp:~allanlesage/helipad/ci-proper-titles into lp:helipad/ci

[Chris Johnston]

Proper titles for ci pages.

Amend titles for DailyRelease and Upstream Merger templates, also remove some crufty templates we weren't using.

[Chris Johnston (cjohnston)]

L220 - remove 'Jenkins' please
L401 - stack_detail.html isn't used anymore IIRC
s/DailyRelease/Daily release/ :-)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:19
http://s-jenkins:8080/job/helipad-ci-ci/34/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-ci-ci/34/rebuild

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== removed file 'templates/ci/branch_list.html'
--- templates/ci/branch_list.html	2013-07-22 17:41:38 +0000
+++ templates/ci/branch_list.html	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-{% extends "layout.html" %}
-{% load dashboard_extras %}
-
-{% block page_name %}PS-QA Dashboard{% endblock %}
-
-{% block content %}
-<script type='text/javascript'>
-  //<![CDATA[
-    $(document).ready(function() {
-      $(".data-table").dataTable({
-        "bPaginate": false,
-        "aaSorting": [[0, 'desc']]
-      });
-    });
-  //]]>
-</script>
-<div class='grid_15'>
-  <h2>
-    Branches
-  </h2>
-</div>
-<div class='grid_2'>
-  <h3 class='nav-title'>
-    BRANCH FILTER
-  </h3>
-  <ul class='left_nav'>
-    <li>
-    <a href='{% url branches %}'>All</a>
-    </li>
-  </ul>
-</div>
-<div class='grid_13'>
-  <table class='data-table basic wide'>
-    <thead>
-      <tr>
-        <th>Branch</th>
-        <th>Revno</th>
-        <th>Date</th>
-        <th>Series</th>
-        <th>Package</th>
-        <th>Upload Date</th>
-      </tr>
-    </thead>
-    <tbody>
-      {% for branch in branch_list %}
-      <tr>
-        <td>
-          <a href='job/{{ job.name }}'>
-            {{ branch.name }}
-          </a>
-        </td>
-        <td class='num'>
-          {{ branch.revno }}
-        </td>
-        <td>
-          {{ branch.rev_date }}
-        </td>
-        <td>
-          {{ branch.series }}
-        </td>
-        <td>
-          {{ branch.package }}
-        </td>
-        <td>
-          {{ branch.package_date }}
-        </td>
-      </tr>
-      {% endfor %}
-    </tbody>
-  </table>
-</div>
-{% endblock %}

=== modified file 'templates/ci/daily_release_overview.html'
--- templates/ci/daily_release_overview.html	2013-07-22 17:41:38 +0000
+++ templates/ci/daily_release_overview.html	2013-07-23 18:59:39 +0000
@@ -3,7 +3,7 @@
 {% load ci_extras %}
 {% load percentage %}
 
-{% block page_name %}PS-QA Dashboard{% endblock %}
+{% block page_name %}Daily release status for {% if show_filter %}{{ show_filter }}{% else %}all stacks{% endif %}{% endblock %}
 
 {% block content %}
 <script type='text/javascript'>
@@ -19,9 +19,9 @@
 <div class='grid_15'>
   <h2>
     {% if show_filter %}
-      DailyRelease status (stack: {{ show_filter }})
+      Daily release status (stack: {{ show_filter }})
     {% else %}
-      DailyRelease status (all stacks)
+      Daily release status (all stacks)
     {% endif %}
   </h2>
 </div>

=== modified file 'templates/ci/job.html'
--- templates/ci/job.html	2013-07-22 17:41:38 +0000
+++ templates/ci/job.html	2013-07-23 18:59:39 +0000
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% load dashboard_extras %}
 
-{% block page_name %}PS-QA Dashboard{% endblock %}
+{% block page_name %}Upstream merger builds for {{ job.name }}{% endblock %}
 
 {% block content %}
 <script type='text/javascript'>

=== removed file 'templates/ci/main.html'
--- templates/ci/main.html	2013-07-22 17:41:38 +0000
+++ templates/ci/main.html	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-{% extends "layout.html" %}
-{% load dashboard_extras %}
-
-{% block page_name %}PS-QA Dashboard{% endblock %}
-
-{% block content %}
-<script type='text/javascript'>
-  //<![CDATA[
-    $(document).ready(function() {
-      $(".data-table").dataTable({
-        "bPaginate": false,
-        "aaSorting": [[0, 'desc']]
-      });
-    });
-  //]]>
-</script>
-<div class='grid_15'>
-  <ul>
-    <li>
-      <h2>
-        <a href='{% url stacks %}?show=head'>Stacks</a>
-      </h2>
-    </li>
-    <li>
-      <h2>
-        <a href='{% url projects %}'>Projects</a>
-      </h2>
-    </li>
-    <li>
-      <h2>
-        <a href='{% url integration %}'>Daily Integration [TBD]</a>
-      </h2>
-    </li>
-  </ul>
-</div>
-{% endblock %}

=== modified file 'templates/ci/project_detail.html'
--- templates/ci/project_detail.html	2013-07-23 15:34:08 +0000
+++ templates/ci/project_detail.html	2013-07-23 18:59:39 +0000
@@ -9,7 +9,7 @@
 <script type="text/javascript" src="//6df403e3d98e2ac67ac2-180150c581869d2c4c18db9c9e3179c4.r40.cf1.rackcdn.com/nv.d3.js"></script>
 {% endblock extra_headers %}
 
-{% block page_name %}PS-QA Dashboard{% endblock %}
+{% block page_name %}Upstream merger results for {{ project.launchpad_project.name }}{% endblock %}
 
 {% block content %}
 <style>

=== modified file 'templates/ci/project_list.html'
--- templates/ci/project_list.html	2013-07-22 20:36:17 +0000
+++ templates/ci/project_list.html	2013-07-23 18:59:39 +0000
@@ -1,7 +1,7 @@
 {% extends "ci/ci_layout.html" %}
 {% load dashboard_extras percentage staticfiles %}
 
-{% block page_name %}PS-QA Dashboard{% endblock %}
+{% block page_name %}Upstream merger results for all projects{% endblock %}
 
 {% block extra_headers %}
     <link href='{% static "ci/css/ci_style.css" %}' rel='stylesheet' type='text/css' />