Merge lp:~barry/launchpad/416703-sprints into lp:launchpad

[Barry Warsaw]

[Barry Warsaw (barry)]

= Summary =

Bug 416703 describes the conversion of the top level /sprints page to UI 3.0.
This was a fairly mechanical change given that this is the fifth such related
branch I've done.

NOTE: This branch is dependent on one that has not yet landed. Please use the
attached diff if the generated one does not take the branch dependencies into
account.

== Proposed fix ==

Fiddle with templates, etc.

== Pre-implementation notes ==

Not much, except that after a discussion on irc, it was decided to restore the
'info' icons and the 'View...' prefix in the navmenu, for consistency with the
rest of the ui.

== Implementation details ==

Not much extra.

== Tests ==

Will run through ec2 before landing.

== Demo and Q/A ==

* Visit http://launchpad.dev/sprints

= Launchpad lint =

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

Linting changed files:
  lib/lp/registry/browser/configure.zcml
  lib/lp/blueprints/templates/sprints-index.pt
  lib/lp/registry/browser/menu.py
  lib/canonical/launchpad/pagetitles.py
  lib/lp/registry/browser/product.py
  lib/lp/blueprints/browser/sprint.py
  lib/canonical/launchpad/icing/style-3-0.css
  lib/lp/blueprints/browser/configure.zcml
  lib/lp/registry/templates/projects-index.pt
  lib/lp/registry/templates/distros-index.pt
  lib/lp/registry/templates/products-index.pt
  lib/lp/registry/browser/distribution.py
  lib/lp/registry/browser/project.py

== diff ==

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py 2009-08-21 15:19:02 +0000
+++ lib/canonical/launchpad/pagetitles.py 2009-08-21 20:04:25 +0000
@@ -1284,8 +1284,6 @@

 sprints_all = 'All sprints and meetings registered in Launchpad'

-sprints_index = 'Meetings and sprints registered in Launchpad'
-
 sprintspecification_decide = 'Consider spec for sprint agenda'

 sprintspecification_admin = 'Approve blueprint for sprint agenda'

=== modified file 'lib/lp/blueprints/browser/configure.zcml'
--- lib/lp/blueprints/browser/configure.zcml 2009-08-03 14:38:55 +0000
+++ lib/lp/blueprints/browser/configure.zcml 2009-08-21 20:04:25 +0000
@@ -147,9 +147,6 @@
         <browser:page
             name="+all"
             template="../templates/sprints-all.pt"/>
- <browser:page
- name="+portlet-details"
- template="../templates/sprints-portlet-details.pt"/>
     </browser:pages>
     <browser:page
         name="+new"

=== modified file 'lib/lp/blueprints/browser/sprint.py'
--- lib/lp/blueprints/browser/sprint.py 2009-06-25 00:00:26 +0000
+++ lib/lp/blueprints/browser/sprint.py 2009-08-21 20:04:25 +0000
@@ -28,8 +28,9 @@
 import pytz
 from StringIO import StringIO

+from zope.app.form.browser import TextAreaWidget
 from zope.component import getUtility
-from zope.app.form.browser import TextAreaWidget
+from zope.interface import implements

 from canonical.launchpad import _
 from canonical.cachedproperty import cachedproperty
@@ -40,6 +41,8 @@
     SpecificationDefinitionStatus, SpecificationFilter, SpecificationPriority,
     SpecificationSort)
 from lp.blueprints.interfaces.sprint import ISprint, ISprintS...

[Curtis Hovey (sinzui)]

We discusses the new style added and concluded that .summary and .application-summary are used for different purposes. .summary is for user-entered content link the summary of a project. .application-summary is for information that introduces a part of the application, which might be list pages.

review: Approve (code)

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2009-08-20 14:01:26 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2009-08-20 21:13:30 +0000
@@ -442,6 +442,15 @@
     color: #000;
     font-weight: normal;
     }
+.application-summary {
+    font-size: 123.1%;
+}
+.search-results {
+    margin-top: 1em;
+}
+p.search-results {
+    font-size: 116%;
+}
 
 
 /* Exceptions they may be common. */
 
