Helipad

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

  1. ci-proper-titles
  2. Merge into ci
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 20
Merged at revision: 19
Proposed branch: lp:~allanlesage/helipad/ci-proper-titles
Merge into: lp:helipad/ci
Diff against target: 181 lines (+6/-114)
6 files modified
templates/ci/branch_list.html (+0/-72)
templates/ci/daily_release_overview.html (+3/-3)
templates/ci/job.html (+1/-1)
templates/ci/main.html (+0/-36)
templates/ci/project_detail.html (+1/-1)
templates/ci/project_list.html (+1/-1)
To merge this branch: bzr merge lp:~allanlesage/helipad/ci-proper-titles
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Chris Johnston Approve
Review via email: mp+176465@code.launchpad.net

This proposal supersedes a proposal from 2013-07-23.

Commit message

Proper titles for ci pages.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) wrote : Posted in a previous version of this proposal

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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)
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1{% extends "layout.html" %}
2{% load dashboard_extras %}
3
4{% block page_name %}PS-QA Dashboard{% endblock %}
5
6{% block content %}
7<script type='text/javascript'>
8 //<![CDATA[
9 $(document).ready(function() {
10 $(".data-table").dataTable({
11 "bPaginate": false,
12 "aaSorting": [[0, 'desc']]
13 });
14 });
15 //]]>
16</script>
17<div class='grid_15'>
18 <h2>
19 Branches
20 </h2>
21</div>
22<div class='grid_2'>
23 <h3 class='nav-title'>
24 BRANCH FILTER
25 </h3>
26 <ul class='left_nav'>
27 <li>
28 <a href='{% url branches %}'>All</a>
29 </li>
30 </ul>
31</div>
32<div class='grid_13'>
33 <table class='data-table basic wide'>
34 <thead>
35 <tr>
36 <th>Branch</th>
37 <th>Revno</th>
38 <th>Date</th>
39 <th>Series</th>
40 <th>Package</th>
41 <th>Upload Date</th>
42 </tr>
43 </thead>
44 <tbody>
45 {% for branch in branch_list %}
46 <tr>
47 <td>
48 <a href='job/{{ job.name }}'>
49 {{ branch.name }}
50 </a>
51 </td>
52 <td class='num'>
53 {{ branch.revno }}
54 </td>
55 <td>
56 {{ branch.rev_date }}
57 </td>
58 <td>
59 {{ branch.series }}
60 </td>
61 <td>
62 {{ branch.package }}
63 </td>
64 <td>
65 {{ branch.package_date }}
66 </td>
67 </tr>
68 {% endfor %}
69 </tbody>
70 </table>
71</div>
72{% endblock %}
730
=== 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 @@
3{% load ci_extras %}3{% load ci_extras %}
4{% load percentage %}4{% load percentage %}
55
6{% block page_name %}PS-QA Dashboard{% endblock %}6{% block page_name %}Daily release status for {% if show_filter %}{{ show_filter }}{% else %}all stacks{% endif %}{% endblock %}
77
8{% block content %}8{% block content %}
9<script type='text/javascript'>9<script type='text/javascript'>
@@ -19,9 +19,9 @@
19<div class='grid_15'>19<div class='grid_15'>
20 <h2>20 <h2>
21 {% if show_filter %}21 {% if show_filter %}
22 DailyRelease status (stack: {{ show_filter }})22 Daily release status (stack: {{ show_filter }})
23 {% else %}23 {% else %}
24 DailyRelease status (all stacks)24 Daily release status (all stacks)
25 {% endif %}25 {% endif %}
26 </h2>26 </h2>
27</div>27</div>
2828
=== 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 @@
1{% extends "layout.html" %}1{% extends "layout.html" %}
2{% load dashboard_extras %}2{% load dashboard_extras %}
33
4{% block page_name %}PS-QA Dashboard{% endblock %}4{% block page_name %}Upstream merger builds for {{ job.name }}{% endblock %}
55
6{% block content %}6{% block content %}
7<script type='text/javascript'>7<script type='text/javascript'>
88
=== 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 @@
1{% extends "layout.html" %}
2{% load dashboard_extras %}
3
4{% block page_name %}PS-QA Dashboard{% endblock %}
5
6{% block content %}
7<script type='text/javascript'>
8 //<![CDATA[
9 $(document).ready(function() {
10 $(".data-table").dataTable({
11 "bPaginate": false,
12 "aaSorting": [[0, 'desc']]
13 });
14 });
15 //]]>
16</script>
17<div class='grid_15'>
18 <ul>
19 <li>
20 <h2>
21 <a href='{% url stacks %}?show=head'>Stacks</a>
22 </h2>
23 </li>
24 <li>
25 <h2>
26 <a href='{% url projects %}'>Projects</a>
27 </h2>
28 </li>
29 <li>
30 <h2>
31 <a href='{% url integration %}'>Daily Integration [TBD]</a>
32 </h2>
33 </li>
34 </ul>
35</div>
36{% endblock %}
370
=== 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 @@
9<script type="text/javascript" src="//6df403e3d98e2ac67ac2-180150c581869d2c4c18db9c9e3179c4.r40.cf1.rackcdn.com/nv.d3.js"></script>9<script type="text/javascript" src="//6df403e3d98e2ac67ac2-180150c581869d2c4c18db9c9e3179c4.r40.cf1.rackcdn.com/nv.d3.js"></script>
10{% endblock extra_headers %}10{% endblock extra_headers %}
1111
12{% block page_name %}PS-QA Dashboard{% endblock %}12{% block page_name %}Upstream merger results for {{ project.launchpad_project.name }}{% endblock %}
1313
14{% block content %}14{% block content %}
15<style>15<style>
1616
=== 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 @@
1{% extends "ci/ci_layout.html" %}1{% extends "ci/ci_layout.html" %}
2{% load dashboard_extras percentage staticfiles %}2{% load dashboard_extras percentage staticfiles %}
33
4{% block page_name %}PS-QA Dashboard{% endblock %}4{% block page_name %}Upstream merger results for all projects{% endblock %}
55
6{% block extra_headers %}6{% block extra_headers %}
7 <link href='{% static "ci/css/ci_style.css" %}' rel='stylesheet' type='text/css' />7 <link href='{% static "ci/css/ci_style.css" %}' rel='stylesheet' type='text/css' />

Subscribers

People subscribed via source and target branches

to all changes: