Merge lp:~salgado/launchpad/three-o into lp:launchpad

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

= Summary =

Convert the project group home page to 3.0 layout

== Proposed fix ==

Replicate what was done for the project page.

This branch includes lp:~sinzui/launchpad/project-layout-bug-405916

== Tests ==

I did not run any tests yet.

== Demo and Q/A ==

https://launchpad.dev/mozilla
https://launchpad.dev/apache
https://launchpad.dev/gnome

= 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/translations/browser/project.py
  lib/lp/code/templates/project-branches.pt
  lib/lp/registry/templates/project-edit.pt
  lib/lp/registry/templates/project-details.pt
  lib/lp/registry/templates/project-index.pt
  lib/lp/registry/browser/project.py

== Template notices ==

There are obsolete slots in these templates.

lib/lp/code/templates/project-branches.pt
    <metal:block fill-slot="help">

[Martin Albisetti (beuno)]

Hi Salgado,

This branch looks like the future, thank you for working on it. It looks great.

I have a few small nitpicks:

- As mentioned on IRC, the "Project group information" section is huge
- In "Top contributors", the "more contributors" should be on the top right of that section, as per the 3.0 design
- Same for questions
- The "Register another project that is part of the Mozilla Project" link looks out of place. We should try and shorten it to maybe: (drop the >>) "(+) Register another project in Mozilla Project", and maybe float the link to the right

That's all I have. This is going to be a great landing.

review: Needs Fixing (ui)

[Guilherme Salgado (salgado)]

On Tue, 2009-08-11 at 18:15 +0000, Martin Albisetti wrote:
> Review: Needs Fixing ui
> Hi Salgado,
>
> This branch looks like the future, thank you for working on it. It looks great.
>
> I have a few small nitpicks:
>
> - As mentioned on IRC, the "Project group information" section is huge

Yeah, that'll be fixed.

> - In "Top contributors", the "more contributors" should be on the top
> right of that section, as per the 3.0 design
> - Same for questions

But this would make it inconsistent with what we have in the new project
page, no? Maybe we should change it in both?

> - The "Register another project that is part of the Mozilla Project"
> link looks out of place. We should try and shorten it to maybe: (drop
> the >>) "(+) Register another project in Mozilla Project", and maybe
> float the link to the right

I'll fix this too.
>
> That's all I have. This is going to be a great landing.

Thanks!

--
Guilherme Salgado <email address hidden>

[Martin Albisetti (beuno)]

> On Tue, 2009-08-11 at 18:15 +0000, Martin Albisetti wrote:
> > - In "Top contributors", the "more contributors" should be on the top
> > right of that section, as per the 3.0 design
> > - Same for questions
>
> But this would make it inconsistent with what we have in the new project
> page, no? Maybe we should change it in both?

Yes, it should be that way in both.

[Curtis Hovey (sinzui)]

On Tue, 2009-08-11 at 18:15 +0000, Martin Albisetti wrote:
> Review: Needs Fixing ui
> Hi Salgado,
>
> This branch looks like the future, thank you for working on it. It
> looks great.
>
> I have a few small nitpicks:
>
> - As mentioned on IRC, the "Project group information" section is huge

I am preparing an exmaple of how this could be fixed

> - In "Top contributors", the "more contributors" should be on the top
> right of that section, as per the 3.0 design

These are fixed in the tree or are landing. PQM is stuck. When the
project page lands (maybe in a few hours) all the code will be
available.

> - Same for questions

Same as above

> - The "Register another project that is part of the Mozilla Project"
> link looks out of place. We should try and shorten it to maybe: (drop
> the >>) "(+) Register another project in Mozilla Project", and maybe
> float the link to the right

All links need icon and we render with fmt:link

--
__Curtis C. Hovey_________
http://launchpad.net/

[Curtis Hovey (sinzui)]

On Tue, 2009-08-11 at 19:12 +0000, Martin Albisetti wrote:
> > On Tue, 2009-08-11 at 18:15 +0000, Martin Albisetti wrote:
> > > - In "Top contributors", the "more contributors" should be on the top
> > > right of that section, as per the 3.0 design
> > > - Same for questions
> >
> > But this would make it inconsistent with what we have in the new project
> > page, no? Maybe we should change it in both?

> Yes, it should be that way in both.

They cannot be until all pillars are converted. They design breaks other
pages that share the portlets. I am doing distributions. I will have a
design for you on Wednesday.

--
__Curtis C. Hovey_________
http://launchpad.net/

[Curtis Hovey (sinzui)]

Hi Guilherme.

This is a very promising start. I have several suggestions to improve
this branch based on code that final revision of the project page. I
stole some code to express my ideas. I am certain none of it works.

> === modified file 'lib/lp/code/templates/project-branches.pt'
> --- lib/lp/code/templates/project-branches.pt 2009-07-17 17:59:07 +0000
> +++ lib/lp/code/templates/project-branches.pt 2009-08-10 19:04:22 +0000
> @@ -6,24 +6,22 @@
> xml:lang="en"
> lang="en"
> dir="ltr"
> - metal:use-macro="context/@@main_template/master"
> + metal:use-macro="view/macro:page/onecolumn"

