python-oops-tools

Merge lp:~james-w/python-oops-tools/remove-lp-branding into lp:python-oops-tools

  1. remove-lp-branding
  2. Merge into trunk
Proposed by James Westby on 2012-05-15
Status: Merged
Approved by: Paul Hummer on 2012-05-31
Approved revision: 34
Merged at revision: 34
Proposed branch: lp:~james-w/python-oops-tools/remove-lp-branding
Merge into: lp:python-oops-tools
Diff against target: 50 lines (+3/-10)
3 files modified
src/oopstools/oops/templates/base.html (+1/-4)
src/oopstools/oops/templates/index.html (+1/-5)
src/oopstools/oops/test/pagetest.txt (+1/-1)
To merge this branch: bzr merge lp:~james-w/python-oops-tools/remove-lp-branding
Reviewer Review Type Date Requested Status
James Westby (community) Approve on 2012-06-05
Steve Kowalik (community) code 2012-05-15 Approve on 2012-05-15
Review via email: mp+105892@code.launchpad.net

Commit Message

Remove the LP branding from the front page.

The service isn't Launchpad specific, and so saying
"Search Launchpad OOPS Reports" is incorrect.

Description of the Change

Hi,

This removes the Launchpad branding as requested by Tom.

I haven't run the tests as I can't get a clean tree to pass tests on my
machine.

Thanks,

James

To post a comment you must log in.
Steve Kowalik (stevenk) :
review: Approve (code)
James Westby (james-w) wrote :

Hi,

Could someone please land this for me as I don't have access?

Thanks,

James

Robert Collins (lifeless) wrote :

Landing is done via tarmac; set a commit message and you are good to go.

Robert Collins (lifeless) wrote :

Oh, and the mp status - toggle that ot approved. I'm going to get rockstar to test the new permissions for that.

Robert Collins (lifeless) wrote :

@James - before setting a commit messsage, please also delete the no longer referenced png (I believe its no longer referenced...)

James Westby (james-w) wrote :

It is grabbing the png from launchpad.net directly, and there are no .png files in
the tree.

Thanks,

James

review: Approve
James Westby (james-w) wrote :

Hi,

Tarmac doesn't seem to be watching.

Thanks,

James

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/oopstools/oops/templates/base.html'
2--- src/oopstools/oops/templates/base.html 2011-10-13 20:18:51 +0000
3+++ src/oopstools/oops/templates/base.html 2012-05-15 20:33:17 +0000
4@@ -2,16 +2,13 @@
5 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
6 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
7 <head>
8- <title>{% block title %}Search Launchpad OOPS Reports{% endblock %}</title>
9+ <title>{% block title %}Search OOPS Reports{% endblock %}</title>
10 <style type="text/css" media="screen">
11 @import url("/oops/static/oops.css");
12 </style>
13 </head>
14 <body>
15 <div id="search">
16- {% block logo %}
17- <img src="https://launchpad.net/@@/launchpad-logo-and-name.png" />
18- {% endblock %}
19 <form action="">
20 <input type="text" name="oopsid" />
21 <input type="submit" value="Search OOPS" />
22
23=== modified file 'src/oopstools/oops/templates/index.html'
24--- src/oopstools/oops/templates/index.html 2011-10-13 20:18:51 +0000
25+++ src/oopstools/oops/templates/index.html 2012-05-15 20:33:17 +0000
26@@ -1,10 +1,6 @@
27 {% extends "base.html" %}
28
29-{% block title %}Search Launchpad OOPS Reports{% endblock %}
30-
31-{% block logo %}
32- <img src="https://launchpad.net/@@/launchpad-logo-and-name.png" />
33-{% endblock %}
34+{% block title %}Search OOPS Reports{% endblock %}
35
36 {% block summaries %}
37 <h2>Available reports</h2>
38
39=== modified file 'src/oopstools/oops/test/pagetest.txt'
40--- src/oopstools/oops/test/pagetest.txt 2011-11-16 23:21:38 +0000
41+++ src/oopstools/oops/test/pagetest.txt 2012-05-15 20:33:17 +0000
42@@ -7,7 +7,7 @@
43 >>> b.open('http://localhost/oops/')
44
45 >>> b.title
46- 'Search Launchpad OOPS Reports'
47+ 'Search OOPS Reports'
48
49 Using a invalid OOPS id the page returns a nice error message saying no OOPS
50 match the given id.

Subscribers

People subscribed via source and target branches

to all changes: