Merge lp:~sinzui/launchpad/registry-templates into lp:launchpad

[Curtis Hovey]

[Curtis Hovey (sinzui)]

This is my branch to update miscellaneous registry pages to UI 3.0.

    lp:~sinzui/launchpad/registry-templates
    Diff size: 651
    Launchpad bug: https://bugs.launchpad.net/bugs/414566
                   https://bugs.launchpad.net/bugs/414567
    Test command: ./bin/test -vvt "(karmaaction|projectgroupsecuritycontact|sourcepackage)-views"
    Pre-implementation: no one
    Target release: 2.2.8

= Update miscellaneous registry pages to UI 3.0 =

Bug 414566 [ProjectSet +review is pointless]
    The +review page shows the same list as +all. The template should be
    removed and the link to do a review can be added to the +all page.
    The xx-projectset.txt is redundant with projectgroup-views.txt and
    can be removed. The bad test is just verify permissions.

Bug 414567 [Update ungrouped registry templates to UI 3.0]
    Update these ungrouped templates to UI 3.0

      lib/lp/registry/templates/mailinglists-review.pt
      lib/lp/registry/templates/karmaaction-edit.pt
      lib/lp/registry/templates/securitycontact-edit.pt
      lib/lp/registry/templates/sourcepackage-edit-packaging.pt

    The ones using LaunchpadFormView need a page_title and cancel_url

== Rules ==

    * Remove unneeded tests and templates
    * Update views to support page_title.
    * Add labels and cancel_urls as needed.

== QA ==

As an admin or member of registry-experts
    * visit https://edge.launchpad.net/+projectgroups
      * Choose the list all link
      * Verify there is a link to review each project.

As an admin
    * https://staging.launchpad.net/karmaaction
    * Choose any action
    * Verify that the page title and heading are the same.
    * Verify there is a cancel link

As an owner of a project or an admin
    * Visit the bugs tab of any project or distribution
    * Choose the change the security contact
    * Verify that the page title and heading are the same.
    * Verify there is a cancel link

As a login user on staging
    * Visit any source package in a distroseries
    * Choose the update link
    * Verify that the page title and heading are the same.
    * Verify there is a cancel link
    * Set a product/series, and Change
    * Verify there is a notification confirming that the packaging changed.

As a launchpad developer
    * Visit https://edge.launchpad.net/+mailinglists
    * Verify the page has the 3.0 header.

== Lint ==

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/pagetitles.py
  lib/lp/registry/browser/configure.zcml
  lib/lp/registry/browser/karma.py
  lib/lp/registry/browser/mailinglists.py
  lib/lp/registry/browser/project.py
  lib/lp/registry/browser/securitycontact.py
  lib/lp/registry/browser/sourcepackage.py
  lib/lp/registry/browser/tests/karmaaction-views.txt
  lib/lp/registry/browser/tests/projectgroup-views.txt
  lib/lp/registry/browser/tests/securitycontact-views.txt
  lib/lp/registry/browser/tests/sourcepackage-views.txt
  lib/lp/registry/templates/mailinglists-review.pt
  lib/lp/registry/templates/project-listing-detailed.pt
  lib/lp/registry/templates/securitycontact-...

[Eleanor Berger (intellectronica)]

nicely done!

review: Approve

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-08-13 00:39:47 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-08-16 21:14:53 +0000
@@ -634,8 +634,6 @@
 
 karmaaction_index = 'Karma actions'
 
-karmaaction_edit = 'Edit karma action'
-
 karmacontext_topcontributors = ContextTitle('Top %s Contributors')
 
 language_index = ContextDisplayName("%s in Launchpad")
@@ -735,8 +733,6 @@
 
 logintoken_validateteamemail = 'Confirm e-mail address'
 
-mailinglists_review = 'Pending mailing lists requests'
-
 # main_template has the code to insert one of these titles.
 
 malone_about = 'About Launchpad Bugs'
@@ -1175,8 +1171,6 @@
 
 projects_all = 'Project groups registered in Launchpad'
 
-registry_review = 'Review Launchpad items'
-
 related_bounties = ContextDisplayName('Bounties for %s')
 
 remotebug_index = ContextTitle('%s')
@@ -1242,8 +1236,6 @@
 
 questiontarget_manage_answercontacts = ContextTitle("Answer contact for %s")
 
-securitycontact_edit = ContextDisplayName("Edit %s security contact")
-
 series_bug_nominations = ContextDisplayName('Bugs nominated for %s')
 
 shipit_adminrequest = 'ShipIt admin request'
@@ -1312,8 +1304,6 @@
     """Return the page title for a source package in a distroseries."""
     return '%s source packages' % context.distroseries.title
 
-sourcepackage_edit_packaging = ContextTitle('Define upstream link for %s')
-
 sourcepackage_translate = ContextTitle('Help translate %s')
 
 sourcepackagenames_index = 'Source package name set'

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-08-14 00:52:28 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-08-16 21:14:53 +0000
@@ -454,15 +454,6 @@
         facet="overview"
         permission="launchpad.ProjectReview"
         template="../templates/project-add.pt"/>
-    <browser:pages
-        for="lp.registry.interfaces.project.IProjectSet"
-        facet="overview"
-        class="lp.registry.browser.project.ProjectSetView"
-        permission="launchpad.ProjectReview">
-        <browser:page
-            name="+review"
-            template="../templates/registry-review.pt"/>
-    </browser:pages>
     <browser:url
         for="lp.registry.interfaces.project.IProjectSeries"
         path_expression="string:+series/${name}"
@@ -580,7 +571,7 @@
             for="lp.registry.interfaces.karma.IKarmaAction"
             class="lp.registry.browser.karma.KarmaActionEditView"
             permission="launchpad.Admin"
-            template="../templates/karmaaction-edit.pt"/>
+            template="../../app/templates/generic-edit.pt"/>
         <browser:url
             for="lp.registry.interfaces.karma.IKarmaActionSet"
             path_expression="string:karmaaction"

=== modified file 'lib/lp/registry/browser/karma.py'
--- lib/lp/registry/browser/karma.py	2009-06-25 04:06:00 +0000
+++ lib/lp/registry/browser/karma.py	2009-08-16 17:02:13 +0000
@@ -37,13 +37,27 @@
 class KarmaActionEditView(LaunchpadEditFormView):
 
     schema = IKarmaAction
-    label = "Edit karma action"
     field_names = ["name", "category", "points", "title", "summary"]
 
+    @property
+    def label(self):
+        """See `LaunchpadFormView`."""
+        return 'Edit %s karma action' % self.context.title
+
+    @property
+    def page_title(self):
+        """The page title."""
+        return self.label
+
+    @property
+    def cancel_url(self):
+        """See `LaunchpadFormView`."""
+        return canonical_url(getUtility(IKarmaActionSet))
+
     @action(_("Change"), name="change")
     def change_action(self, action, data):
         self.updateContextFromData(data)
-        self.next_url = canonical_url(getUtility(IKarmaActionSet))
+        self.next_url = self.cancel_url
 
 
 class KarmaContextContributor:

=== modified file 'lib/lp/registry/browser/mailinglists.py'
--- lib/lp/registry/browser/mailinglists.py	2009-06-25 04:06:00 +0000
+++ lib/lp/registry/browser/mailinglists.py	2009-08-16 17:21:54 +0000
@@ -40,6 +40,7 @@
     """Present review page for mailing list creation requests."""
 
     schema = ReviewForm
+    page_title = 'Pending mailing lists requests'
 
     @cachedproperty
     def registered_lists(self):

=== modified file 'lib/lp/registry/browser/project.py'
--- lib/lp/registry/browser/project.py	2009-08-13 18:10:15 +0000
+++ lib/lp/registry/browser/project.py	2009-08-16 21:14:53 +0000
@@ -478,6 +478,7 @@
 class ProjectSetView(LaunchpadView):
 
     header = "Project groups registered in Launchpad"