onecolumn is 2.0. use the replacement macro
  metal:use-macro="view/macro:page/main_only"

...

> +<div metal:fill-slot="main" tal:define="branches view/branches">
> +
> + <div style="float:right" id="floating-links"
> + tal:define="menu context/menu:overview">
> + <div tal:define="link menu/branch_visibility"
> + tal:condition="link/enabled"
> + tal:content="structure link/render" />
> + </div>

This is 2.0 style. We do not want to float admin links the to side. They
may be in the content or in the side portlet as an action menu. Since this
page does not have side portlet, I think we can work this into the content
above the branch listing...

> <h1>Bazaar branches for <tal:project-name replace="context/displayname"/></h1>

...Something like this before the listing.

  <p>
    Branches are <tal:visibility replace="magic command to get value" />
    by default.
    <a tal:replace="structure context/menu:overview/branch_visibility/fmt:link" />
  </p>

...

> <tal:branchlisting content="structure branches/@@+branch-listing" />

...

> === modified file 'lib/lp/registry/browser/project.py'
> --- lib/lp/registry/browser/project.py 2009-08-05 01:49:41 +0000
> +++ lib/lp/registry/browser/project.py 2009-08-10 19:53:47 +0000

...

@@ -220,19 +215,39 @@

...

> +class ProjectActionMenu(NavigationMenu):
> +
> + usedfor = IProjectActionMenu
> + facet = 'overview'
> + title = 'Action menu'
> + links = ('subscribe', 'edit', 'administer')
> +
> + # XXX: salgado, 2009-08-10: This should be shown in the +index page of the
> + # project's bugs facet, but that would require too much work and I just
> + # want to convert this page to 3.0, so I'll leave it here for now.
> def subscribe(self):
> text = 'Subscribe to bug mail'
> return Link('+subscribe', text, icon='edit')

Do we need a bug number for this XXX. I am tempted to say we want to do to
define two clean up tasks for links and menus:

    1. Define all links in mixins so that we are certain there is a single
       definition. Menus *must* use the mixin instead of define their own
       links.
    2. Make menu mixins for interfaces such as IPillar and
       IHasStructuralSubscriptions so that we share common links.

...

> === modified file 'lib/lp/registry/templates/project-details.pt'
> --- lib/lp/registry/templates/project-details.pt 2009-07-17 17:59:07 +0000
> +++ lib/lp/registry/templates/project-details.pt 2009-08-10 19:04:22 +0000

...

> +<div id="portlet-details">
> + <table class="summary" tal:define="overview_menu...

review: Needs Fixing (code)

[Guilherme Salgado (salgado)]

On Tue, 2009-08-11 at 20:37 +0000, Curtis Hovey wrote:
> Review: Needs Fixing code
> Hi Guilherme.
>
> This is a very promising start. I have several suggestions to improve
> this branch based on code that final revision of the project page. I
> stole some code to express my ideas. I am certain none of it works.
>
>
> > === modified file 'lib/lp/code/templates/project-branches.pt'
> > --- lib/lp/code/templates/project-branches.pt 2009-07-17 17:59:07 +0000
> > +++ lib/lp/code/templates/project-branches.pt 2009-08-10 19:04:22 +0000
> > @@ -6,24 +6,22 @@
> > xml:lang="en"
> > lang="en"
> > dir="ltr"
> > - metal:use-macro="context/@@main_template/master"
> > + metal:use-macro="view/macro:page/onecolumn"
>
> onecolumn is 2.0. use the replacement macro
> metal:use-macro="view/macro:page/main_only"

Right, this is because I didn't mean to upgrade this to 3.0 -- I just
wanted to make it look like product-branches.pt so that I could float
the 'subscribe to branches' link to the top right. For projects, this
link is currently shown in the action menu of the +index page and I had
to move it somewhere else.

>
> ...
>
> > +<div metal:fill-slot="main" tal:define="branches view/branches">
> > +
> > + <div style="float:right" id="floating-links"
> > + tal:define="menu context/menu:overview">
> > + <div tal:define="link menu/branch_visibility"
> > + tal:condition="link/enabled"
> > + tal:content="structure link/render" />
> > + </div>
>
> This is 2.0 style. We do not want to float admin links the to side. They
> may be in the content or in the side portlet as an action menu. Since this
> page does not have side portlet, I think we can work this into the content
> above the branch listing...
>
> > <h1>Bazaar branches for <tal:project-name replace="context/displayname"/></h1>
>
> ...Something like this before the listing.
>
> <p>
> Branches are <tal:visibility replace="magic command to get value" />
> by default.
> <a tal:replace="structure context/menu:overview/branch_visibility/fmt:link" />
> </p>

I could do that, but I think it's important that product-branches.pt is
updated at the same time, to make sure they're consistent. I'd also have
to get this past UI review, which might delay this branch -- that's the
reason why I didn't try converting it to 3.0

