Launchpad itself

Code review comment for lp:~gary/launchpad/launchpad-templates-3

launchpad-templates-3
Merge into devel

Revision history for this message

Gary Poster (gary) wrote on 2009-09-19:

Thank you Edwin!

I have made all of the changes you requested, except that when I removed the page_title, tests failed. I left it in.

The requested bug is https://bugs.edge.launchpad.net/launchpad-registry/+bug/433074 . It is 3 registry templates and 1 blueprint template, so I pushed it in registry as a first guess.

The incremental diff also includes changes to address other problems I found in tests.

Thanks again.

Gary

     >>> anon_browser.open('http://launchpad.dev/~name16/+hwdb-submissions')
     >>> print extract_text(find_main_content(anon_browser.contents))
- Hardware submissions for Foo Bar
+ Hardware submissions for Foo Bar...
     Foo Bar has posted no submissions.

Submissions that are marked as private and owned by a team are only
@@ -131,7 +131,7 @@
     >>> anon_browser.open(
     ... 'http://launchpad.dev/~ubuntu-team/+hwdb-submissions')
     >>> print extract_text(find_main_content(anon_browser.contents))
- Hardware submissions for Ubuntu Team
+ Hardware submissions for Ubuntu Team...
     Ubuntu Team has posted no submissions.

     >>> browser = setupBrowser(auth='Basic <email address hidden>:cprov')
@@ -233,5 +233,6 @@
     >>> anon_browser.open(
     ... 'http://launchpad.dev/+hwdb/+fingerprint/unknownfingerprint')
     >>> print extract_text(find_main_content(anon_browser.contents))
+ Hardware Database submissions for a fingerprint
     Submissions for system: unknownfingerprint
     There are no submissions for this system.

debug_root_index = 'Launchpad Debug Home Page'

-default_editform = 'Default "Edit" Page'
-
distributionmirror_index = ContextTitle('Mirror %s')

distribution_archive_list = ContextTitle('%s Copy Archives')
@@ -417,13 +415,6 @@

# launchpad_debug doesn't need a title.

-def launchpad_addform(context, view):
- """Return the page_title of the view, or None."""
- # Returning None results in the default Launchpad page title being used.
- return getattr(view, 'page_title', None)
-
-launchpad_editform = launchpad_addform
-
launchpad_feedback = 'Help improve Launchpad'

launchpad_forbidden = 'Forbidden'
@@ -517,8 +508,6 @@

# messages_index is a redirect

-message_add = ContextBugId('Bug #%d - Add a comment')
-
milestone_add = ContextTitle('Add new milestone for %s')

milestone_edit = ContextTitle('Edit %s')

=== modified file 'lib/canonical/launchpad/templates/hwdb-fingerprint-submissions.pt'
--- lib/canonical/launchpad/templates/hwdb-fingerprint-submissions.pt 2009-09-18 20:25:59 +0000
+++ lib/canonical/launchpad/templates/hwdb-fingerprint-submissions.pt 2009-09-19 13:21:09 +0000
@@ -7,9 +7,6 @@
i18n:domain="launchpad"
>
<body>
- <metal:pageheading fill-slot="heading">
- <h1>Hardware Database</h1>
- </metal:pageheading>

<div metal:fill-slot="main"
tal:define="batchnav view/getAllBatched;

=== modified file 'lib/canonical/launchpad/templates/notification-test.pt'
--- lib/canonical/launchpad/templates/notification-test.pt 2009-09-18 20:25:59 +0000
+++ lib/canonical/launchpad/templates/notification-test.pt 2009-09-19 13:22:24 +0000
@@ -11,9 +11,5 @@
<div metal:fill-slot="main">
</div>

-<metal:block fill-slot="help">
- <p>A test of notification messages.</p>
-</metal:block>
-
</body>
</html>

Thank you Edwin!

I have made all of the changes you requested, except that when I removed the page_title, tests failed.  I left it in.

The requested bug is https://bugs.edge.launchpad.net/launchpad-registry/+bug/433074 .  It is 3 registry templates and 1 blueprint template, so I pushed it in registry as a first guess.

The incremental diff also includes changes to address other problems I found in tests.

Thanks again.

Gary

=== modified file 'lib/canonical/launchpad/pagetests/hwdb/02-view-submissions.txt'
--- lib/canonical/launchpad/pagetests/hwdb/02-view-submissions.txt	2008-03-19 09:25:03 +0000
+++ lib/canonical/launchpad/pagetests/hwdb/02-view-submissions.txt	2009-09-19 14:32:00 +0000
@@ -102,7 +102,7 @@
 
     >>> anon_browser.open('http://launchpad.dev/~name16/+hwdb-submissions')
     >>> print extract_text(find_main_content(anon_browser.contents))
-    Hardware submissions for Foo Bar
+    Hardware submissions for Foo Bar...
     Foo Bar has posted no submissions.
 
 Submissions that are marked as private and owned by a team are only
@@ -131,7 +131,7 @@
     >>> anon_browser.open(
     ...     'http://launchpad.dev/~ubuntu-team/+hwdb-submissions')
     >>> print extract_text(find_main_content(anon_browser.contents))
-    Hardware submissions for Ubuntu Team
+    Hardware submissions for Ubuntu Team...
     Ubuntu Team has posted no submissions.
 
     >>> browser = setupBrowser(auth='Basic celso.providelo@canonical.com:cprov')
@@ -233,5 +233,6 @@
     >>> anon_browser.open(
     ...     'http://launchpad.dev/+hwdb/+fingerprint/unknownfingerprint')
     >>> print extract_text(find_main_content(anon_browser.contents))
+    Hardware Database submissions for a fingerprint
     Submissions for system: unknownfingerprint
     There are no submissions for this system.

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-09-18 20:25:59 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-09-19 13:19:49 +0000
@@ -317,8 +317,6 @@
 
 debug_root_index = 'Launchpad Debug Home Page'
 
-default_editform = 'Default "Edit" Page'
-
 distributionmirror_index = ContextTitle('Mirror %s')
 
 distribution_archive_list = ContextTitle('%s Copy Archives')
@@ -417,13 +415,6 @@
 
 # launchpad_debug doesn't need a title.
 
-def launchpad_addform(context, view):
-    """Return the page_title of the view, or None."""
-    # Returning None results in the default Launchpad page title being used.
-    return getattr(view, 'page_title', None)
-
-launchpad_editform = launchpad_addform
-
 launchpad_feedback = 'Help improve Launchpad'
 
 launchpad_forbidden = 'Forbidden'
@@ -517,8 +508,6 @@
 
 # messages_index is a redirect
 
-message_add = ContextBugId('Bug #%d - Add a comment')
-
 milestone_add = ContextTitle('Add new milestone for %s')
 
 milestone_edit = ContextTitle('Edit %s')

=== modified file 'lib/canonical/launchpad/templates/hwdb-fingerprint-submissions.pt'
--- lib/canonical/launchpad/templates/hwdb-fingerprint-submissions.pt	2009-09-18 20:25:59 +0000
+++ lib/canonical/launchpad/templates/hwdb-fingerprint-submissions.pt	2009-09-19 13:21:09 +0000
@@ -7,9 +7,6 @@
   i18n:domain="launchpad"
 >
   <body>
-    <metal:pageheading fill-slot="heading">
-      <h1>Hardware Database</h1>
-    </metal:pageheading>
 
     <div metal:fill-slot="main"
        tal:define="batchnav view/getAllBatched;

=== modified file 'lib/canonical/launchpad/templates/notification-test.pt'
--- lib/canonical/launchpad/templates/notification-test.pt	2009-09-18 20:25:59 +0000
+++ lib/canonical/launchpad/templates/notification-test.pt	2009-09-19 13:22:24 +0000
@@ -11,9 +11,5 @@
 <div metal:fill-slot="main">
 </div>
 
-<metal:block fill-slot="help">
-  <p>A test of notification messages.</p>
-</metal:block>
-
 </body>
 </html>

« Back to merge proposal