launchpad-reviewers team mailing list archive

Thread
Date

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

To: mp+105892@xxxxxxxxxxxxxxxxxx
From: James Westby <jw+debian@xxxxxxxxxxxxxxx>
Date: Tue, 15 May 2012 20:30:23 -0000
Reply-to: mp+105892@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

James Westby has proposed merging lp:~james-w/python-oops-tools/remove-lp-branding into lp:python-oops-tools.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #999461 in python-oops-tools: "Hard coded LP branding is confusing on non LP OOPs instances"
  https://bugs.launchpad.net/python-oops-tools/+bug/999461

For more details, see:
https://code.launchpad.net/~james-w/python-oops-tools/remove-lp-branding/+merge/105892

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
-- 
https://code.launchpad.net/~james-w/python-oops-tools/remove-lp-branding/+merge/105892
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~james-w/python-oops-tools/remove-lp-branding into lp:python-oops-tools.

=== modified file 'src/oopstools/oops/templates/base.html'
--- src/oopstools/oops/templates/base.html	2011-10-13 20:18:51 +0000
+++ src/oopstools/oops/templates/base.html	2012-05-15 20:29:17 +0000
@@ -2,16 +2,13 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
-    <title>{% block title %}Search Launchpad OOPS Reports{% endblock %}</title>
+    <title>{% block title %}Search OOPS Reports{% endblock %}</title>
     <style type="text/css" media="screen">
       @import url("/oops/static/oops.css");
     </style>
   </head>
   <body>
     <div id="search">
-      {% block logo %}
-        <img src="https://launchpad.net/@@/launchpad-logo-and-name.png"; />
-      {% endblock %}
     <form action="">
       <input type="text" name="oopsid" />
       <input type="submit" value="Search OOPS" />

=== modified file 'src/oopstools/oops/templates/index.html'
--- src/oopstools/oops/templates/index.html	2011-10-13 20:18:51 +0000
+++ src/oopstools/oops/templates/index.html	2012-05-15 20:29:17 +0000
@@ -1,10 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Search Launchpad OOPS Reports{% endblock %}
-
-{% block logo %}
-  <img src="https://launchpad.net/@@/launchpad-logo-and-name.png"; />
-{% endblock %}
+{% block title %}Search OOPS Reports{% endblock %}
 
 {% block summaries %}
 <h2>Available reports</h2>

=== modified file 'src/oopstools/oops/test/pagetest.txt'
--- src/oopstools/oops/test/pagetest.txt	2011-11-16 23:21:38 +0000
+++ src/oopstools/oops/test/pagetest.txt	2012-05-15 20:29:17 +0000
@@ -7,7 +7,7 @@
     >>> b.open('http://localhost/oops/')
 
     >>> b.title
-    'Search Launchpad OOPS Reports'
+    'Search OOPS Reports'
 
 Using a invalid OOPS id the page returns a nice error message saying no OOPS
 match the given id.