>
> ...
>
> > <tal:branchlisting content="structure branches/@@+branch-listing" />
>
> ...
>
> > === modified file 'lib/lp/registry/browser/project.py'
> > --- lib/lp/registry/browser/project.py 2009-08-05 01:49:41 +0000
> > +++ lib/lp/registry/browser/project.py 2009-08-10 19:53:47 +0000
>
> ...
>
> @@ -220,19 +215,39 @@
>
> ...
>
> > +class ProjectActionMenu(NavigationMenu):
> > +
> > + usedfor = IProjectActionMenu
> > + facet = 'overview'
> > + title = 'Action menu'
> > + links = ('subscribe', 'edit', 'administer')
> > +
> > + # XXX: salgado, 2009-08-10: This should be shown in the +index page of the
> > + # project's bugs facet, but that would require too much work and I just
> > + # want to convert this page to 3.0, so I'll leave it here for now.
> > def subscribe(self):
> > text = 'S...

[Curtis Hovey (sinzui)]

Hi Salgado.

Thanks for making the revisions. Your series and milestone fix is great.
I have a few suggests before you land this. In general, I think we need
this landed, so we should report bugs for issues we do not want to fix
in this branch.

  review approve

...

> <ul tal:condition="context/homepageurl">
> <li>
> <a rel="nofollow"
> tal:attributes="href context/homepageurl;
> class string:sprite external-link">
> <strong>Visit the <tal:name replace="context/title" />
> home page &raquo;</strong>
> </a>
> </li>
> </ul>

This is not the same presentation as is on the project page.
/me steals from product-index.pt

        <ul id="external-links" class="horizontal"
          tal:condition="view/has_external_links">
          <li tal:condition="view/should_display_homepage">
            <a id="homepageurl-link" class="sprite external-link"
              rel="nofollow"
              tal:attributes="href context/homepageurl">Home page</a>
          </li>
        </ul>

...

> <div class="discreet" style="text-align: right"
> tal:content="structure context/menu:overview/rdf/fmt:link-icon" />

I think this still looks wrong. We can include in in the external links list
above or move it into the project group information portlet.

...

      <div class="yui-u" id="products">
        <div class="portlet">
          <h2>Projects</h2>

This new presentation is great.

> <ul class="horizontal" style="float: right"
> tal:condition="context/menu:overview/new_product/enabled">
> <li>
> <a tal:replace="structure context/menu:overview/new_product/fmt:link" />
> </li>
> </ul>

We should not be floating content anymore. This list should not render
if the link does not render.

            <ul class="horizontal"
              tal:condition="context/menu:overview/new_product/enabled">
              <li>
                <a tal:replace="structure context/menu:overview/new_product/fmt:link" />
              </li>
            </ul>
...

> <div class="yui-g">
> <div class="yui-u first">
> <tal:bugs content="structure context/@@+portlet-latestbugs" />
> <tal:specs content="structure context/@@+portlet-latestspecs" />
> <tal:sprints content="structure context/@@+portlet-coming-sprints" />
> </div>
> <div class="yui-u">
> <tal:questions content="structure context/@@+portlet-latestquestions" />
> <tal:contributors content="structure context/@@+portlet-top-contributors" />
> </div>

I think we may adjust this. The list of project and series and can be very
long. We may want questions moved to the left column,

...

> <div id="involvement" class="portlet involvement"
> tal:condition="context/products">
> <h2>Get Involved</h2>
> <ul>
> <li>
> <a class="bugs"
> tal:attributes="href context/menu:bugs/new/url">Report a Bug</a>
> </li>
> <li>
> <a class="question"
> tal:attributes="hre...

review: Approve

[Guilherme Salgado (salgado)]

On Wed, 2009-08-12 at 15:33 +0000, Curtis Hovey wrote:
> Review: Approve
> Hi Salgado.
>
> Thanks for making the revisions. Your series and milestone fix is great.
> I have a few suggests before you land this. In general, I think we need
> this landed, so we should report bugs for issues we do not want to fix
> in this branch.
>

Cool, thanks!

> review approve
>
> ...
>
> > <ul tal:condition="context/homepageurl">
> > <li>
> > <a rel="nofollow"
> > tal:attributes="href context/homepageurl;
> > class string:sprite external-link">
> > <strong>Visit the <tal:name replace="context/title" />
> > home page &raquo;</strong>
> > </a>
> > </li>
> > </ul>
>
> This is not the same presentation as is on the project page.
> /me steals from product-index.pt
>
> <ul id="external-links" class="horizontal"
> tal:condition="view/has_external_links">
> <li tal:condition="view/should_display_homepage">
> <a id="homepageurl-link" class="sprite external-link"
> rel="nofollow"
> tal:attributes="href context/homepageurl">Home page</a>
> </li>
> </ul>

Fixed

>
>
> ...
>
> > <div class="discreet" style="text-align: right"
> > tal:content="structure context/menu:overview/rdf/fmt:link-icon" />
>
> I think this still looks wrong. We can include in in the external links list
> above or move it into the project group information portlet.

I think I prefer moving it to the -details portlet.