=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-08-21 09:39:13 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-08-21 20:04:25 +0000
@@ -508,8 +508,6 @@
 
 distroseriessourcepackagerelease_index = ContextTitle('%s')
 
-distros_index = 'Distributions registered in Launchpad'
-
 edit_bug_supervisor = ContextTitle('Edit bug supervisor for %s')
 
 errorservice_config = 'Configure error log'
@@ -1065,8 +1063,6 @@
 
 project_translators = ContextTitle('Set translation group for %s')
 
-projects_index = 'Project groups registered in Launchpad'
-
 projects_request = 'Launchpad Translations: Request a project group'
 
 projects_search = 'Search for project groups in Launchpad'
@@ -1288,8 +1284,6 @@
 
 sprints_all = 'All sprints and meetings registered in Launchpad'
 
-sprints_index = 'Meetings and sprints registered in Launchpad'
-
 sprintspecification_decide = 'Consider spec for sprint agenda'
 
 sprintspecification_admin = 'Approve blueprint for sprint agenda'
 
=== modified file 'lib/lp/blueprints/browser/configure.zcml'
--- lib/lp/blueprints/browser/configure.zcml	2009-08-03 14:38:55 +0000
+++ lib/lp/blueprints/browser/configure.zcml	2009-08-21 20:04:25 +0000
@@ -147,9 +147,6 @@
         <browser:page
             name="+all"
             template="../templates/sprints-all.pt"/>
-        <browser:page
-            name="+portlet-details"
-            template="../templates/sprints-portlet-details.pt"/>
     </browser:pages>
     <browser:page
         name="+new"
 
=== modified file 'lib/lp/blueprints/browser/sprint.py'
--- lib/lp/blueprints/browser/sprint.py	2009-06-25 00:00:26 +0000
+++ lib/lp/blueprints/browser/sprint.py	2009-08-21 20:04:25 +0000
@@ -28,8 +28,9 @@
 import pytz
 from StringIO import StringIO
 
+from zope.app.form.browser import TextAreaWidget
 from zope.component import getUtility
-from zope.app.form.browser import TextAreaWidget
+from zope.interface import implements
 
 from canonical.launchpad import _
 from canonical.cachedproperty import cachedproperty
@@ -40,6 +41,8 @@
     SpecificationDefinitionStatus, SpecificationFilter, SpecificationPriority,
     SpecificationSort)
 from lp.blueprints.interfaces.sprint import ISprint, ISprintSet
