Ubuntu Distributed Development

Merge lp:~jr/udd/import-report-tidying into lp:udd

  1. import-report-tidying
  2. Merge into import-scripts
Proposed by Jonathan Riddell
Status: Merged
Approved by: James Westby
Approved revision: 431
Merged at revision: 444
Proposed branch: lp:~jr/udd/import-report-tidying
Merge into: lp:udd
Diff against target: 74 lines (+15/-19)
1 file modified
categorise_failures.py (+15/-19)
To merge this branch: bzr merge lp:~jr/udd/import-report-tidying
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+61783@code.launchpad.net

Description of the change

add link to main.html. Include nicer formatting in index.html

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

Looks good, thanks.

I think you missed adding "main.html" to the link though.

Thanks,

James

review: Approve
lp:~jr/udd/import-report-tidying updated
432. By Jonathan Riddell

add missing file name to link

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'categorise_failures.py'
2--- categorise_failures.py 2011-05-19 10:09:09 +0000
3+++ categorise_failures.py 2011-05-20 15:19:30 +0000
4@@ -18,7 +18,8 @@
5 <script src="jquery.flot.js"></script>
6 </head>
7 <body>
8-<a href="http://package-import.ubuntu.com/status/">Overview</a>
9+<p><a href="http://package-import.ubuntu.com/status/">All Ubuntu Overview</a>,
10+<a href="http://package-import.ubuntu.com/status/">Ubuntu Main Overview</a></p>
11
12 <p>You are looking at information on the Bazaar importer system that serves <a
13 href="https://wiki.ubuntu.com/DistributedDevelopment">Ubuntu Distributed
14@@ -42,6 +43,14 @@
15 <p>This page was last updated at <tt>''' + datetime.datetime.utcnow().isoformat() + ''' UTC.</tt></p>
16 '''
17
18+html_contents = '''<h3>Contents of this page</h3>
19+<ul>
20+<li><a href="#stats">Summary</a></li>
21+<li><a href="#latest">Latest failures</a></li>
22+<li><a href="#analysis">All failures</a></li>
23+</ul>
24+'''
25+
26 html_tail = '''</body>
27 </html>
28 '''
29@@ -201,19 +210,13 @@
30 f = open(path, "wb")
31 try:
32 f.write(html_head % {"title": "bzr import failures"})
33- f.write("""<h3>Contents of this page</h3>
34-<ul>
35-<li><a href="#stats">Summary</a></li>
36-<li><a href="#latest">Latest failures</a></li>
37-<li><a href="#analysis">All failures</a></li>
38-</ul>
39-""")
40+ f.write(html_contents)
41 f.write('<div id="stats">\n')
42 write_stats(f, package_info)
43- f.write('</div>\n<div id="latest">\nLatest 50 Failures:\n<ul>\n')
44+ f.write('</div>\n<div id="latest">\n<h3>Latest 50 Failures:</h3>\n<ul>\n')
45 write_latest(f, package_info)
46 f.write('</ul>\n</div>\n')
47- f.write('</div>\n<div id="analysis">\n<ul>\n')
48+ f.write('</div>\n<h3>All Failures by Category</h3>\n<div id="analysis">\n<ul>\n')
49 write_analysis(f, reasons, explanations)
50 f.write('</ul>\n</div>\n')
51 db = icommon.HistoryDatabase(icommon.sqlite_history_file)
52@@ -274,20 +277,13 @@
53 f = open(path, "wb")
54 try:
55 f.write(html_head % {"title": "bzr import failures for main"})
56- f.write("""<p><h3>Contents of this page</h3>
57-<ul>
58-<li><a href="#stats">Summary</a></li>
59-<li><a href="#latest">Latest failures</a></li>
60-<li><a href="#analysis">All failures</a></li>
61-</ul>
62-</p>
63-""")
64+ f.write(html_contents)
65 f.write('<h3>Summary</h3>\n<div id="stats">\n')
66 write_stats(f, package_info)
67 f.write('</div>\n<div id="latest">\n<h3>Latest 50 Failures:</h3>\n<ul>\n')
68 write_latest(f, package_info)
69 f.write('</ul>\n</p>\n</div>\n')
70- f.write('</div>\n<h3>All failures by category</h3>\n<div id="analysis">\n<ul>\n')
71+ f.write('</div>\n<h3>All Failures by Category</h3>\n<div id="analysis">\n<ul>\n')
72 write_analysis(f, reasons, explanations)
73 f.write('</ul>\n</div>\n')
74 db = icommon.HistoryDatabase(icommon.sqlite_history_file)

Subscribers

People subscribed via source and target branches