But that doesn't look nice -- see the screenshot attached.

>
> ...
>
> <div class="yui-u" id="products">
> <div class="portlet">
> <h2>Projects</h2>
>
> This new presentation is great.
>
> > <ul class="horizontal" style="float: right"
> > tal:condition="context/menu:overview/new_product/enabled">
> > <li>
> > <a tal:replace="structure context/menu:overview/new_product/fmt:link" />
> > </li>
> > </ul>
>
> We should not be floating content anymore. This list should not render
> if the link does not render.

I removed the float:right from there, but I don't see what you mean by
not rendering the list -- the <ul> is conditional on the link being
enabled, so everything else is too.

>
> <ul class="horizontal"
> tal:condition="context/menu:overview/new_product/enabled">
> <li>
> <a tal:replace="structure context/menu:overview/new_product/fmt:link" />
> </li>
> </ul>
> ...
>
> > <div class="yui-g">
> > <div class="yui-u first">
> > <tal:bugs content="structure context/@@+portlet-latestbugs" />
> > <tal:specs content="structure context/@@+portlet-latestspecs" />
> > <tal:sprints content="structure context/@@+portlet-coming-sprints" />
> > </div>
> > <div class="yui-u">
> > <tal:questions content="structure context/@@+portlet-latestquestions" />
> > <tal:contributors content="structure context/@@+portlet-top-contribu...

[Curtis Hovey (sinzui)]

On Wed, 2009-08-12 at 18:00 +0000, Guilherme Salgado wrote:
> On Wed, 2009-08-12 at 15:33 +0000, Curtis Hovey wrote:
...

> > > <div class="discreet" style="text-align: right"
> > > tal:content="structure context/menu:overview/rdf/fmt:link-icon" />
> >
> > I think this still looks wrong. We can include in in the external links list
> > above or move it into the project group information portlet.
>
> I think I prefer moving it to the -details portlet.
>
> But that doesn't look nice -- see the screenshot attached.

I did not get the image, but this is what I think we can do to land. The
registrant paragraph and link list must follow the DL DIV to ensure the
floating is cleared:

    </dl>
  </div>

  <p id="registrant">
    Registered
    <tal:created replace="context/datecreated/fmt:approximatedate" />
    by <tal:registrant replace="structure context/registrant/fmt:link" />
  </p>

  <ul class="horizontal">
    <li>
      <a tal:replace="structure context/menu:overview/rdf/fmt:link" />
    <li>
  </ul>
</div>

You need to change icon of the rdf to match the sprite:

        return Link('+rdf', text, icon='download-icon')

or maybe duplicate the rule in style.css

    .download-icon {background:url(icon-sprites) 0 -160px no-repeat;}
    .download {background:url(icon-sprites) 0 -160px no-repeat;}

to make the natural implementation work

> > > <ul class="horizontal" style="float: right"
> > > tal:condition="context/menu:overview/new_product/enabled">
> > > <li>
> > > <a tal:replace="structure context/menu:overview/new_product/fmt:link" />
> > > </li>
> > > </ul>
> >
> > We should not be floating content anymore. This list should not render
> > if the link does not render.
>
> I removed the float:right from there, but I don't see what you mean by
> not rendering the list -- the <ul> is conditional on the link being
> enabled, so everything else is too.

You are correct. I was wrong.

> > > <div class="yui-g">
> > > <div class="yui-u first">
> > > <tal:bugs content="structure context/@@+portlet-latestbugs" />
> > > <tal:specs content="structure context/@@+portlet-latestspecs" />
> > > <tal:sprints content="structure context/@@+portlet-coming-sprints" />
> > > </div>
> > > <div class="yui-u">
> > > <tal:questions content="structure context/@@+portlet-latestquestions" />
> > > <tal:contributors content="structure context/@@+portlet-top-contributors" />
> > > </div>
> >
> > I think we may adjust this. The list of project and series and can be very
> > long. We may want questions moved to the left column,
>
> Shall I file a bug about this, wait for us to see what it will look like
> against real data or JF move questions to the left?

I think we should wait. I only suspect a problem and I cannot recommend
an solution without seeing product data.

=== modified file 'lib/lp/code/templates/project-branches.pt'
--- lib/lp/code/templates/project-branches.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/code/templates/project-branches.pt	2009-08-10 19:04:22 +0000
@@ -6,24 +6,22 @@
   xml:lang="en"
   lang="en"
   dir="ltr"
-  metal:use-macro="context/@@main_template/master"
+  metal:use-macro="view/macro:page/onecolumn"
   i18n:domain="launchpad"
 >
 
 <body>
 
-<metal:leftportlets fill-slot="portlets_one">
-</metal:leftportlets>
-
-<metal:rightportlets fill-slot="portlets_two">
-</metal:rightportlets>
-
-<metal:heading fill-slot="pageheading">
+<div metal:fill-slot="main" tal:define="branches view/branches">
+
+  <div style="float:right" id="floating-links"
+       tal:define="menu context/menu:overview">
+    <div tal:define="link menu/branch_visibility"
+         tal:condition="link/enabled"
+         tal:content="structure link/render" />
+  </div>
+
   <h1>Bazaar branches for <tal:project-name replace="context/displayname"/></h1>