+from lp.registry.browser.menu import (
+    IRegistryCollectionNavigationMenu, RegistryCollectionActionMenuBase)
 from canonical.launchpad.webapp import (
     ApplicationMenu, ContextMenu, GetitemNavigation, LaunchpadEditFormView,
     LaunchpadFormView, LaunchpadView, Link, Navigation,
@@ -488,7 +491,22 @@
         return body.encode('utf-8')
 
 
+class SprintSetNavigationMenu(RegistryCollectionActionMenuBase):
+    """Action menu for sprints index."""
+    usedfor = ISprintSet
+    links = [
+        'register_team',
+        'register_project',
+        'create_account',
+        ]
+
+
 class SprintSetView(LaunchpadView):
+    """View for the /sprints top level collection page."""
+
+    implements(IRegistryCollectionNavigationMenu)
+
+    page_title = 'Meetings and sprints registered in Launchpad'
 
     def all_batched(self):
         return BatchNavigator(self.context.all, self.request)
 
=== modified file 'lib/lp/blueprints/templates/sprints-index.pt'
--- lib/lp/blueprints/templates/sprints-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/blueprints/templates/sprints-index.pt	2009-08-21 20:07:57 +0000
@@ -6,34 +6,37 @@
   xml:lang="en"
   lang="en"
   dir="ltr"
-  metal:use-macro="view/macro:page/pillarindex"
+  metal:use-macro="view/macro:page/main_side"
   i18n:domain="launchpad">
+
   <body>
     <h1 metal:fill-slot="heading">Coming events</h1>
 
-<metal:rightportlets fill-slot="portlets_two">
-  <div tal:replace="structure context/@@+portlet-details" />
-</metal:rightportlets>
-
-<div metal:fill-slot="main">
-
-  <p id="application-summary">
-    Launchpad can help you organise your developer sprints, summits and
-    gatherings. Register the meeting here, then you can invite people to
-    nominate blueprints for discussion at the event. The meeting drivers
-    control the agenda, but everyone can see what's proposed and what's
-    been accepted.
-  </p>
-
-  <table>
-    <tbody>
-      <tal:sprint
-        repeat="sprint context"
-        replace="structure sprint/@@+listing-detailed"
-        />
-    </tbody>
-  </table>
-
-</div>
-</body>
+    <tal:side metal:fill-slot="side">
+      <tal:menu replace="structure view/@@+global-actions" />
+      <tal:menu replace="structure context/@@+related-pages" />
+    </tal:side>
+
+    <div metal:fill-slot="main">
+
+      <table class="listing">
+        <tbody>
+          <tal:sprint
+            repeat="sprint context"
+            replace="structure sprint/@@+listing-detailed"
+            />
+        </tbody>
+      </table>
+
+      <p/>
+      <p id="application-summary">
+        Launchpad can help you organise your developer sprints, summits and
+        gatherings. Register the meeting here, then you can invite people to
+        nominate blueprints for discussion at the event. The meeting drivers
+        control the agenda, but everyone can see what's proposed and what's
+        been accepted.
+      </p>
+
+    </div>
+  </body>
 </html>
 
=== removed file 'lib/lp/blueprints/templates/sprints-portlet-details.pt'
--- lib/lp/blueprints/templates/sprints-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/blueprints/templates/sprints-portlet-details.pt	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<tal:root
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  omit-tag="">
-
-<div class="portlet" id="portlet-details">
-
-  <h2>About these meetings</h2>
-
-  <div class="portletBody portletContent">
-
-    <img src="/@@/info" />
-    You can register a meeting, and
-    then easily manage the agenda of the meeting. Anybody can propose a
-    blueprint for discussion at the meeting, but only the meeting
-    organisers (the "drivers") can approve a topic on the meeting agenda.
-
-  </div>
-
-</div>
-</tal:root>
 
=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-08-20 14:01:26 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-08-21 15:19:02 +0000
@@ -424,7 +424,7 @@
     <browser:pages
         for="lp.registry.interfaces.project.IProjectSet"
         facet="overview"
-        permission="launchpad.ProjectReview"
+        permission="zope.Public"
         class="lp.registry.browser.project.ProjectSetView">
         <browser:page
             name="+all"
@@ -456,16 +456,18 @@
         template="../templates/project-series-portlet-details.pt"/>
     <browser:menus
         classes="
-            ProjectFacets
             ProjectActionMenu
+            ProjectAnswersMenu
+            ProjectBountiesMenu
+            ProjectBugsMenu
             ProjectEditNavigationMenu
+            ProjectFacets
             ProjectOverviewMenu
-            ProjectBountiesMenu
-            ProjectBugsMenu
             ProjectSeriesSpecificationsMenu
+            ProjectSetContextMenu
+            ProjectSetNavigationMenu
             ProjectSpecificationsMenu
-            ProjectSetContextMenu
-            ProjectAnswersMenu"
+            "
         module="lp.registry.browser.project"/>
     <browser:defaultView
         for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
@@ -2010,15 +2012,17 @@
         template="../../app/templates/generic-edit.pt"/>
     <browser:menus
         classes="
+            DistributionBountiesMenu
+            DistributionBugsMenu
             DistributionFacets
+            DistributionMirrorsNavigationMenu
+            DistributionNavigationMenu
             DistributionOverviewMenu
-            DistributionBugsMenu
-            DistributionBountiesMenu
+            DistributionSetActionNavigationMenu
+            DistributionSetContextMenu
+            DistributionSetFacets
             DistributionSpecificationsMenu
-            DistributionSetFacets
-            DistributionSetContextMenu
-            DistributionNavigationMenu
-            DistributionMirrorsNavigationMenu"
+            "
         module="lp.registry.browser.distribution"/>
     <browser:defaultView
         for="lp.registry.interfaces.sourcepackage.ISourcePackage"
 
=== modified file 'lib/lp/registry/browser/distribution.py'
--- lib/lp/registry/browser/distribution.py	2009-08-20 11:15:55 +0000
+++ lib/lp/registry/browser/distribution.py	2009-08-20 22:59:38 +0000
@@ -20,11 +20,12 @@
     'DistributionFacets',
     'DistributionLanguagePackAdminView',
     'DistributionNavigation',
+    'DistributionPPASearchView',
     'DistributionPackageSearchView',
     'DistributionPendingReviewMirrorsView',
-    'DistributionPPASearchView',
     'DistributionSeriesMirrorsRSSView',
     'DistributionSeriesMirrorsView',
+    'DistributionSetActionNavigationMenu',
     'DistributionSetBreadcrumbBuilder',
     'DistributionSetContextMenu',
     'DistributionSetFacets',
@@ -46,6 +47,8 @@
 
 from canonical.cachedproperty import cachedproperty
 from lp.registry.browser.announcement import HasAnnouncementsView
+from lp.registry.browser.menu import (
+    IRegistryCollectionNavigationMenu, RegistryCollectionActionMenuBase)
 from lp.soyuz.browser.archive import traverse_distro_archive
 from lp.bugs.browser.bugtask import BugTargetTraversalMixin
 from lp.soyuz.browser.build import BuildRecordsView
@@ -770,12 +773,21 @@
         self.batchnav = BatchNavigator(results, self.request)
 
 
-class DistributionSetView:
-
-    def __init__(self, context, request):
-        self.context = context
-        self.request = request
-
+class DistributionSetActionNavigationMenu(RegistryCollectionActionMenuBase):
+    """Action menu for `DistributionSetView`."""
+
+    usedfor = IDistributionSet
+    links = ['register_team', 'register_project', 'create_account']
+
+
+class DistributionSetView(LaunchpadView):
+    """View for /distros top level collection."""
+
+    implements(IRegistryCollectionNavigationMenu)
+
+    page_title = 'Distributions registered in Launchpad'
+
+    @cachedproperty
     def count(self):
         return self.context.count()
 
 
=== modified file 'lib/lp/registry/browser/menu.py'
--- lib/lp/registry/browser/menu.py	2009-08-20 16:28:54 +0000
+++ lib/lp/registry/browser/menu.py	2009-08-21 20:04:25 +0000
@@ -22,19 +22,19 @@
     """Menu shared by top level collection objects."""
 
     def projects(self):
-        return Link('/projects/', 'Projects')
+        return Link('/projects/', 'View projects', icon='info')
 
     def distributions(self):
-        return Link('/distros/', 'Distributions')
+        return Link('/distros/', 'View distributions', icon='info')
 
     def people(self):
-        return Link('/people/', 'People')
+        return Link('/people/', 'View people', icon='info')
 
     def meetings(self):
-        return Link('/sprints/', 'Meetings')
+        return Link('/sprints/', 'View meetings', icon='info')
 
     def project_groups(self):
-        return Link('/projectgroups', 'Project groups')
+        return Link('/projectgroups', 'View project groups', icon='info')
 
     def register_project(self):
         text = 'Register a project'
 
=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2009-08-21 07:17:28 +0000
+++ lib/lp/registry/browser/product.py	2009-08-21 15:05:23 +0000
@@ -1393,7 +1393,7 @@
 
     @enabled_with_permission('launchpad.ProjectReview')
     def review_licenses(self):
-        return Link('+review-licenses', 'Review projects')
+        return Link('+review-licenses', 'Review projects', icon='edit')
 
 
 class ProductSetView(LaunchpadView):
@@ -1405,27 +1405,27 @@
 
     max_results_to_display = config.launchpad.default_batch_size
     results = None
-    searchrequested = False
+    search_requested = False
 
     def initialize(self):
-        """See `LaunchpadFormView`."""
+        """See `LaunchpadView`."""
         form = self.request.form_ng
         self.search_string = form.getOne('text')
         if self.search_string is not None:
-            self.searchrequested = True
+            self.search_requested = True
 
     def all_batched(self):
         return BatchNavigator(self.context.all_active, self.request)
 
     @cachedproperty
     def matches(self):
-        if not self.searchrequested:
+        if not self.search_requested:
             return None
         pillarset = getUtility(IPillarNameSet)
         return pillarset.count_search_matches(self.search_string)
 
     @cachedproperty
-    def searchresults(self):
+    def search_results(self):
         search_string = self.search_string.lower()
         limit = self.max_results_to_display
         return getUtility(IPillarNameSet).search(search_string, limit)
 
=== modified file 'lib/lp/registry/browser/project.py'
--- lib/lp/registry/browser/project.py	2009-08-20 15:23:34 +0000
+++ lib/lp/registry/browser/project.py	2009-08-21 15:14:09 +0000
@@ -6,6 +6,7 @@
 __metaclass__ = type
 
 __all__ = [
+    'ProjectActionMenu',
     'ProjectAddProductView',
     'ProjectAddQuestionView',
     'ProjectAddView',
@@ -18,14 +19,14 @@
     'ProjectFacets',
     'ProjectMaintainerReassignmentView',
     'ProjectNavigation',
+    'ProjectOverviewMenu',
     'ProjectRdfView',
     'ProjectReviewView',
-    'ProjectActionMenu',
-    'ProjectOverviewMenu',
     'ProjectSeriesSpecificationsMenu',
     'ProjectSetBreadcrumbBuilder',
     'ProjectSetContextMenu',
     'ProjectSetNavigation',
+    'ProjectSetNavigationMenu',
     'ProjectSetView',
     'ProjectSpecificationsMenu',
     'ProjectView',
@@ -49,6 +50,8 @@
 from lp.registry.interfaces.project import (
     IProject, IProjectSeries, IProjectSet)
 from lp.registry.browser.announcement import HasAnnouncementsView
+from lp.registry.browser.menu import (
+    IRegistryCollectionNavigationMenu, RegistryCollectionActionMenuBase)
 from lp.registry.browser.product import (
     ProductAddView, ProjectAddStepOne, ProjectAddStepTwo)
 from canonical.launchpad.browser.branding import BrandingChangeView
@@ -229,10 +232,6 @@
         text = 'See all milestones'
         return Link('+milestones', text)
 
-    def milestones(self):
-        text = 'See all milestones'
-        return Link('+milestones', text)
-
     def rdf(self):
         text = structured(
             'Download <abbr title="Resource Description Framework">'
@@ -479,10 +478,18 @@
         return ProjectGroupAddStepOne
 
 
+class ProjectSetNavigationMenu(RegistryCollectionActionMenuBase):
+    """Action menu for project group index."""
+    usedfor = IProjectSet
+    links = ['register_team', 'register_project', 'create_account']
+
+
 class ProjectSetView(LaunchpadView):
-
-    header = "Project groups registered in Launchpad"
-    page_title = header
+    """View for project group index page."""
+
+    implements(IRegistryCollectionNavigationMenu)
+
+    page_title = "Project groups registered in Launchpad"
 
     def __init__(self, context, request):
         super(ProjectSetView, self).__init__(context, request)
@@ -492,17 +499,26 @@
         self.malone = self.form.getOne('malone', None)
         self.bazaar = self.form.getOne('bazaar', None)
         self.text = self.form.getOne('text', None)
-        self.searchrequested = False
+        self.search_requested = False
+        self.search_string = None
         if (self.text is not None or
             self.bazaar is not None or
             self.malone is not None or
             self.rosetta is not None or
             self.soyuz is not None):
-            self.searchrequested = True
+            self.search_requested = True
         self.results = None
         self.matches = 0
 
-    def searchresults(self):
+    def initialize(self):
+        """See `LaunchpadView`."""
+        form = self.request.form_ng
+        self.search_string = form.getOne('text')
+        if self.search_string is not None:
+            self.search_requested = True
+
+    @cachedproperty
+    def search_results(self):
         """Use searchtext to find the list of Projects that match
         and then present those as a list. Only do this the first
         time the method is called, otherwise return previous results.
 
=== modified file 'lib/lp/registry/templates/distros-index.pt'
--- lib/lp/registry/templates/distros-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/distros-index.pt	2009-08-20 22:57:10 +0000
@@ -6,35 +6,23 @@
   xml:lang="en"
   lang="en"
   dir="ltr"
-  metal:use-macro="view/macro:page/pillarindex"
+  metal:use-macro="view/macro:page/main_side"
   i18n:domain="launchpad"
 >
   <body>
     <h1 metal:fill-slot="heading">Registered distributions</h1>
 
-<metal:rightportlets fill-slot="portlets_two">
-  <div class="portlet">
-    <h2>About these distributions</h2>
-
-    <div class="portletBody portletContent">
-      <img src="/@@/info" />
-      Launchpad can manage the source packages, builds, archive publishing
-      and historical record-keeping necessary to create a distribution.
-      Some of the distributions described here are fully managed in
-      Launchpad, others are managed elsewhere but Launchpad keeps track of
-      their progress.
-    </div>
-  </div>
-</metal:rightportlets>
-
-<div metal:fill-slot="main">
-
-    <div id="application-summary">
-      Launchpad can keep track of the software packages in a distribution,
-      and provide information about the bugs, translations and code
-      associated with each of them.
-    </div>
-
+    <tal:side metal:fill-slot="side">
+      <tal:menu replace="structure view/@@+global-actions" />
+      <tal:menu replace="structure context/@@+related-pages" />
+    </tal:side>
+
+  <div metal:fill-slot="main">
+    There are currently
+    <strong class="registry-stat"
+            tal:content="view/count">2</strong>
+    distributions registered in Launchpad.
+    <p/>
     <table class="listing">
       <thead>
         <tr>
@@ -67,6 +55,13 @@
       and its information might be out of date.
     </p>
 
+    <div id="application-summary">
+      Launchpad manages the source packages, builds, archive publishing, bugs,
+      translations, code, and historical record-keeping necessary to create a
+      distribution.  Some of the distributions described here are fully
+      managed in Launchpad, others are managed elsewhere with Launchpad
+      keeping track of their progress.
+    </div>
   </div>
 
 </body>
 
=== modified file 'lib/lp/registry/templates/products-index.pt'
--- lib/lp/registry/templates/products-index.pt	2009-08-20 16:13:15 +0000
+++ lib/lp/registry/templates/products-index.pt	2009-08-20 21:13:30 +0000
@@ -43,17 +43,17 @@
           tal:attributes="action request/URL"
           accept-charset="UTF-8">
       <input size="30" name="text" tal:attributes="value view/search_string" />
-      <input tal:condition="view/searchrequested"
+      <input tal:condition="view/search_requested"
         type="submit"
         value="Search again"
         />
-      <input tal:condition="not: view/searchrequested"
+      <input tal:condition="not: view/search_requested"
         type="submit"
         value="Search projects"
         />
     </form>
 
-  <tal:searching condition="view/searchrequested">
+  <tal:searching condition="view/search_requested">
 
     <p id="empty-search-string" tal:condition="not: view/search_string">
       Enter one or more words related to the project you want to find.
@@ -69,22 +69,22 @@
         do another search with more relevant search terms.
       </p>
 
-      <p tal:condition="view/searchresults">
-        <span tal:replace="view/matches">3</span>
-        <span tal:condition="python: view.matches == 1">project found</span>
-        <span tal:condition="python: view.matches != 1">projects found</span>
-        matching &#8220;<tal:string replace="view/search_string" />&#8221;
-        <span tal:condition="view/tooManyResultsFound">,
-          showing the most relevant
-          <span tal:replace="view/max_results_to_display" />
-        </span>
-      </p>
+      <tal:searching tal:condition="view/search_results">
+        <p class="search-results">
+          <span tal:replace="view/matches">3</span>
+          <span tal:condition="python: view.matches == 1">project found</span>
+          <span tal:condition="python: view.matches != 1">projects found</span>
+          matching &#8220;<tal:string replace="view/search_string" />&#8221;
+          <span tal:condition="view/tooManyResultsFound">,
+            showing the most relevant
+            <span tal:replace="view/max_results_to_display" />
+          </span>
+         </p>
+      </tal:searching>
 
-      <table
-        tal:condition="view/matches"
-        tal:define="results view/searchresults"
-        id="search-results"
-        >
+      <table tal:condition="view/matches"
+             tal:define="results view/search_results"
+             class="search-results">
         <tbody>
           <tr tal:repeat="pillarname results"
               tal:replace="structure pillarname/@@+listing-simple">
@@ -94,42 +94,32 @@
 
       <div id="application-summary">
         <p class="error"
-           tal:condition="not: view/searchresults">
+           tal:condition="not: view/search_results">
           No projects matching
           &#8220;<span tal:replace="view/search_string">moz</span>&#8221;
           were found.
         </p>
 
-        <h2>Haven&#8217;t found your project?</h2>
-
         <p>
-          If the project you are looking for isn't here, go ahead and register
-          it yourself!
+          If the project you are looking for isn't here, go ahead and
+          <a href=""
+             tal:attributes="href view/menu:overview/register_project/url"
+             >register it yourself!</a>
         </p>
 
-        <ul class="rollover buttons">
-          <li>
-            <a href="/projects/+new">
-              <img
-                alt="Register a project"
-                src="/+icing/but-lrg-registerproj.gif"
-              />
-            </a>
-          </li>
-        </ul>
       </div>
     </tal:non-empty-search-string>
 
   </tal:searching>
-  <tal:no_search condition="not: view/searchrequested">
+  <tal:no_search condition="not: view/search_requested">
 
-    <p id="application-summary">
+    <p class="application-summary">
       Launchpad helps people to work together by making it easy to share
       code, bug reports, translations, and ideas. To get started, search here
       for a project you want to know more about.
     </p>
 
-    <p>
+    <p class="application-summary">
       If you find a project you run, <a href="/launchpad/+addquestion">ask
       us</a> and we'll hand the project over to you.
       <br />To set that project up for translation to your language, <a
 
=== modified file 'lib/lp/registry/templates/projects-index.pt'
--- lib/lp/registry/templates/projects-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/projects-index.pt	2009-08-20 21:13:30 +0000
@@ -6,96 +6,81 @@
   xml:lang="en"
   lang="en"
   dir="ltr"
-  metal:use-macro="view/macro:page/pillarindex"
+  metal:use-macro="view/macro:page/main_side"
   i18n:domain="launchpad"
 >
   <body>
-    <h1 metal:fill-slot="heading">Project groups in Launchpad</h1>
-
-<metal:rightportlets fill-slot="portlets_two">
-  <div class="portlet">
-    <h2>About Projects in Launchpad:</h2>
-    <div class="portletBody portletContent">
-      <img src="/@@/info" />
-      There are currently
-      <a href="+all"><span tal:replace="context/count_all">5</span>
-      projects</a> registered.
-      <br />
-      <br />
-      Only the Launchpad administrators and registry experts can register new
-      project groups. You can register an individual application (what we call
-      a project). To do so, first <a href="/projects/">search to see if your
-      project is already in Launchpad</a>.
+    <h1 metal:fill-slot="heading">Project groups</h1>
+
+    <tal:side metal:fill-slot="side">
+      <tal:menu replace="structure view/@@+global-actions" />
+      <tal:menu replace="structure context/@@+related-pages" />
+    </tal:side>
+
+    <div metal:fill-slot="main">
+      <p>There are
+      <strong class="registry-stat"
+              tal:content="context/count_all">5</strong>
+      project groups registered in Launchpad.
+      </p>
+
+      <form class="central" method="get" accept-charset="UTF-8">
+      <input size="30" name="text" tal:attributes="value view/search_string" />
+        <input
+          tal:condition="view/search_requested"
+          type="submit" value="Search Again" />
+        <input
+          tal:condition="not: view/search_requested"
+          type="submit" value="Search project groups" />
+      </form>
+
+      <div tal:condition="view/search_requested">
+          <tal:searching tal:condition="view/search_results">
+            <p class="search-results">
+              <span tal:replace="view/matches">3</span>
+              <span tal:condition="python: view.matches == 1">project
+                  group found</span>
+              <span tal:condition="python: view.matches != 1">projects
+                  groups found</span>
+              matching
+              &#8220;<tal:string replace="view/search_string" />&#8221;
+            </p>
+          </tal:searching>
+
+          <table tal:condition="view/matches"
+                 tal:define="results view/search_results"
+                 class="search-results">
+            <tbody>
+              <tr tal:repeat="product results">
+                <td tal:content="structure product/@@+listing-detailed" />
+              </tr>
+            </tbody>
+         </table>
+
+          <p class="error application-summary"
+             tal:condition="not: view/search_results">
+             No project groups matching
+             &#8220;<span tal:replace="view/search_string">moz</span>&#8221;
+             were found.
+          </p>
+      </div>
+      <p class="application-summary">
+          In Launchpad, <dfn>project groups</dfn> are special groups of
+          software projects that share a development community.  Examples
+          include <a href="gnome">Gnome</a>,
+          <a href="kde"><abbr>KDE</abbr></a>, and
+          <a href="mozilla">Mozilla</a>.  Launchpad allows you to group
+          several projects together into a project group, to make coordination
+          and tracking simpler.
+      </p>
+
+      <p class="application-summary">
+          Only the Launchpad administrators and registry experts can register
+          new project groups. You can register an individual application (what
+          we call a project). To do so, first <a href="/projects/">search to
+          see if your project is already in Launchpad</a>.
+      </p>
+
     </div>
-  </div>
-</metal:rightportlets>
-
-<div metal:fill-slot="main">
-
-  <p>
-      In Launchpad, <dfn>project groups</dfn> are special groups of software
-      projects that share a development community.
-      Examples include <a href="gnome">Gnome</a>,
-      <a href="kde"><abbr>KDE</abbr></a>, and
-      <a href="mozilla">Mozilla</a>.  Launchpad allows you to group several
-      projects together in a project, to make coordination and tracking
-      simpler.
-  </p>
-
-  <form method="get" accept-charset="UTF-8">
-    <label for="text">Search projects:</label>
-    <input name="text" tal:attributes="value view/text" />
-    <input
-      tal:condition="view/searchrequested"
-      type="submit" value="Search Again" />
-    <input
-      tal:condition="not: view/searchrequested"
-      type="submit" value="Search" />
-  </form>
-
-  <tal:notsearching condition="not:view/searchrequested">
-    <p>
-      For individual computer programs, applications or libraries,
-      see <a href="/projects">projects</a>.
-    </p>
-
-    <p>
-      For groups of people, see
-      <a href="/people">Launchpad teams</a>.
-    </p>
-  </tal:notsearching>
-
-  <tal:searching condition="view/searchrequested">
-
-      <table class="data" tal:define="results view/searchresults">
-        <thead>
-          <tr class="results">
-            <th colspan="0">
-              <span tal:replace="view/matches">3</span>
-              <span tal:condition="python: view.matches == 1">result</span>
-              <span tal:condition="python: view.matches != 1">results</span>
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr tal:condition="view/matches"
-              tal:repeat="product results">
-            <td tal:content="structure product/@@+listing-detailed" />
-          </tr>
-          <tr tal:condition="not: view/matches">
-            <td tal:condition="not: view/matches">
-              <p>No projects matching
-              &#8220;<span tal:replace="view/text">moz</span>&#8221;
-              were found.
-              You can <a href="+new">register a new project</a>.</p>
-           </td>
-          </tr>
-        </tbody>
-      </table>
-
-  </tal:searching>
-
-</div>
-
-</body>
+  </body>
 </html>