+    page_title = header
 
     def __init__(self, context, request):
         super(ProjectSetView, self).__init__(context, request)

=== modified file 'lib/lp/registry/browser/securitycontact.py'
--- lib/lp/registry/browser/securitycontact.py	2009-07-17 00:26:05 +0000
+++ lib/lp/registry/browser/securitycontact.py	2009-08-16 21:16:51 +0000
@@ -21,6 +21,16 @@
     field_names = ['security_contact']
 
     @property
+    def label(self):
+        """See `LaunchpadFormView`."""
+        return 'Edit %s security contact' % self.context.displayname
+
+    @property
+    def page_title(self):
+        """The page title."""
+        return self.label
+
+    @property
     def initial_values(self):
         return {
             'security_contact': self.context.security_contact}
@@ -42,7 +52,8 @@
                 # The security contact doesn't have a preferred email address,
                 # so it must be a team.
                 assert security_contact.isTeam(), (
-                    "Expected security contact with no email address to be a team.")
+                    "Expected security contact with no email address "
+                    "to be a team.")
                 security_contact_display_value = security_contact.displayname
 
             self.request.response.addNotification(
@@ -55,3 +66,5 @@
     @property
     def next_url(self):
         return canonical_url(self.context)
+
+    cancel_url = next_url

=== modified file 'lib/lp/registry/browser/sourcepackage.py'
--- lib/lp/registry/browser/sourcepackage.py	2009-07-27 20:18:30 +0000
+++ lib/lp/registry/browser/sourcepackage.py	2009-08-16 19:42:08 +0000
@@ -116,15 +116,26 @@
     field_names = ['productseries']
 
     @property
+    def label(self):
+        """See `LaunchpadFormView`."""
+        return 'Define upstream link for %s' % self.context.title
+
+    @property
+    def page_title(self):
+        """The page title."""
+        return self.label
+
+    @property
     def cancel_url(self):
         return canonical_url(self.context)
 
     @action(_("Change"), name="change")
     def change(self, action, data):
         self.context.setPackaging(data['productseries'], self.user)
-        self.status_message = 'Upstream link updated, thank you!'
+        self.request.response.addNotification('Upstream link updated.')
         self.next_url = canonical_url(self.context)
 
+
 class SourcePackageView(BuildRecordsView):
 
     def initialize(self):

=== added file 'lib/lp/registry/browser/tests/karmaaction-views.txt'
--- lib/lp/registry/browser/tests/karmaaction-views.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/browser/tests/karmaaction-views.txt	2009-08-16 17:02:13 +0000
@@ -0,0 +1,43 @@
+KarmaAction views
+=================
+
+    >>> from lp.registry.interfaces.karma import IKarmaActionSet
+
+    >>> karmaactionset = getUtility(IKarmaActionSet)
+    >>> action = karmaactionset.getByName('branchcreated')
+
+The karma action +edit view allow an admin to edit a karma action. The
+view provides a label, page_title and a cancel_url
+
+    >>> view = create_initialized_view(action, '+index')
+    >>> print view.label
+    Edit New branch registered karma action
+
+    >>> print view.page_title
+    Edit New branch registered karma action
+
+    >>> print view.cancel_url
+    http://launchpad.dev/karmaaction
+
+The admin can edit the karma action's fields.
+
+    >>> view.field_names
+    ['name', 'category', 'points', 'title', 'summary']
+
+    >>> action.points
+    1
+
+    >>> login('[e-mail]')
+    >>> form = {
+    ...     'field.points': '2',
+    ...     'field.actions.change': 'Change',
+    ...     }
+    >>> view = create_initialized_view(action, '+index', form=form)
+    >>> view.errors
+    []
+
+    >>> print view.next_url
+    http://launchpad.dev/karmaaction
+
+    >>> action.points
+    2

=== modified file 'lib/lp/registry/browser/tests/projectgroup-views.txt'
--- lib/lp/registry/browser/tests/projectgroup-views.txt	2009-07-13 23:46:24 +0000
+++ lib/lp/registry/browser/tests/projectgroup-views.txt	2009-08-16 21:14:53 +0000
@@ -23,6 +23,11 @@
     >>> check_permission('launchpad.ProjectReview', view)
     True
 
+The view provides a page_title.
+
+    >>> print view.page_title
+    Project groups registered in Launchpad
+
 A regular user cannot access the view.
 
     >>> user = factory.makePerson()
@@ -58,28 +63,10 @@
     >>> check_permission('launchpad.ProjectReview', view)
     True
 
-A regular user cannot access the view.
-
-    >>> login_person(user)
-    >>> check_permission('launchpad.ProjectReview', view)
-    False
-
-A member of the registry team has permission.
-
-    >>> login_person(registry_member)
-    >>> check_permission('launchpad.ProjectReview', view)
-    True
-
-
-Accessing the +review view
---------------------------
-
-A Launchpad admin has permission to access the +review view.
-
-    >>> view = create_view(project_set, name='+review')
-    >>> login('[e-mail]')
-    >>> check_permission('launchpad.ProjectReview', view)
-    True
+The view provides a page_title.
+
+    >>> print view.page_title
+    Project groups registered in Launchpad
 
 A regular user cannot access the view.
 

=== added file 'lib/lp/registry/browser/tests/securitycontact-views.txt'
--- lib/lp/registry/browser/tests/securitycontact-views.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/browser/tests/securitycontact-views.txt	2009-08-16 17:58:52 +0000
@@ -0,0 +1,40 @@
+HasSecurityContect
+==================
+
+The +edit view allows the project owner and admin to change the security
+contact or the project. The view provides a label, page_title and cancel_url.
+
+    >>> product = factory.makeProduct(name='bonkers', displayname='Bonkers')
+    >>> view = create_view(product, name='+securitycontact')
+    >>> print view.label
+    Edit Bonkers security contact
+
+    >>> print view.page_title
+    Edit Bonkers security contact
+
+    >>> print view.cancel_url
+    http://launchpad.dev/bonkers
+
+The view allows the owner or admin to change the security_contact field.
+
+    >>> view.field_names
+    ['security_contact']
+
+    >>> print product.security_contact
+    None
+
+    >>> login_person(product.owner)
+    >>> form = {
+    ...     'field.security_contact': 'no-priv',
+    ...     'field.actions.change': 'Change',
+    ...     }
+    >>> view = create_initialized_view(
+    ...     product, name='+securitycontact', form=form)
+    >>> view.errors
+    []
+
+    >>> print view.next_url
+    http://launchpad.dev/bonkers
+
+    >>> print product.security_contact.name
+    no-priv

=== added file 'lib/lp/registry/browser/tests/sourcepackage-views.txt'
--- lib/lp/registry/browser/tests/sourcepackage-views.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/browser/tests/sourcepackage-views.txt	2009-08-16 19:42:08 +0000
@@ -0,0 +1,53 @@
+SourcePackage views
+===================
+
+
+    >>> product = factory.makeProduct(name='bonkers', displayname='Bonkers')
+    >>> productseries = factory.makeProductSeries(
+    ...     name='crazy', product=product)
+    >>> distribution = factory.makeDistribution(
+    ...     name='youbuntu', displayname='Youbuntu')
+    >>> distroseries = factory.makeDistroRelease(name='busy',
+    ...     distribution=distribution)
+    >>> sourcepackagename = factory.makeSourcePackageName(name='bonkers')
+    >>> package = factory.makeSourcePackage(
+    ...     sourcepackagename=sourcepackagename, distroseries=distroseries)
+
+    >>> view = create_view(package, name='+edit-packaging')
+    >>> print view.label
+     Define upstream link for bonkers in Youbuntu Busy
+
+    >>> print view.page_title
+     Define upstream link for bonkers in Youbuntu Busy
+
+    >>> print view.cancel_url
+    http://launchpad.dev/youbuntu/busy/+source/bonkers
+
+The view allows the owner or admin to change productseries field.
+
+    >>> view.field_names
+    ['productseries']
+
+    >>> print package.productseries
+    None
+
+    >>> login_person(product.owner)
+    >>> form = {
+    ...     'field.productseries': 'bonkers/crazy',
+    ...     'field.actions.change': 'Change',
+    ...     }
+    >>> view = create_initialized_view(
+    ...     package, name='+edit-packaging', form=form,
+    ...     principal=product.owner)
+    >>> view.errors
+    []
+
+    >>> print view.next_url
+    http://launchpad.dev/youbuntu/busy/+source/bonkers
+
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    Upstream link updated.
+
+    >>> print package.productseries.name
+    crazy

=== removed file 'lib/lp/registry/stories/project/xx-projectset.txt'
--- lib/lp/registry/stories/project/xx-projectset.txt	2009-07-13 18:07:00 +0000
+++ lib/lp/registry/stories/project/xx-projectset.txt	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-= Project Set Page =
-
-Under "/projectgroups" there are several pages for various administration tasks.
-
-The pages are "+review", "+new", and "+all".
-
-A logged in, unprivileged person cannot see any of these pages.
-
-    >>> user_browser.open('http://launchpad.dev/projectgroups/+review')
-    Traceback (most recent call last):
-      ...
-    Unauthorized:...
-
-    >>> user_browser.open('http://launchpad.dev/projectgroups/+all')
-    Traceback (most recent call last):
-      ...
-    Unauthorized:...
-
-    >>> user_browser.open('http://launchpad.dev/projectgroups/+new')
-    Traceback (most recent call last):
-      ...
-    Unauthorized:...
-
-An administrator may successfully access all of these pages.
-
-    >>> admin_browser.open('http://launchpad.dev/projectgroups/+review')
-    >>> admin_browser.title
-    'Review Launchpad items'
-
-    >>> admin_browser.open('http://launchpad.dev/projectgroups/+all')
-    >>> admin_browser.title
-    'Project groups registered in Launchpad'
-
-    >>> admin_browser.open('http://launchpad.dev/projectgroups/+new')
-    >>> admin_browser.title
-    'Register a project group with Launchpad'
-
-A member of the registry admins team my access all of these pages, too.
-
-    >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces.launchpad import (
-    ...     ILaunchpadCelebrities)
-    >>> login('[e-mail]')
-    >>> registry_member = factory.makePerson(
-    ...     name='reggie', email='[e-mail]', password='test')
-    >>> celebs = getUtility(ILaunchpadCelebrities)
-    >>> registry = celebs.registry_experts
-    >>> registry.addMember(registry_member, registry.teamowner)
-    >>> logout()
-
-    >>> registry_browser = setupBrowser(
-    ...     auth='Basic [e-mail]:test')
-
-    >>> registry_browser.open('http://launchpad.dev/projectgroups/+review')
-    >>> registry_browser.title
-    'Review Launchpad items'
-
-    >>> registry_browser.open('http://launchpad.dev/projectgroups/+all')
-    >>> registry_browser.title
-    'Project groups registered in Launchpad'
-
-    >>> registry_browser.open('http://launchpad.dev/projectgroups/+new')
-    >>> registry_browser.title
-    'Register a project group with Launchpad'
-
-    registry_member.leave(registry)

=== removed file 'lib/lp/registry/templates/karmaaction-edit.pt'
--- lib/lp/registry/templates/karmaaction-edit.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/karmaaction-edit.pt	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad"
->
-  <body>
-  <div metal:fill-slot="main">
-
-    <div><a href="../">Actions that give people karma</a>:</div>
-
-    <div metal:use-macro="context/@@launchpad_form/form">
-    
-
-    </div>
-    
-  </div>
-
-  </body>
-</html>

=== modified file 'lib/lp/registry/templates/mailinglists-review.pt'
--- lib/lp/registry/templates/mailinglists-review.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/mailinglists-review.pt	2009-08-16 17:21:54 +0000
@@ -3,18 +3,13 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
   >
 
 <body>
-  <metal:portlets fill-slot="portlets"/>
-
   <div metal:fill-slot="main">
-    <h1>Creation requests</h1>
+    <h1 tal:content="view/page_title" />
     <div tal:condition="view/registered_lists">
       <metal:form use-macro="context/@@launchpad_form/form">
         <p metal:fill-slot="extra_top">These team administrators have

=== modified file 'lib/lp/registry/templates/project-listing-detailed.pt'
--- lib/lp/registry/templates/project-listing-detailed.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/project-listing-detailed.pt	2009-08-16 21:14:53 +0000
@@ -4,9 +4,11 @@
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   omit-tag="">
 
-<img src="/@@/product" />
-<a tal:attributes="href context/fmt:url"
-   tal:content="context/title">Project Title Here</a>
+<a tal:replace="structure context/fmt:link" />
+<tal:review tal:condition="context/required:launchpad.ProjectReview">
+  (<a tal:attributes="href context/fmt:url/+review">Review</a>)
+</tal:review>
+
 <div style="font-size: 80%; margin-left: 25px;">
   <div class="discreet"
     tal:content="context/summary" tal:condition="context/summary">

=== removed file 'lib/lp/registry/templates/registry-review.pt'
--- lib/lp/registry/templates/registry-review.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/registry-review.pt	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad"
->
-
-<body>
-
-<div metal:fill-slot="main">
-
-    <h1>Registry items for review</h1>
-
-      <p>Please review these items.</p>
-      <dl>
-        <tal:item repeat="item context/forReview">
-          <dt>
-            <a
-              tal:attributes="href string:${item/name}"
-              tal:content="item/title"
-            >Name of the item</a>
-            (<a tal:attributes="href string:${item/name}/+review">Review</a>)
-          </dt>
-          <dd>
-            <p tal:content="item/summary">summary</p>
-          </dd>
-        </tal:item>
-      </dl>
-    </div>
-  </body>
-</html>

=== modified file 'lib/lp/registry/templates/securitycontact-edit.pt'
--- lib/lp/registry/templates/securitycontact-edit.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/securitycontact-edit.pt	2009-08-16 17:58:52 +0000
@@ -3,22 +3,12 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 
 <body>
 
-<metal:leftportlets fill-slot="portlets_one">
-</metal:leftportlets>
-
-<metal:heading fill-slot="pageheading">
-  <h1>Change security contact</h1>
-</metal:heading>
-
 <div metal:fill-slot="main">
   <div metal:use-macro="context/@@launchpad_form/form">
 

=== modified file 'lib/lp/registry/templates/sourcepackage-edit-packaging.pt'
--- lib/lp/registry/templates/sourcepackage-edit-packaging.pt	2009-07-23 21:38:32 +0000
+++ lib/lp/registry/templates/sourcepackage-edit-packaging.pt	2009-08-16 19:42:08 +0000
@@ -2,31 +2,19 @@
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_only"
 >
 
 <body>
 
-<metal:leftportlets fill-slot="portlets_one">
-</metal:leftportlets>
-
-<metal:rightportlets fill-slot="portlets_two">
-  <div tal:replace="structure context/@@+portlet-upstream" />
-</metal:rightportlets>
-
-
 <div metal:fill-slot="main">
 
-  <h1>Package upstream link</h1>
-
-  <p>Links from distribution packages to upstream project series let
-    distribution and upstream maintainers share bugs, patches, and translations
-    efficiently.</p>
-
   <div metal:use-macro="context/@@launchpad_form/form">
+    <p metal:fill-slot="extra_info">
+      Links from distribution packages to upstream project series let
+      distribution and upstream maintainers share bugs, patches, and
+      translations efficiently.
+    </p>
   </div>
 
 </div>