-</metal:heading>
-
-<div metal:fill-slot="main"
-     tal:define="branches view/branches">
 
   <tal:branchlisting content="structure branches/@@+branch-listing" />
 

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-08-06 19:14:40 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-08-10 19:53:47 +0000
@@ -480,8 +480,10 @@
     <browser:menus
         classes="
             ProjectFacets
+            ProjectActionMenu
             ProjectOverviewMenu
             ProjectBountiesMenu
+            ProjectBugsMenu
             ProjectSeriesSpecificationsMenu
             ProjectSpecificationsMenu
             ProjectSetContextMenu

=== modified file 'lib/lp/registry/browser/project.py'
--- lib/lp/registry/browser/project.py	2009-08-05 01:49:41 +0000
+++ lib/lp/registry/browser/project.py	2009-08-10 19:53:47 +0000
@@ -13,12 +13,14 @@
     'ProjectBountiesMenu',
     'ProjectBrandingView',
     'ProjectBreadcrumbBuilder',
+    'ProjectBugsMenu',
     'ProjectEditView',
     'ProjectFacets',
     'ProjectMaintainerReassignmentView',
     'ProjectNavigation',
     'ProjectRdfView',
     'ProjectReviewView',
+    'ProjectActionMenu',
     'ProjectOverviewMenu',
     'ProjectSeriesSpecificationsMenu',
     'ProjectSetBreadcrumbBuilder',
@@ -34,6 +36,7 @@
 from zope.component import getUtility
 from zope.event import notify
 from zope.formlib import form
+from zope.interface import implements, Interface
 from zope.schema import Choice
 
 from z3c.ptcompat import ViewPageTemplateFile
@@ -41,6 +44,7 @@
 from canonical.cachedproperty import cachedproperty
 from canonical.launchpad import _
 from canonical.launchpad.webapp.interfaces import NotFoundError
+from canonical.launchpad.webapp.menu import NavigationMenu
 from lp.registry.interfaces.product import IProductSet
 from lp.registry.interfaces.project import (
     IProject, IProjectSeries, IProjectSet)
@@ -137,25 +141,21 @@
     def bugs(self):
         site = 'bugs'
         text = 'Bugs'
-
         return Link('', text, enabled=self.context.hasProducts(), site=site)
 
     def answers(self):
         site = 'answers'
         text = 'Answers'
-
         return Link('', text, enabled=self.context.hasProducts(), site=site)
 
     def specifications(self):
         site = 'blueprints'
         text = 'Blueprints'
-
         return Link('', text, enabled=self.context.hasProducts(), site=site)
 
     def translations(self):
         site = 'translations'
         text = 'Translations'
-
         return Link('', text, enabled=self.context.hasProducts(), site=site)
 
 
@@ -164,14 +164,8 @@
     usedfor = IProject
     facet = 'overview'
     links = [
-        'edit', 'branding', 'driver', 'reassign', 'top_contributors',
-        'mentorship', 'announce', 'announcements', 'administer',
-        'branch_visibility', 'rdf', 'subscribe']
-
-    @enabled_with_permission('launchpad.Edit')
-    def edit(self):
-        text = 'Change details'
-        return Link('+edit', text, icon='edit')
+        'branding', 'driver', 'reassign', 'top_contributors', 'mentorship',
+        'announce', 'announcements', 'branch_visibility', 'rdf']
 
     @enabled_with_permission('launchpad.Edit')
     def branding(self):
@@ -181,12 +175,13 @@
     @enabled_with_permission('launchpad.Edit')
     def reassign(self):
         text = 'Change maintainer'
-        return Link('+reassign', text, icon='edit')
+        summary = 'Change the maintainer of this project group'
+        return Link('+reassign', text, summary, icon='edit')
 
     @enabled_with_permission('launchpad.Edit')
     def driver(self):
         text = 'Appoint driver'
-        summary = 'Someone with permission to set goals for all projects'
+        summary = 'Appoint the driver of this project group'
         return Link('+driver', text, summary, icon='edit')
 
     def top_contributors(self):
@@ -220,19 +215,39 @@
         return Link('+rdf', text, icon='download')
 
     @enabled_with_permission('launchpad.Admin')
-    def administer(self):
-        text = 'Administer'
-        return Link('+review', text, icon='edit')
-
-    @enabled_with_permission('launchpad.Admin')
     def branch_visibility(self):
         text = 'Define branch visibility'
         return Link('+branchvisibility', text, icon='edit', site='mainsite')
 
+
+class IProjectActionMenu(Interface):
+    """Marker interface for views that use ProjectActionMenu."""
+
+
+class ProjectActionMenu(NavigationMenu):
+
+    usedfor = IProjectActionMenu
+    facet = 'overview'
+    title = 'Action menu'
+    links = ('subscribe', 'edit', 'administer')
+
+    # XXX: salgado, 2009-08-10: This should be shown in the +index page of the
+    # project's bugs facet, but that would require too much work and I just
+    # want to convert this page to 3.0, so I'll leave it here for now.
     def subscribe(self):
         text = 'Subscribe to bug mail'
         return Link('+subscribe', text, icon='edit')
 
+    @enabled_with_permission('launchpad.Edit')
+    def edit(self):
+        text = 'Change details'
+        return Link('+edit', text, icon='edit')
+
+    @enabled_with_permission('launchpad.Admin')
+    def administer(self):
+        text = 'Administer'
+        return Link('+review', text, icon='edit')
+
 
 class ProjectBountiesMenu(ApplicationMenu):
 
@@ -286,8 +301,19 @@
         return Link('+addquestion', text, icon='add')
 
 
+class ProjectBugsMenu(ApplicationMenu):
+
+    usedfor = IProject
+    facet = 'bugs'
+    links = ['new']
+
+    def new(self):
+        text = 'Report a Bug'
+        return Link('+filebug', text, icon='add')
+
+
 class ProjectView(HasAnnouncementsView, FeedsMixin):
-    pass
+    implements(IProjectActionMenu)
 
 
 class ProjectEditView(LaunchpadEditFormView):

=== modified file 'lib/lp/registry/templates/project-details.pt'
--- lib/lp/registry/templates/project-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/project-details.pt	2009-08-10 19:04:22 +0000
@@ -4,53 +4,53 @@
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   omit-tag="">
 
-<div class="portlet" id="portlet-details">
-  <div class="portletBody portletContent">
-    <table class="summary">
-      <tbody>
-        <tr tal:condition="context/required:launchpad.Admin">
-          <th>Project group status:</th>
-          <td>
-            <tal:block condition="context/active">Active</tal:block>
-            <tal:block condition="not: context/active">Disabled</tal:block>
-            <tal:block condition="context/reviewed"><br />Reviewed</tal:block>
-            <tal:block condition="context/icon"><br />Branded
-              <tal:icon replace="structure context/image:icon" />
-            </tal:block>
-          </td>
-        </tr>
-        <tr>
-          <th>Maintainer:</th>
-          <td>
-            <a
-              tal:content="context/owner/displayname"
-              tal:attributes="href context/owner/fmt:url"
-            >ownername</a>
-          </td>
-        </tr>
-        <tr>
-          <th>Driver:</th>
-          <td tal:condition="not:context/driver">Not yet appointed</td>
-          <td tal:condition="context/driver">
-            <a
-              tal:content="context/driver/displayname"
-              tal:attributes="href context/driver/fmt:url"
-            >Carlos Perello</a>
-          </td>
-        </tr>
-        <tr>
-          <th>Bug tracker:</th>
-          <td>
-            <a
-              tal:condition="context/bugtracker"
-              tal:content="context/bugtracker/title"
-              tal:attributes="href context/bugtracker/fmt:url"
-            >tracker title</a>
-            <tal:none condition="not:context/bugtracker">None specified</tal:none>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
+<div id="portlet-details">
+  <table class="summary" tal:define="overview_menu context/menu:overview">
+    <tbody>
+      <tr tal:condition="context/required:launchpad.Admin">
+        <th>Status:</th>
+        <td>
+          <tal:block condition="context/active">Active</tal:block>
+          <tal:block condition="not: context/active">Disabled</tal:block>
+          <tal:block condition="context/reviewed"><br />Reviewed</tal:block>
+          <tal:block condition="context/icon"><br />Branded
+            <tal:icon replace="structure context/image:icon" />
+          </tal:block>
+        </td>
+      </tr>
+      <tr>
+        <th>Maintainer:</th>
+        <td>
+          <a tal:replace="structure context/owner/fmt:link" />
+          <tal:edit-maintainer
+            content="structure overview_menu/reassign/fmt:icon" />
+        </td>
+      </tr>
+      <tr>
+        <th>Driver:</th>
+        <td>
+          <tal:no-driver condition="not:context/driver">
+            Not yet appointed
+          </tal:no-driver>
+          <tal:has-driver condition="context/driver">
+            <a tal:replace="structure context/driver/fmt:link">Driver</a>
+          </tal:has-driver>
+          <tal:edit-maintainer
+            content="structure overview_menu/driver/fmt:icon" />
+        </td>
+      </tr>
+      <tr>
+        <th>Bug tracker:</th>
+        <td>
+          <a
+            tal:condition="context/bugtracker"
+            tal:content="context/bugtracker/title"
+            tal:attributes="href context/bugtracker/fmt:url"
+          >tracker title</a>
+          <tal:none condition="not:context/bugtracker">None specified</tal:none>
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </div>
 </tal:root>

=== modified file 'lib/lp/registry/templates/project-edit.pt'
--- lib/lp/registry/templates/project-edit.pt	2009-07-18 00:05:49 +0000
+++ lib/lp/registry/templates/project-edit.pt	2009-08-05 19:26:37 +0000
@@ -3,20 +3,14 @@
   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:heading fill-slot="heading">    
-      <h1>Change project group details</h1>
-    </metal:heading>
-
     <div metal:fill-slot="main">
 
-      <div metal:use-macro="context/@@launchpad_form/form">
+      <div class="top-portlet"
+           metal:use-macro="context/@@launchpad_form/form">
 
           <p metal:fill-slot="extra_info">
             Avoid changing the Name,
@@ -28,6 +22,7 @@
 
       </div>
 
+      <tal:menu replace="structure view/@@+related-pages" />
     </div>
 
   </body>

=== modified file 'lib/lp/registry/templates/project-index.pt'
--- lib/lp/registry/templates/project-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/project-index.pt	2009-08-11 14:26:36 +0000
@@ -3,41 +3,32 @@
   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="view/macro:page/default"
+  metal:use-macro="view/macro:page/main_side"
   i18n:domain="launchpad"
 >
   <body>
 
-    <metal:portlets fill-slot="portlets">
-      <tal:portlet tal:replace="structure context/@@+portlet-lifecycle" />
-      <tal:portlet tal:replace="structure context/@@+portlet-milestones" />
-    </metal:portlets>
-
-    <div metal:fill-slot="main">
-
-    <p id="project-inactive" tal:condition="not: context/active" class="warning message"> 
-      This project is currently inactive <a href="+review">(change this)</a>
-    </p>
-
-    <tal:block condition="view/required:launchpad.Edit">
-      <p tal:condition="not: context/products" class="warning message"> 
-        There are no projects registered for
-        <span tal:replace="context/displayname">project displayname</span>.
-        <br />
-        You need to <a href="+newproduct">register another project that is
-        part of <tal:project replace="context/displayname" /></a> or associate
-        an existing project with it.
+    <tal:heading metal:fill-slot="heading">
+      <h1 tal:content="context/title">Mozilla</h1>
+    </tal:heading>
+
+    <tal:main metal:fill-slot="main">
+
+    <div class="top-portlet">
+      <p id="project-inactive" tal:condition="not: context/active" class="warning message"> 
+        This project is currently inactive <a href="+review">(change this)</a>
       </p>
-    </tal:block>
 
-      <div
-        style="width: 200px; height: 200px; float: right;"
-        tal:content="structure context/image:mugshot"
-      />
-      <h1 tal:content="context/title">Mozilla</h1>
+      <tal:block condition="view/required:launchpad.Edit">
+        <p tal:condition="not: context/products" class="warning message"> 
+          There are no projects registered for
+          <span tal:replace="context/displayname">project displayname</span>.
+          <br />
+          You need to <a href="+newproduct">register another project that is
+          part of <tal:project replace="context/displayname" /></a> or associate
+          an existing project with it.
+        </p>
+      </tal:block>
 
       <div class="description" tal:content="context/summary">
         This is the project group Summary, which should be a single paragraph
@@ -68,82 +59,94 @@
           </a>
         </li>
       </ul>
-      <ul class="buttons" tal:condition="context/products">
-        <li>
-          <a href="+filebug">
-            <img alt="Report a bug" src="/+icing/but-sml-reportabug.gif" />
-          </a>
-        </li>
-        <li tal:content="structure context/@@+ask-a-question-button" />
-        <li tal:content="structure context/@@+help-translate-button" />
-        <li tal:define="has_mentoring context/mentoring_offers/count">
-          <a href="+mentoring" tal:condition="has_mentoring">
-            <img alt="Mentoring available"
-                 src="/+icing/but-sml-mentoring.gif"/>
-          </a>
-          <a href="+mentoring" tal:condition="not: has_mentoring">
-            <img alt="No mentoring available"
-                 src="/+icing/but-sml-mentoring-off.gif" />
-          </a>
-        </li>
-      </ul>
-      <div class="left">
-        <div
-          class="section"
-          tal:content="structure context/@@+portlet-coming-sprints"
-        />
-        <div
-          class="section"
-          tal:content="structure context/@@+portlet-latestannouncements"
-        />
-        <div class="portlet" id="products">
-          <h2>Projects</h2>
-          <p tal:condition="not: context/products"> 
-            There are no projects registered for
-            <span tal:replace="context/displayname">project displayname</span>.
-          </p>
-          <div
-            tal:condition="context/products"
-            tal:repeat="product context/products">
-            <tal:link replace="structure product/fmt:link" />
-            <div tal:condition="product/releases/count">
-              Releases:
-              <tal:release repeat="release product/releases">
-                <a
-                  tal:attributes="href release/fmt:url"
-                  tal:content="release/version"
-                >version</a><tal:comma
-                condition="not:repeat/release/end">,</tal:comma>
-              </tal:release>
-            </div>
-            <div tal:condition="product/milestones">
-              Milestones:
-              <tal:milestone repeat="milestone product/milestones">
-                <a
-                  tal:attributes="href milestone/fmt:url"
-                  tal:content="milestone/name"
-                >name</a><tal:comma
-                condition="not:repeat/milestone/end">,</tal:comma>
-              </tal:milestone>
-            </div>
-          </div>
-          <tal:block condition="context/required:launchpad.Edit">
-            <a href="+newproduct">&raquo; Register another project that is
-            part of <tal:project replace="context/displayname" /></a>
-          </tal:block>
-        </div>
-        <div tal:replace="structure context/@@+portlet-latestspecs" />
-      </div>
-      <div class="right">
-        <div tal:replace="structure context/@@+details" />
-        <div tal:replace="structure context/@@+portlet-top-contributors" />
-        <div tal:replace="structure context/@@+portlet-latestbugs" />
-        <div
-          class="section"
-          tal:content="structure context/@@+portlet-latestquestions"
-        />
-      </div>
+      <div class="discreet" style="text-align: right"
+            tal:content="structure context/menu:overview/rdf/fmt:link-icon" />
     </div>
+
+      <div class="yui-g">
+        <div class="yui-u first">
+          <div class="portlet">
+            <h2>Project group information</h2>
+            <tal:details replace="structure context/@@+details" />
+          </div>
+        </div>
+        <div class="yui-u" id="products">
+          <div class="portlet">
+            <h2>Projects</h2>
+            <p tal:condition="not: context/products"> 
+              There are no projects registered for
+              <span tal:replace="context/displayname">project displayname</span>.
+            </p>
+            <div
+              tal:condition="context/products"
+              tal:repeat="product context/products">
+              <tal:link replace="structure product/fmt:link" />
+              <div tal:condition="product/releases/count">
+                Releases:
+                <tal:release repeat="release product/releases">
+                  <a
+                    tal:attributes="href release/fmt:url"
+                    tal:content="release/version"
+                  >version</a><tal:comma
+                  condition="not:repeat/release/end">,</tal:comma>
+                </tal:release>
+              </div>
+              <div tal:condition="product/milestones">
+                Milestones:
+                <tal:milestone repeat="milestone product/milestones">
+                  <a
+                    tal:attributes="href milestone/fmt:url"
+                    tal:content="milestone/name"
+                  >name</a><tal:comma
+                  condition="not:repeat/milestone/end">,</tal:comma>
+                </tal:milestone>
+              </div>
+            </div>
+            <tal:block condition="context/required:launchpad.Edit">
+              <a href="+newproduct">&raquo; Register another project that is
+              part of <tal:project replace="context/displayname" /></a>
+            </tal:block>
+          </div>
+        </div>
+      </div>
+      <div class="yui-g">
+        <div class="yui-u first">
+          <tal:bugs content="structure context/@@+portlet-latestbugs" />
+          <tal:specs content="structure context/@@+portlet-latestspecs" />
+          <tal:sprints content="structure context/@@+portlet-coming-sprints" />
+        </div>
+        <div class="yui-u">
+          <tal:questions content="structure context/@@+portlet-latestquestions" />
+          <tal:contributors content="structure context/@@+portlet-top-contributors" />
+        </div>
+      </div>
+    </tal:main>
+
+    <tal:side metal:fill-slot="side">
+      <div id="object-actions" class="top-portlet">
+        <tal:menu replace="structure view/@@+global-actions" /> 
+      </div>
+      <div id="involvement" class="portlet involvement"
+           tal:condition="context/products">
+        <h2>Get Involved</h2>
+        <ul>
+          <li>
+            <a class="bugs"
+              tal:attributes="href context/menu:bugs/new/url">Report a Bug</a>
+          </li>
+          <li>
+            <a class="question"
+              tal:attributes="href context/menu:answers/new/url">Ask a question</a>
+          </li>
+          <li>
+            <a class="translate"
+              tal:attributes="href context/menu:translations/overview/url">Help translate</a>
+          </li>
+        </ul>
+      </div>
+      <tal:portlet tal:replace="structure context/@@+portlet-latestannouncements" />
+    </tal:side>
+
   </body>
 </html>
 

=== modified file 'lib/lp/translations/browser/project.py'
--- lib/lp/translations/browser/project.py	2009-07-17 02:25:09 +0000
+++ lib/lp/translations/browser/project.py	2009-08-05 19:26:37 +0000
@@ -11,7 +11,7 @@
     ]
 
 from canonical.launchpad.webapp import (
-    ApplicationMenu, enabled_with_permission, Link, LaunchpadView)
+    canonical_url, enabled_with_permission, Link, LaunchpadView)
 from canonical.launchpad.webapp.menu import NavigationMenu
 from lp.registry.interfaces.project import IProject
 
@@ -20,7 +20,7 @@
 
     usedfor = IProject
     facet = 'translations'
-    links = ['products', 'changetranslators']
+    links = ['products', 'changetranslators', 'overview']
 
     @enabled_with_permission('launchpad.Edit')
     def changetranslators(self):
@@ -31,6 +31,11 @@
         text = 'Products'
         return Link('', text)
 
+    def overview(self):
+        text = 'Overview'
+        link = canonical_url(self.context, rootsite='translations')
+        return Link(link, text, icon='translation')
+
 
 class ProjectView(LaunchpadView):
     pass