Merge lp:~barry/launchpad/417089-headings into lp:launchpad

[Barry Warsaw]

[Barry Warsaw (barry)]

 reviewer salgado

= Summary =

Bug 417089 addresses our current inconsistencies and difficulties with getting
the headings and page titles correct. After discussion with Martin A, we've
codified the rules here:

https://dev.launchpad.net/VersionThreeDotO/UI/Conversion#Heading%20rules

This section contains both the rules for what you should see on a page, and
how to code your views to conform. Both instructions probably could use for
some review as well to make sure I've gotten them right. I intend to do
another pass through these instructions to include actual examples of pages
and templates from our tree so folks can cargo cult into their own pages.

As I mentioned in IRC, the branch is not yet ready to land, but it's close. I
believe all the header/title rules are implemented, and I have also included a
fix for bug 423411, which converts the ~person/+karma page to the new heading
rules. However, ec2 is reporting test failures which I have to fix before I
land the branch. If necessary I may ask for a follow up review.

I also suck because this branch is currently at 1035 lines.

== Proposed fix ==

Update the base-layout.pt template and launchpad-form.pt, as well as all
supporting view code, interfaces, zcml files, and style sheets to support the
new rules. Update some of the tests (more to come). Fix the person +karma
pages to conform.

Add several interfaces used to mark views to tell the base layout code how to
render the headings, either as an H1, an H2, or as an editable widget.

== Pre-implementation notes ==

I had several discussions with Martin about the rules, you Salgado to help me
with a few things regarding breadcrumbs, and a few other people about
specifics with this branch.

== Implementation details ==

In addition to the above, I also:

 * Improved the way the Launchpad release number is calculated for the
   base-layout template. Now, to update that release number (e.g. 2.2.7) you
   just edit the version.txt file in the root of the tree.
 * Cleaned up some whitespace
 * Added a launchpad-page-title.pt template for rendering the reverse
   breadcrumb <title>
 * Added additional ZCML to correctly calculate the <title> for some
   bug/branch pages that were overriding breadcrumb calculation
 * moved the IRootContext interface and consolidated related interfaces
 * Refactored the +karma view support into a separate PersonKarmaView class
 * Redesigned the +karma page based on Martin's ui suggestions, including
   defining a new, narrower table.
 * Made the project index page title editable

== Tests ==

This test was fixed to show the new code to show how the view annotations work
for the new header rules, including for editable heading widgets.

 % bin/test -vv -t watermark.txt

More tests to come, once they pass ;)

== Demo and Q/A ==

These pages show some interesting things, such as the headers and breadcrumbs
all UI 3.0 -like.

 https://launchpad.dev/firefox
 https://launchpad.dev/people/+newteam
 https://launchpad.dev/~name16/+karma
 https://code.launchpad.dev/~mark/firefox/release-0.8/+merge/1/+review?claim=name16&review_type=

(you will need to create a merge proposal for the firefox 0.8 branch into the
trunk...

[Guilherme Salgado (salgado)]

Hi Barry,

Thanks a lot for your work on defining the heading rules and
implementing them. I have a few suggestions below, and I'll send a
separate review for the changes on the karma page.

Also, the 404 page now has a title which doesn't reflect that.
<https://code.launchpad.dev/~mark/firefox/release-0.8/+merge/1111>

On Fri, 2009-09-04 at 15:35 +0000, Barry Warsaw wrote:
> === modified file 'lib/canonical/launchpad/icing/style-3-0.css'
> --- lib/canonical/launchpad/icing/style-3-0.css 2009-09-04 11:25:26 +0000
> +++ lib/canonical/launchpad/icing/style-3-0.css 2009-09-04 12:56:38 +0000
> @@ -681,6 +681,20 @@
> table.listing th {
> font-weight: bold;
> }
> +table.narrow-listing {
> + width: 45em;
> +}
> +/* ~person/+karma */
> +table.cozy-listing {
> + width: 20em;

I think the correct indentation for our CSS is 2 spaces, no?

> + background-color: #fff;
> + border: 1px solid #d2d2d2;
> + border-bottom: 1px solid #d2d2d2;
> +}
> +table.cozy-listing td {
> + border: 1px #d2d2d2;
> + border-style: dotted none none none;
> +}
>
> ul.language, li.language {
> list-style-image: url(/@@/language);
> @@ -743,7 +757,3 @@
> font-weight: normal;
> padding: 2px 1em 2px 2px;
> }
> -
> -table.narrow-listing {
> - width: 45em;
> -}
>

> === modified file 'lib/lp/app/browser/configure.zcml'
> --- lib/lp/app/browser/configure.zcml 2009-08-27 09:06:42 +0000
> +++ lib/lp/app/browser/configure.zcml 2009-09-03 19:12:20 +0000
> @@ -38,6 +38,15 @@
> permission="zope.Public"
> />
>
> + <!-- Page title reversed breadcrumbs -->
> + <browser:page
> + for="zope.interface.Interface"
> + name="+page-title"
> + class="canonical.launchpad.browser.launchpad.Hierarchy"
> + template="../templates/launchpad-page-title.pt"
> + permission="zope.Public"
> + />
> +
> <!-- TALES watermark: namespace -->
> <adapter
> for="*"
>
> === modified file 'lib/lp/app/browser/tests/watermark.txt'
> --- lib/lp/app/browser/tests/watermark.txt 2009-08-19 23:11:16 +0000
> +++ lib/lp/app/browser/tests/watermark.txt 2009-09-03 23:06:50 +0000
[...]
> +
> +Heading level
> +=============
> +
> +The watermark heading is shown above the application tabs, in either H1 level
> +or H2 level. The heading level is determined by the view. For the index view
> +of the context, H1 is used. For all non-index pages, i.e. subpages, H2 is
> +used.
> +
> +The choice of heading level is controlled by a marker interface on the view.
> +Normally, the view class does not implement the marker interface, meaning it
> +is not the index page of the context. In this case the heading is rendered in
> +H2.
> +
> + >>> print test_tales('view/watermark:heading', view=view(widget))
> + <h2>Widget</h2>
> +
> +If the view class implements IIndexView, then this is the index page for the
> +context and the heading is rendered in H1.
> +
> + >>> from zope.interface import implements
> + >>> from lp.app.interfaces.headings import IIndexView
> +
> + >>> class view:
> + ... implements(IIndexView)
> + ... def __init__(self, context):
> + ... s...

[Guilherme Salgado (salgado)]

Hi Barry,

The new +karma page looks much better. I have only a few minor changes
to suggest.

On Fri, 2009-09-04 at 15:35 +0000, Barry Warsaw wrote:
> === modified file 'lib/lp/registry/browser/person.py'
> --- lib/lp/registry/browser/person.py 2009-09-04 02:20:59 +0000
> +++ lib/lp/registry/browser/person.py 2009-09-04 12:56:38 +0000
> @@ -39,6 +39,7 @@
> 'PersonFacets',
> 'PersonGPGView',
> 'PersonIndexView',
> + 'PersonKarmaView',
> 'PersonLanguagesView',
> 'PersonLatestQuestionsView',
> 'PersonNavigation',
> @@ -2507,8 +2508,26 @@
> rootsite='answers')
>
>
> +class PersonKarmaView(LaunchpadView):
> + """A view class used for ~person/+karma."""
> +
> + @property
> + def label(self):
> + return 'Launchpad Karma for ' + cgi.escape(self.user.displayname)
> +
> + @cachedproperty
> + def has_karma(self):
> + """Does the have karma?"""

s/the have/the person have/?

> + return bool(self.context.karma_category_caches)
> +
> + @cachedproperty
> + def has_expired_karma(self):
> + """Did the user have karma?"""

s/user/person. User is the term we use to refer to the person who's
interacting with LP, and here we're talking about the context of the
view.

I know you just copied-and-pasted them, but these are small enough
changes that I'm sure you won't mind doing. ;)

> + return self.context.latestKarma().count() > 0
> +
> +
> class PersonView(LaunchpadView, FeedsMixin):
> - """A View class used in almost all Person's pages."""
> + """A view class used in almost all Person's pages."""
>
> @cachedproperty
> def recently_approved_members(self):
> @@ -2900,16 +2919,6 @@
> else:
> return getUtility(ILaunchpadCelebrities).english.englishname
>
> - @cachedproperty
> - def has_karma(self):
> - """Does the have karma?"""
> - return bool(self.context.karma_category_caches)
> -
> - @cachedproperty
> - def has_expired_karma(self):
> - """Did the user have karm?."""
> - return self.context.latestKarma().count() > 0
> -
> @property
> def public_private_css(self):
> """The CSS classes that represent the public or private state."""
>

> === modified file 'lib/lp/registry/templates/person-karma.pt'
> --- lib/lp/registry/templates/person-karma.pt 2009-07-17 17:59:07 +0000
> +++ lib/lp/registry/templates/person-karma.pt 2009-09-03 00:38:35 +0000
[...]
> -</body>
> + >
> + <body>
> + <div metal:fill-slot="main"
> + tal:define="latest_karma context/latestKarma">
> +
> + <p class="application-summary">
> + This is a summary of the Launchpad karma earned by
> + <span tal:replace="context/displayname" />, organized by activity
> + type.
> + </p>
> +
> + <p id="no-karma" tal:condition="not: view/has_karma">
> + <tal:expired condition="view/has_expired_karma">
> + <tal:name replace="context/displayname" />'s karma has expired.
> + </tal:expired>
> + <tal:never condition="not: view/has_expired_karma">
> + No karma has yet been assigned to
> + <tal:name replace="...

[Guilherme Salgado (salgado)]

review: Needs Fixing

[Barry Warsaw (barry)]

On Sep 04, 2009, at 06:42 PM, Guilherme Salgado wrote:

>Thanks a lot for your work on defining the heading rules and
>implementing them. I have a few suggestions below, and I'll send a
>separate review for the changes on the karma page.

Thanks for the review Salgado. I'm still working on getting all the tests to
pass, and OCR last week cut into my time on this branch, but I'm keen to
resolve the issues and get this landed so we have time to update our pages to
the new rules.

>Also, the 404 page now has a title which doesn't reflect that.
><https://code.launchpad.dev/~mark/firefox/release-0.8/+merge/1111>

Yep, there are no merge proposals in sample data, so you have to create this
manually.

>
>On Fri, 2009-09-04 at 15:35 +0000, Barry Warsaw wrote:
>> === modified file 'lib/canonical/launchpad/icing/style-3-0.css'
>> --- lib/canonical/launchpad/icing/style-3-0.css 2009-09-04 11:25:26 +0000
>> +++ lib/canonical/launchpad/icing/style-3-0.css 2009-09-04 12:56:38 +0000
>> @@ -681,6 +681,20 @@
>> table.listing th {
>> font-weight: bold;
>> }
>> +table.narrow-listing {
>> + width: 45em;
>> +}
>> +/* ~person/+karma */
>> +table.cozy-listing {
>> + width: 20em;
>
>I think the correct indentation for our CSS is 2 spaces, no?

style-3-0.css is pretty inconsistent here, but it looks to me like most of the
styles use 4 space indents. I'd prefer that (for consistency) and will put
this on the agenda for this week's reviewer meetings.

>> +Editable headings
>> +=================
>> +
>> +Some index pages also allow for editing the context's description. To specify
>
>s/description/title?

Yep, thanks!

>> def heading(self):
>> - """Return the heading text for the root context.
>> -
>> - If the context itself provides IRootContext then we return an H1,
>> - otherwise it is a H2.
>> + """Return the heading text for the page.
>> +
>> + If the view provides `IEditableContextTitle` then the top heading is
>> + rendered from the view's `title_edit_widget` and is generally
>> + editable.
>> +
>> + Otherwise, if the context provides `IRootContext` then we return an
>> + H1, else an H2.
>> """
>> - if IRootContext.providedBy(self._context):
>> + # Check the view; is the title editable?
>> + if IEditableContextTitle.providedBy(self._view):
>> + return self._view.title_edit_widget()
>> + # The title is static, but only the root context gets an H1.
>
>s/the root context/the context's index view/?

Fixed.

>> === renamed file 'lib/lp/app/interfaces/rootcontext.py' => 'lib/lp/app/interfaces/headings.py'
>> --- lib/lp/app/interfaces/rootcontext.py 2009-08-19 06:18:41 +0000
>> +++ lib/lp/app/interfaces/headings.py 2009-09-04 12:59:09 +0000
>> @@ -1,10 +1,12 @@
>> # Copyright 2009 Canonical Ltd. This software is licensed under the
>> # GNU Affero General Public License version 3 (see the file LICENSE).
>>
>> -"""The primary context interface."""
>> +"""Interfaces for headings and breadcrumbs."""
>
>Actually, there's nothing here for breadcrumbs, is there?
>
>I think these are more like
>
> """Marker interfaces that define how to...

[Barry Warsaw (barry)]

On Sep 04, 2009, at 07:30 PM, Guilherme Salgado wrote:

>The new +karma page looks much better. I have only a few minor changes
>to suggest.

Thanks for the review Salgado.

>On Fri, 2009-09-04 at 15:35 +0000, Barry Warsaw wrote:
>> === modified file 'lib/lp/registry/browser/person.py'
>> --- lib/lp/registry/browser/person.py 2009-09-04 02:20:59 +0000
>> +++ lib/lp/registry/browser/person.py 2009-09-04 12:56:38 +0000
>> @@ -39,6 +39,7 @@
>> 'PersonFacets',
>> 'PersonGPGView',
>> 'PersonIndexView',
>> + 'PersonKarmaView',
>> 'PersonLanguagesView',
>> 'PersonLatestQuestionsView',
>> 'PersonNavigation',
>> @@ -2507,8 +2508,26 @@
>> rootsite='answers')
>>
>>
>> +class PersonKarmaView(LaunchpadView):
>> + """A view class used for ~person/+karma."""
>> +
>> + @property
>> + def label(self):
>> + return 'Launchpad Karma for ' + cgi.escape(self.user.displayname)
>> +
>> + @cachedproperty
>> + def has_karma(self):
>> + """Does the have karma?"""
>
>s/the have/the person have/?

Fixed.

>
>> + return bool(self.context.karma_category_caches)
>> +
>> + @cachedproperty
>> + def has_expired_karma(self):
>> + """Did the user have karma?"""
>
>s/user/person. User is the term we use to refer to the person who's
>interacting with LP, and here we're talking about the context of the
>view.
>
>I know you just copied-and-pasted them, but these are small enough
>changes that I'm sure you won't mind doing. ;)

I don't, and thanks! Fixed.

>> === modified file 'lib/lp/registry/templates/person-karma.pt'
>> --- lib/lp/registry/templates/person-karma.pt 2009-07-17 17:59:07 +0000
>> +++ lib/lp/registry/templates/person-karma.pt 2009-09-03 00:38:35 +0000
>[...]
>> -</body>
>> + >
>> + <body>
>> + <div metal:fill-slot="main"
>> + tal:define="latest_karma context/latestKarma">
>> +
>> + <p class="application-summary">
>> + This is a summary of the Launchpad karma earned by
>> + <span tal:replace="context/displayname" />, organized by activity
>> + type.
>> + </p>
>> +
>> + <p id="no-karma" tal:condition="not: view/has_karma">
>> + <tal:expired condition="view/has_expired_karma">
>> + <tal:name replace="context/displayname" />'s karma has expired.
>> + </tal:expired>
>> + <tal:never condition="not: view/has_expired_karma">
>> + No karma has yet been assigned to
>> + <tal:name replace="context/displayname" />.
>> + Karma is updated daily.
>> + </tal:never>
>> + </p>
>> +
>> + <table class="cozy-listing" id="karmapoints"
>> + tal:condition="context/karma_category_caches">
>> + <tbody>
>> + <tr tal:repeat="cache context/karma_category_caches">
>> + <td tal:content="cache/category/title">Bug Management</td>
>> + <td><strong
>> + class=""
>> + tal:attributes="class string: ${cache/category/name}-stat"
>> + tal:content="cache/karmavalue">10</strong></td>
>> + </tr>
>> + </tbody>
>> + </table>
>> + <b>Total karma:</b>
>> ...

[Guilherme Salgado (salgado)]

review: Approve

[Barry Warsaw (barry)]

On Sep 08, 2009, at 02:20 PM, Guilherme Salgado wrote:

>On Tue, 2009-09-08 at 10:42 -0400, Barry Warsaw wrote:
>> On Sep 04, 2009, at 06:42 PM, Guilherme Salgado wrote:
>>
>> >Thanks a lot for your work on defining the heading rules and
>> >implementing them. I have a few suggestions below, and I'll send a
>> >separate review for the changes on the karma page.
>>
>> Thanks for the review Salgado. I'm still working on getting all the tests to
>> pass, and OCR last week cut into my time on this branch, but I'm keen to
>> resolve the issues and get this landed so we have time to update our pages to
>> the new rules.
>>
>> >Also, the 404 page now has a title which doesn't reflect that.
>> ><https://code.launchpad.dev/~mark/firefox/release-0.8/+merge/1111>
>>
>> Yep, there are no merge proposals in sample data, so you have to create this
>> manually.
>
>Right, but what I mean is that the title of our 404 pages now have the
>breadcrumbs in reversed order instead of the 'Not found here' we were
>used to.

This turned out to be surprisingly tricky to solve! We discussed various
options on IRC and came up with using tales formatter, e.g. view/fmt:pagetitle
which simplified a lot of things (the attached incremental diff
notwithstanding).

The nice thing is that this should deprecate CONTEXTS/fmt:pagetitle and
PageTemplateContextsAPI in several places, and I've filed bug 426532 to
eventually remove that stuff.

>Your changes look good to me. There's just one extra blank line that
>ought to be removed.

Actually, I was able to get rid of the whole view class, so I cleaned that up
while I was at it. Here's the incremental.

=== modified file 'lib/canonical/launchpad/browser/launchpad.py'
--- lib/canonical/launchpad/browser/launchpad.py 2009-09-08 14:42:20 +0000
+++ lib/canonical/launchpad/browser/launchpad.py 2009-09-08 21:12:07 +0000
@@ -19,7 +19,6 @@
     'MaintenanceMessage',
     'MenuBox',
     'NavigationMenuTabs',
- 'PageTitleView',
     'SoftTimeoutView',
     'StructuralHeaderPresentation',
     'StructuralObjectPresentation',
@@ -27,9 +26,6 @@
     ]

-COLON = ' : '
-
-
 import cgi
 import operator
 import os
@@ -40,7 +36,7 @@

 from zope.app import zapi
 from zope.datetime import parseDatetimetz, tzinfo, DateTimeError
-from zope.component import getMultiAdapter, getUtility, queryAdapter
+from zope.component import getUtility, queryAdapter
 from zope.interface import implements
 from zope.publisher.interfaces import NotFound
 from zope.publisher.interfaces.browser import IBrowserPublisher
@@ -289,28 +285,6 @@
         return len(self.items) > 1

-class PageTitleView(LaunchpadView):
- """View for page <title>."""
-
- def __init__(self, context, request):
- super(PageTitleView, self).__init__(context, request)
- self.hierarchy_view = getMultiAdapter(
- (self.context, self.request), name='+hierarchy')
-
- @cachedproperty
- def page_title(self):
- """The page title, constructed from the reversed breadcrumbs."""
- return COLON.join(
- breadcrumb.text for breadcrumb
- in reversed(self.hierarchy_view.items))
-
- @property
- def has_custom_title(self):
- ...

[Guilherme Salgado (salgado)]

Hi Barry,

This is a nice change. I see only two small things that need to be
changed.

Cheers,

On Tue, 2009-09-08 at 18:42 -0400, Barry Warsaw wrote:
> On Sep 08, 2009, at 02:20 PM, Guilherme Salgado wrote:
>
> >On Tue, 2009-09-08 at 10:42 -0400, Barry Warsaw wrote:
> >> On Sep 04, 2009, at 06:42 PM, Guilherme Salgado wrote:
> >>
> >> >Thanks a lot for your work on defining the heading rules and
> >> >implementing them. I have a few suggestions below, and I'll send a
> >> >separate review for the changes on the karma page.
> >>
> >> Thanks for the review Salgado. I'm still working on getting all the tests to
> >> pass, and OCR last week cut into my time on this branch, but I'm keen to
> >> resolve the issues and get this landed so we have time to update our pages to
> >> the new rules.
> >>
> >> >Also, the 404 page now has a title which doesn't reflect that.
> >> ><https://code.launchpad.dev/~mark/firefox/release-0.8/+merge/1111>
> >>
> >> Yep, there are no merge proposals in sample data, so you have to create this
> >> manually.
> >
> >Right, but what I mean is that the title of our 404 pages now have the
> >breadcrumbs in reversed order instead of the 'Not found here' we were
> >used to.
>
> This turned out to be surprisingly tricky to solve! We discussed various
> options on IRC and came up with using tales formatter, e.g. view/fmt:pagetitle
> which simplified a lot of things (the attached incremental diff
> notwithstanding).
>
> The nice thing is that this should deprecate CONTEXTS/fmt:pagetitle and
> PageTemplateContextsAPI in several places, and I've filed bug 426532 to
> eventually remove that stuff.
>
> >Your changes look good to me. There's just one extra blank line that
> >ought to be removed.
>
> Actually, I was able to get rid of the whole view class, so I cleaned that up
> while I was at it. Here's the incremental.
>

> === modified file 'lib/canonical/launchpad/webapp/tales.py'
> --- lib/canonical/launchpad/webapp/tales.py 2009-09-04 13:00:42 +0000
> +++ lib/canonical/launchpad/webapp/tales.py 2009-09-08 22:31:49 +0000
> @@ -16,6 +16,8 @@
> import rfc822
> import sys
> import urllib
> +import warnings
> +
> from xml.sax.saxutils import unescape as xml_unescape
> from datetime import datetime, timedelta
> from lazr.enum import enumerated_type_registry
> @@ -62,6 +64,9 @@
> from lp.soyuz.interfaces.build import BuildStatus
>
>
> +SEPARATOR = ' : '
> +
> +
> def escape(text, quote=True):
> """Escape text for insertion into HTML.
>
> @@ -439,7 +444,12 @@
> # constants, so it's not a problem. We might want to use something like
> # frozenset (http://code.activestate.com/recipes/414283/) here, though.
> # The names which can be traversed further (e.g context/fmt:url/+edit).
> - traversable_names = {'link': 'link', 'url': 'url', 'api_url': 'api_url'}
> + traversable_names = {
> + 'api_url': 'api_url',
> + 'link': 'link',
> + 'pagetitle': 'pagetitle',
> + 'url': 'url',
> + }
>
> # Names which are allowed but can't be traversed further.
> final_traversable_names = {

Isn't pagetitle a final_traversable_name?

> @@ -534,6 +544,67 @@
> ...

[Barry Warsaw (barry)]

On Sep 9, 2009, at 9:27 AM, Guilherme Salgado wrote:

> This is a nice change. I see only two small things that need to be
> changed.

Hi Salgado. With all the stress in trying to get this branch landed,
I forgot about these comments. I'll get this in a follow up branch
this week.

Thanks!

=== modified file 'lib/canonical/launchpad/browser/launchpad.py'
--- lib/canonical/launchpad/browser/launchpad.py	2009-09-02 12:39:24 +0000
+++ lib/canonical/launchpad/browser/launchpad.py	2009-09-03 20:26:49 +0000
@@ -26,6 +26,9 @@
     ]
 
 
+COLON = ' : '
+
+
 import cgi
 import operator
 import os
@@ -256,6 +259,12 @@
                 breadcrumbs.append(page_crumb)
         return breadcrumbs
 
+    @cachedproperty
+    def page_title(self):
+        """The page title, constructed from the reversed breadcrumbs."""
+        return COLON.join(
+            breadcrumb.text for breadcrumb in reversed(self.items))
+
     def makeBreadcrumbForRequestedPage(self):
         """Return an `IBreadcrumb` for the requested page.
 

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2009-09-04 11:25:26 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2009-09-04 12:56:38 +0000
@@ -681,6 +681,20 @@
 table.listing th {
   font-weight: bold;
 }
+table.narrow-listing {
+  width: 45em;
+}
+/* ~person/+karma */
+table.cozy-listing {
+    width: 20em;
+    background-color: #fff;
+    border: 1px solid #d2d2d2;
+    border-bottom: 1px solid #d2d2d2;
+}
+table.cozy-listing td {
+    border: 1px #d2d2d2;
+    border-style: dotted none none none;
+}
 
 ul.language, li.language             {
   list-style-image: url(/@@/language);
@@ -743,7 +757,3 @@
   font-weight: normal;
   padding: 2px 1em 2px 2px;
 }
-
-table.narrow-listing {
-  width: 45em;
-}

=== modified file 'lib/canonical/launchpad/templates/launchpad-form.pt'
--- lib/canonical/launchpad/templates/launchpad-form.pt	2009-08-01 02:04:55 +0000
+++ lib/canonical/launchpad/templates/launchpad-form.pt	2009-09-03 15:39:22 +0000
@@ -14,11 +14,6 @@
           enctype="multipart/form-data"
           accept-charset="UTF-8">
 
-      <h1 tal:condition="view/label"
-          tal:content="view/label"
-          metal:define-slot="heading"
-          >Add Something</h1>
-
       <div metal:define-macro="formbody">
 
         <p metal:define-slot="extra_info" tal:replace="nothing">
@@ -38,8 +33,8 @@
           Schema validation errors.
         </p>
 
-        <div class="row" 
-             metal:define-slot="extra_top" 
+        <div class="row"
+             metal:define-slot="extra_top"
              tal:replace="nothing">
             <div>Extra top</div>
             <div><input type="text"/></div>
@@ -55,7 +50,7 @@
                 tal:content="structure script" />
 
         <div class="row"
-             metal:define-slot="extra_bottom" 
+             metal:define-slot="extra_bottom"
              tal:replace="nothing">
           <div>Extra bottom</div>
           <div class="field"><input type="text" /></div>
@@ -73,8 +68,8 @@
         </tal:has-cancel-link>
       </div>
 
-      <div class="row" 
-           metal:define-slot="extra_buttons" 
+      <div class="row"
+           metal:define-slot="extra_buttons"
            tal:replace="nothing">
       </div>
 

=== modified file 'lib/canonical/launchpad/versioninfo.py'
--- lib/canonical/launchpad/versioninfo.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/versioninfo.py	2009-09-02 19:11:01 +0000
@@ -1,7 +1,7 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Give access to bzr version info, if available.
+"""Give access to bzr and other version info, if available.
 
 The bzr version info file is expected to be in the Launchpad root in the
 file bzr-version-info.py.
@@ -16,19 +16,28 @@
 If the bzr-version-info.py file does not exist, then revno, date and
 branch_nick will all be None.
 
-If that file exists, and contains valid python, revno, date and branch_nick
+If that file exists, and contains valid Python, revno, date and branch_nick
 will have appropriate values from version_info.
 
-If that file exists, and contains invalid python, there will be an error when
+If that file exists, and contains invalid Python, there will be an error when
 this module is loaded.  This module is imported into
 canonical/launchpad/__init__.py so that such errors are caught at start-up.
 
+This module also reads version.txt at the top of the tree (i.e. a sibling of
+bzr-version-info.py), which contains the Launchpad release number.  If that
+file does not exist, we make something up.
 """
 
+__all__ = [
+    'branch_nick',
+    'date',
+    'revno',
+    'versioninfo',
+    ]
+
+
 import imp
 
-__all__ = ['versioninfo', 'revno', 'date', 'branch_nick']
-
 
 def read_version_info():
     try:
@@ -52,3 +61,14 @@
     date = versioninfo.get('date')
     branch_nick = versioninfo.get('branch_nick')
 
+
+try:
+    version_file = open('version.txt')
+except IOError:
+    release = 'x.y.z'
+else:
+    try:
+        version_data = version_file.read()
+        release = version_data.strip()
+    finally:
+        version_file.close()

=== modified file 'lib/canonical/launchpad/webapp/interfaces.py'
--- lib/canonical/launchpad/webapp/interfaces.py	2009-08-24 17:47:34 +0000
+++ lib/canonical/launchpad/webapp/interfaces.py	2009-09-03 23:06:50 +0000
@@ -350,7 +350,7 @@
 
     def getRootURL(rootsite):
         """Return this request's root URL.
-        
+
         If rootsite is not None, then return the root URL for that rootsite,
         looked up from our config.
         """
@@ -626,11 +626,11 @@
         instance of a Zope internationalized message will cause the
         message to be translated, then CGI escaped.
 
-        :param msg: This may be a string, an instance of
-        	`zope.i18n.Message`, , or an instance of `IStructuredString`.
+        :param msg: This may be a string, an instance of `zope.i18n.Message`,
+            or an instance of `IStructuredString`.
 
         :param level: One of the `BrowserNotificationLevel` values: DEBUG,
-        	INFO, NOTICE, WARNING, ERROR.
+            INFO, NOTICE, WARNING, ERROR.
         """
 
     def removeAllNotifications():
@@ -796,7 +796,7 @@
     """Get a Storm store with a desired flavor.
 
     Stores come in two flavors - MASTER_FLAVOR and SLAVE_FLAVOR.
- 
+
     The master is writable and up to date, but we should not use it
     whenever possible because there is only one master and we don't want
     it to be overloaded.

=== modified file 'lib/lp/app/browser/configure.zcml'
--- lib/lp/app/browser/configure.zcml	2009-08-27 09:06:42 +0000
+++ lib/lp/app/browser/configure.zcml	2009-09-03 19:12:20 +0000
@@ -38,6 +38,15 @@
         permission="zope.Public"
         />
 
+    <!-- Page title reversed breadcrumbs -->
+    <browser:page
+        for="zope.interface.Interface"
+        name="+page-title"
+        class="canonical.launchpad.browser.launchpad.Hierarchy"
+        template="../templates/launchpad-page-title.pt"
+        permission="zope.Public"
+        />
+
     <!-- TALES watermark: namespace -->
     <adapter
         for="*"

=== modified file 'lib/lp/app/browser/tests/watermark.txt'
--- lib/lp/app/browser/tests/watermark.txt	2009-08-19 23:11:16 +0000
+++ lib/lp/app/browser/tests/watermark.txt	2009-09-03 23:06:50 +0000
@@ -1,3 +1,4 @@
+===============================
 The "watermark" TALES formatter
 ===============================
 
@@ -7,83 +8,131 @@
 
 
 Watermark headings
-------------------
+==================
 
 The `watermark:heading` is used when you want a heading for the nearest object
 that implements IRootContext.
 
-Objects that directly provide IRootContext get an h1 heading, those that don't
-get an h2 heading (although why I'm not yet certain).
-
     >>> from lp.testing import test_tales
+    >>> class view:
+    ...     def __init__(self, context):
+    ...         self.context = context
 
 Products directly implement IRootContext.
 
     >>> widget = factory.makeProduct(title='Widget')
-    >>> print test_tales('project/watermark:heading', project=widget)
-    <h1>Widget</h1>
+    >>> print test_tales('view/watermark:heading', view=view(widget))
+    <h...>Widget</h...>
 
 A series of the product still show the product watermark.
 
     >>> dev_focus = widget.development_focus
-    >>> print test_tales('series/watermark:heading', series=dev_focus)
-    <h2>Widget</h2>
+    >>> print test_tales('view/watermark:heading', view=view(dev_focus))
+    <h...>Widget</h...>
 
 Projects also directly implement IRootContext ...
 
     >>> kde = factory.makeProject(title='KDE')
-    >>> print test_tales('project/watermark:heading', project=kde)
-    <h1>KDE</h1>
+    >>> print test_tales('view/watermark:heading', view=view(kde))
+    <h...>KDE</h...>
 
 ... as do distributions ...
 
     >>> mint = factory.makeDistribution(title='Mint Linux')
-    >>> print test_tales(
-    ...     "distro/watermark:heading", distro=mint)
-    <h1>Mint Linux</h1>
+    >>> print test_tales('view/watermark:heading', view=view(mint))
+    <h...>Mint Linux</h...>
 
 ... and people ...
 
     >>> eric = factory.makePerson(displayname="Eric the Viking")
-    >>> print test_tales("person/watermark:heading", person=eric)
-    <h1>Eric the Viking</h1>
+    >>> print test_tales('view/watermark:heading', view=view(eric))
+    <h...>Eric the Viking</h...>
 
 ... and sprints.
 
     >>> sprint = factory.makeSprint(title="Launchpad Epic")
-    >>> print test_tales("sprint/watermark:heading", sprint=sprint)
-    <h1>Launchpad Epic</h1>
+    >>> print test_tales('view/watermark:heading', view=view(sprint))
+    <h...>Launchpad Epic</h...>
 
 If there is no root context defined for the object, then the heading is
 'Launchpad.net' (differentiating from the Launchpad project within
 Launchpad.net).
 
     >>> machine = factory.makeCodeImportMachine()
-    >>> print test_tales(
-    ...     "machine/watermark:heading", machine=machine)
-    <h2>Launchpad.net</h2>
+    >>> print test_tales('view/watermark:heading', view=view(machine))
+    <h...>Launchpad.net</h...>
 
-Any html in the context title will be escaped to avoid XSS vulnerabilities.
+Any HTML in the context title will be escaped to avoid XSS vulnerabilities.
 
     >>> person = factory.makePerson(
     ...     displayname="Fubar<br/><script>alert('XSS')</script>")
-    >>> print test_tales("person/watermark:heading", person=person)
-    <h1>Fubar&lt;br/&gt;&lt;script&gt;alert('XSS')&lt;/script&gt;</h1>
+    >>> print test_tales('view/watermark:heading', view=view(person))
+    <h...>Fubar&lt;br/&gt;&lt;script&gt;alert('XSS')&lt;/script&gt;</h...>
 
 
 Watermark images
-------------------
+================
 
 The image for the watermark is determined effectively by context/image:logo.
 
-    >>> print test_tales("series/watermark:logo", series=dev_focus)
+    >>> print test_tales('view/watermark:logo', view=view(dev_focus))
     <img ... src="/@@/product-logo" />
 
-    >>> print test_tales("person/watermark:logo", person=eric)
+    >>> print test_tales('view/watermark:logo', view=view(eric))
     <img ... src="/@@/person-logo" />
 
-If there is no root context, the launchpad logo is shown.
+If there is no root context, the Launchpad logo is shown.
 
-    >>> print test_tales(
-    ...     "machine/watermark:logo", machine=machine)
+    >>> print test_tales('view/watermark:logo', view=view(machine))
     <img ... src="/@@/launchpad-logo" />
+
+
+Heading level
+=============
+
+The watermark heading is shown above the application tabs, in either H1 level
+or H2 level.  The heading level is determined by the view.  For the index view
+of the context, H1 is used.  For all non-index pages, i.e. subpages, H2 is
+used.
+
+The choice of heading level is controlled by a marker interface on the view.
+Normally, the view class does not implement the marker interface, meaning it
+is not the index page of the context.  In this case the heading is rendered in
+H2.
+
+    >>> print test_tales('view/watermark:heading', view=view(widget))
+    <h2>Widget</h2>
+
+If the view class implements IIndexView, then this is the index page for the
+context and the heading is rendered in H1.
+
+    >>> from zope.interface import implements
+    >>> from lp.app.interfaces.headings import IIndexView
+
+    >>> class view:
+    ...     implements(IIndexView)
+    ...     def __init__(self, context):
+    ...         self.context = context
+
+    >>> print test_tales('view/watermark:heading', view=view(widget))
+    <h1>Widget</h1>
+
+
+Editable headings
+=================
+
+Some index pages also allow for editing the context's description.  To specify
+this, the view must implement IEditableContextTitle and provide an method
+that returns all the HTML necessary to edit the context, including the
+appropriate H tag.
+
+    >>> from lp.app.interfaces.headings import IEditableContextTitle
+    >>> class view:
+    ...     implements(IEditableContextTitle)
+    ...     def __init__(self, context):
+    ...         self.context = context
+    ...     def title_edit_widget(self):
+    ...         return '<h0>EDIT ME</h0>'
+
+    >>> print test_tales('view/watermark:heading', view=view(widget))
+    <h0>EDIT ME</h0>

=== modified file 'lib/lp/app/browser/watermark.py'
--- lib/lp/app/browser/watermark.py	2009-08-19 22:44:27 +0000
+++ lib/lp/app/browser/watermark.py	2009-09-03 23:06:50 +0000
@@ -18,7 +18,8 @@
 
 from canonical.lazr.canonicalurl import nearest_provides_or_adapted
 
-from lp.app.interfaces.rootcontext import IRootContext
+from lp.app.interfaces.headings import (
+    IEditableContextTitle, IIndexView, IRootContext)
 
 
 class WatermarkTalesAdapter:
@@ -26,34 +27,43 @@
 
     implements(ITraversable)
 
-    def __init__(self, context):
-        self._context = context
+    def __init__(self, view):
+        self._view = view
+        self._context = view.context
 
     @property
     def root_context(self):
         return nearest_provides_or_adapted(self._context, IRootContext)
 
     def heading(self):
-        """Return the heading text for the root context.
-
-        If the context itself provides IRootContext then we return an H1,
-        otherwise it is a H2.
+        """Return the heading text for the page.
+
+        If the view provides `IEditableContextTitle` then the top heading is
+        rendered from the view's `title_edit_widget` and is generally
+        editable.
+
+        Otherwise, if the context provides `IRootContext` then we return an
+        H1, else an H2.
         """
-        if IRootContext.providedBy(self._context):
+        # Check the view; is the title editable?
+        if IEditableContextTitle.providedBy(self._view):
+            return self._view.title_edit_widget()
+        # The title is static, but only the root context gets an H1.
+        if IIndexView.providedBy(self._view):
             heading = 'h1'
         else:
             heading = 'h2'
-
-        root = self.root_context
-        if root is None:
+        # If there is actually no root context, then it's a top-level
+        # context-less page so Launchpad.net is shown as the branding.
+        if self.root_context is None:
             title = 'Launchpad.net'
         else:
-            title = root.title
-
-        return "<%(heading)s>%(title)s</%(heading)s>" % {
-            'heading': heading,
-            'title': cgi.escape(title)
-            }
+            title = self.root_context.title
+        # For non-editable titles, generate the static heading.
+        return "<%(heading)s>%(title)s</%(heading)s>" % dict(
+            heading=heading,
+            title=cgi.escape(title),
+            )
 
     def logo(self):
         """Return the logo image for the root context."""
@@ -66,4 +76,4 @@
         elif name == "logo":
             return self.logo()
         else:
-            raise TraversalError, name
+            raise TraversalError(name)

=== modified file 'lib/lp/app/interfaces/__init__.py'
--- lib/lp/app/interfaces/__init__.py	2009-08-19 05:33:26 +0000
+++ lib/lp/app/interfaces/__init__.py	2009-09-03 23:06:50 +0000
@@ -1,1 +0,0 @@
-"""Interfaces for the Launchpad application."""

=== renamed file 'lib/lp/app/interfaces/rootcontext.py' => 'lib/lp/app/interfaces/headings.py'
--- lib/lp/app/interfaces/rootcontext.py	2009-08-19 06:18:41 +0000
+++ lib/lp/app/interfaces/headings.py	2009-09-04 12:59:09 +0000
@@ -1,10 +1,12 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""The primary context interface."""
+"""Interfaces for headings and breadcrumbs."""
 
 __metaclass__ = type
 __all__ = [
+    'IEditableContextTitle',
+    'IIndexView',
     'IRootContext',
     ]
 
@@ -16,3 +18,16 @@
     """Something that is an object off the Launchpad root."""
 
     title = Attribute('The title of the root context object.')
+
+
+class IIndexView(Interface):
+    """The index view of the current context."""
+
+    title = Attribute('The title of the context object.')
+
+
+class IEditableContextTitle(Interface):
+    """Interface specifying that the context has an editable title."""
+
+    def title_edit_widget():
+        """Return the HTML of the editable title widget."""

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2009-08-31 12:01:46 +0000
+++ lib/lp/app/templates/base-layout.pt	2009-09-03 19:12:20 +0000
@@ -4,7 +4,8 @@
   define-macro="master"
   tal:define="
     revno modules/canonical.launchpad.versioninfo/revno | string:unknown;
-    version string:Launchpad 2.2.7 (r${revno});
+    release modules/canonical.launchpad.versioninfo/release;
+    version string:Launchpad ${release} (r${revno});
     devmode modules/canonical.config/config/devmode;
     rooturl modules/canonical.launchpad.webapp.vhosts/allvhosts/configs/mainsite/rooturl;
     is_demo modules/canonical.config/config/launchpad/is_demo;
@@ -26,9 +27,12 @@
     yui string:${icingroot}/yui/3.0.0pr2/build;
     lazr_js string:${icingroot}/lazr/build;
     lp_js string:${icingroot}/build">
-    <title i18n:translate=""
-      tal:content="view/page_title|CONTEXTS/fmt:pagetitle">Launchpad</title>
-
+    <title tal:condition="context/@@+page-title/display_breadcrumbs"
+           tal:replace="structure context/@@+page-title">The Title</title>
+    <title tal:condition="not: context/@@+page-title/display_breadcrumbs"
+           i18n:translate=""
+           tal:content="view/page_title|CONTEXTS/fmt:pagetitle"
+           >Launchpad</title>
     <link rel="shortcut icon" href="/@@/launchpad.png" />
 
     <tal:atomfeeds define="feed_links view/feed_links | nothing">
@@ -92,8 +96,8 @@
 
       <div class="watermark-apps-portlet top-portlet"
            tal:condition="view/macro:pagehas/applicationtabs">
-        <span tal:replace="structure context/watermark:logo"></span>
-        <h2 tal:replace="structure context/watermark:heading">
+        <span tal:replace="structure view/watermark:logo"></span>
+        <h2 tal:replace="structure view/watermark:heading">
           Celso Providelo
         </h2>
         <metal:heading_nav
@@ -119,10 +123,10 @@
               xml:lang view/lang|default_language|default;
               dir view/dir|string:ltr">
             <div tal:condition="view/macro:pagehas/applicationtabs">
-              <h2
-                tal:condition="context/title|nothing"
-                tal:content="context/title"
-                metal:define-slot="heading" />
+            <h1 tal:condition="view/label"
+                tal:content="view/label"
+                metal:define-slot="heading"
+                >Page Label</h1>
               <tal:breadcrumbs replace="structure context/@@+hierarchy">
                 ProjectName > Branches > Merge Proposals > fix-for-navigation
               </tal:breadcrumbs>

=== added file 'lib/lp/app/templates/launchpad-page-title.pt'
--- lib/lp/app/templates/launchpad-page-title.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/app/templates/launchpad-page-title.pt	2009-09-03 19:12:20 +0000
@@ -0,0 +1,7 @@
+<title
+  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"
+  i18n:domain="launchpad"
+  tal:content="view/page_title">Page Title</title>

=== modified file 'lib/lp/blueprints/interfaces/sprint.py'
--- lib/lp/blueprints/interfaces/sprint.py	2009-08-19 23:11:16 +0000
+++ lib/lp/blueprints/interfaces/sprint.py	2009-09-03 23:06:50 +0000
@@ -27,7 +27,7 @@
     PublicPersonChoice)
 from canonical.launchpad.validators.name import name_validator
 from canonical.launchpad.interfaces.launchpad import IHasDrivers
-from lp.app.interfaces.rootcontext import IRootContext
+from lp.app.interfaces.headings import IRootContext
 from lp.registry.interfaces.role import IHasOwner
 from lp.blueprints.interfaces.specificationtarget import IHasSpecifications
 

=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml	2009-09-04 11:08:20 +0000
+++ lib/lp/bugs/browser/configure.zcml	2009-09-04 12:56:38 +0000
@@ -788,6 +788,12 @@
         class="lp.code.browser.branch.BranchHierarchy"
         template="../../app/templates/launchpad-hierarchy.pt"
         permission="zope.Public"/>
+    <browser:page
+        for="lp.bugs.interfaces.bugbranch.IBugBranch"
+        name="+page-title"
+        class="lp.code.browser.branch.BranchHierarchy"
+        template="../../app/templates/launchpad-page-title.pt"
+        permission="zope.Public"/>
     <browser:url
         for="lp.bugs.interfaces.bugbranch.IBugBranch"
         path_expression="string:+bug/${bug/id}"

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2009-09-02 23:14:55 +0000
+++ lib/lp/code/browser/configure.zcml	2009-09-03 23:06:50 +0000
@@ -10,7 +10,7 @@
     i18n_domain="launchpad">
 
   <adapter
-      provides="lp.app.interfaces.rootcontext.IRootContext"
+      provides="lp.app.interfaces.headings.IRootContext"
       for="lp.code.interfaces.branch.IBranch"
       factory="lp.code.browser.branch.branch_root_context"/>
 
@@ -159,6 +159,12 @@
         class="lp.code.browser.branch.BranchHierarchy"
         template="../../app/templates/launchpad-hierarchy.pt"
         permission="zope.Public"/>
+    <browser:page
+        for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
+        name="+page-title"
+        class="lp.code.browser.branch.BranchHierarchy"
+        template="../../app/templates/launchpad-page-title.pt"
+        permission="zope.Public"/>
     <browser:navigation
         module="lp.code.browser.branchmergeproposal"
         classes="
@@ -323,6 +329,12 @@
         class="lp.code.browser.branch.BranchHierarchy"
         template="../../app/templates/launchpad-hierarchy.pt"
         permission="zope.Public"/>
+    <browser:page
+        for="lp.code.interfaces.branchsubscription.IBranchSubscription"
+        name="+page-title"
+        class="lp.code.browser.branch.BranchHierarchy"
+        template="../../app/templates/launchpad-page-title.pt"
+        permission="zope.Public"/>
     <browser:defaultView
         for="lp.code.interfaces.branchsubscription.IBranchSubscription"
         name="+index"/>
@@ -344,6 +356,12 @@
         class="lp.code.browser.branch.BranchHierarchy"
         template="../../app/templates/launchpad-hierarchy.pt"
         permission="zope.Public"/>
+    <browser:page
+        for="lp.code.interfaces.branch.IBranch"
+        name="+page-title"
+        class="lp.code.browser.branch.BranchHierarchy"
+        template="../../app/templates/launchpad-page-title.pt"
+        permission="zope.Public"/>
     <browser:defaultView
         for="lp.code.interfaces.branch.IBranch"
         name="+index"/>
@@ -561,6 +579,12 @@
         class="lp.code.browser.branch.BranchHierarchy"
         template="../../app/templates/launchpad-hierarchy.pt"
         permission="zope.Public"/>
+    <browser:page
+        for="lp.code.interfaces.codereviewcomment.ICodeReviewComment"
+        name="+page-title"
+        class="lp.code.browser.branch.BranchHierarchy"
+        template="../../app/templates/launchpad-page-title.pt"
+        permission="zope.Public"/>
     <browser:url
         for="lp.code.interfaces.codereviewcomment.ICodeReviewComment"
         path_expression="string:comments/${id}"

=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2009-08-19 06:18:41 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2009-09-03 23:06:50 +0000
@@ -20,7 +20,7 @@
 from canonical.config import config
 from canonical.database.constants import UTC_NOW
 
-from lp.app.interfaces.rootcontext import IRootContext
+from lp.app.interfaces.headings import IRootContext
 from lp.code.browser.branch import (
     BranchAddView, BranchMirrorStatusView, BranchReviewerEditView,
     BranchSparkView, BranchView)

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-09-02 13:28:19 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-09-03 00:38:35 +0000
@@ -846,14 +846,19 @@
         <browser:pages
             for="lp.registry.interfaces.person.IPerson"
             permission="zope.Public"
+            class="lp.registry.browser.person.PersonKarmaView">
+            <browser:page
+                name="+karma"
+                template="../templates/person-karma.pt"/>
+        </browser:pages>
+        <browser:pages
+            for="lp.registry.interfaces.person.IPerson"
+            permission="zope.Public"
             class="lp.registry.browser.person.PersonView">
             <browser:page
                 name="+participation"
                 template="../templates/person-participation.pt"/>
             <browser:page
-                name="+karma"
-                template="../templates/person-karma.pt"/>
-            <browser:page
                 name="+sshkeys"
                 attribute="showSSHKeys"/>
             <browser:page

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-09-04 02:20:59 +0000
+++ lib/lp/registry/browser/person.py	2009-09-04 12:56:38 +0000
@@ -39,6 +39,7 @@
     'PersonFacets',
     'PersonGPGView',
     'PersonIndexView',
+    'PersonKarmaView',
     'PersonLanguagesView',
     'PersonLatestQuestionsView',
     'PersonNavigation',
@@ -2507,8 +2508,26 @@
             rootsite='answers')
 
 
+class PersonKarmaView(LaunchpadView):
+    """A view class used for ~person/+karma."""
+
+    @property
+    def label(self):
+        return 'Launchpad Karma for ' + cgi.escape(self.user.displayname)
+
+    @cachedproperty
+    def has_karma(self):
+        """Does the have karma?"""
+        return bool(self.context.karma_category_caches)
+
+    @cachedproperty
+    def has_expired_karma(self):
+        """Did the user have karma?"""
+        return self.context.latestKarma().count() > 0
+
+
 class PersonView(LaunchpadView, FeedsMixin):
-    """A View class used in almost all Person's pages."""
+    """A view class used in almost all Person's pages."""
 
     @cachedproperty
     def recently_approved_members(self):
@@ -2900,16 +2919,6 @@
         else:
             return getUtility(ILaunchpadCelebrities).english.englishname
 
-    @cachedproperty
-    def has_karma(self):
-        """Does the have karma?"""
-        return bool(self.context.karma_category_caches)
-
-    @cachedproperty
-    def has_expired_karma(self):
-        """Did the user have karm?."""
-        return self.context.latestKarma().count() > 0
-
     @property
     def public_private_css(self):
         """The CSS classes that represent the public or private state."""

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2009-09-04 02:20:59 +0000
+++ lib/lp/registry/browser/product.py	2009-09-04 12:56:38 +0000
@@ -54,6 +54,7 @@
 from lazr.delegates import delegates
 from canonical.launchpad import _
 from canonical.launchpad.fields import PillarAliases, PublicPersonChoice
+from lp.app.interfaces.headings import IEditableContextTitle
 from lp.bugs.interfaces.bugtask import RESOLVED_BUGTASK_STATUSES
 from lp.bugs.interfaces.bugwatch import IBugTracker
 from lp.services.worlddata.interfaces.country import ICountry
@@ -776,7 +777,7 @@
                   ProductDownloadFileMixin, UsesLaunchpadMixin):
 
     __used_for__ = IProduct
-    implements(IProductActionMenu)
+    implements(IProductActionMenu, IEditableContextTitle)
 
     def __init__(self, context, request):
         HasAnnouncementsView.__init__(self, context, request)

=== modified file 'lib/lp/registry/interfaces/distribution.py'
--- lib/lp/registry/interfaces/distribution.py	2009-08-28 06:38:41 +0000
+++ lib/lp/registry/interfaces/distribution.py	2009-09-03 23:06:50 +0000
@@ -36,7 +36,7 @@
     Description, PublicPersonChoice, Summary, Title)
 from canonical.launchpad.interfaces.structuralsubscription import (
     IStructuralSubscriptionTarget)
-from lp.app.interfaces.rootcontext import IRootContext
+from lp.app.interfaces.headings import IRootContext
 from lp.registry.interfaces.announcement import IMakesAnnouncements
 from lp.bugs.interfaces.bugtarget import (
     IBugTarget, IOfficialBugTagTargetPublic, IOfficialBugTagTargetRestricted)

=== modified file 'lib/lp/registry/interfaces/person.py'
--- lib/lp/registry/interfaces/person.py	2009-08-31 22:16:32 +0000
+++ lib/lp/registry/interfaces/person.py	2009-09-03 23:06:50 +0000
@@ -71,7 +71,7 @@
     is_valid_public_person)
 from canonical.launchpad.interfaces.account import AccountStatus, IAccount
 from canonical.launchpad.interfaces.emailaddress import IEmailAddress
-from lp.app.interfaces.rootcontext import IRootContext
+from lp.app.interfaces.headings import IRootContext
 from lp.code.interfaces.hasbranches import IHasBranches, IHasMergeProposals
 from lp.registry.interfaces.irc import IIrcID
 from lp.registry.interfaces.jabber import IJabberID

=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py	2009-08-28 06:16:06 +0000
+++ lib/lp/registry/interfaces/product.py	2009-09-03 23:06:50 +0000
@@ -40,7 +40,7 @@
     PublicPersonChoice, Summary, Title, URIField)
 from canonical.launchpad.interfaces.structuralsubscription import (
     IStructuralSubscriptionTarget)
-from lp.app.interfaces.rootcontext import IRootContext
+from lp.app.interfaces.headings import IRootContext
 from lp.code.interfaces.branchvisibilitypolicy import (
     IHasBranchVisibilityPolicy)
 from lp.code.interfaces.hasbranches import IHasBranches, IHasMergeProposals

=== modified file 'lib/lp/registry/interfaces/project.py'
--- lib/lp/registry/interfaces/project.py	2009-08-28 06:16:06 +0000
+++ lib/lp/registry/interfaces/project.py	2009-09-03 23:06:50 +0000
@@ -20,7 +20,7 @@
 from canonical.launchpad import _
 from canonical.launchpad.fields import (
     PublicPersonChoice, Summary, Title, URIField)
-from lp.app.interfaces.rootcontext import IRootContext
+from lp.app.interfaces.headings import IRootContext
 from lp.code.interfaces.branchvisibilitypolicy import (
     IHasBranchVisibilityPolicy)
 from lp.code.interfaces.hasbranches import IHasBranches, IHasMergeProposals

=== modified file 'lib/lp/registry/templates/person-karma.pt'
--- lib/lp/registry/templates/person-karma.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/person-karma.pt	2009-09-03 00:38:35 +0000
@@ -3,92 +3,73 @@
   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/onecolumn"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
->
-<body>
-
-<metal:leftportlets fill-slot="portlets_one">
-</metal:leftportlets>
-
-<metal:rightportlets fill-slot="portlets_two">
-</metal:rightportlets>
-
-<div metal:fill-slot="main"
-  tal:define="latestkarma context/latestKarma">
-
-  <h1>Launchpad karma</h1>
-
-  <p>
-    This is a summary of the Launchpad karma earned by
-    <span tal:replace="context/displayname" />, organized by activity
-    type.
-  </p>
-
-  <p id="no-karma" tal:condition="not: view/has_karma">
-    <tal:expired condition="view/has_expired_karma">
-        <tal:name replace="context/displayname" />'s karma has expired.
-    </tal:expired>
-    <tal:never condition="not: view/has_expired_karma">
-        No karma has yet been assigned to
-       <tal:name replace="context/displayname" />.
-        Karma is updated daily.
-    </tal:never>
-  </p>
-
-  <table class="listing sortable" id="karmapoints"
-    tal:condition="context/karma_category_caches">
-    <thead>
-      <tr>
-        <th>Category</th>
-        <th>Points</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr tal:repeat="cache context/karma_category_caches">
-        <td tal:content="cache/category/title">Bug Management</td>
-        <td tal:content="cache/karmavalue">10</td>
-      </tr>
-    </tbody>
-  </table>
-  <table>
-    <tr>
-      <td><b>Total:</b></td>
-      <td tal:content="context/karma">34</td>
-    </tr>
-  </table>
-
-  <tal:latest_events condition="latestkarma">
-
-    <h2>Latest actions</h2>
-
-    <table class="listing sortable" id="karmaactions">
-      <thead>
-        <tr>
-          <th>Action</th>
-          <th>Date</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr tal:repeat="karma latestkarma">
-          <td tal:content="karma/action/title">Bug Filed</td>
-          <td>
-            <span class="sortkey"
-              tal:content="karma/datecreated/fmt:datetime">2005-10-06</span>
-            <span
-              tal:attributes="title karma/datecreated/fmt:datetime"
-              tal:content="karma/datecreated/fmt:approximatedate" />
-          </td>
-        </tr>
-      </tbody>
-    </table>
-
-  </tal:latest_events>
-
-</div>
-
-</body>
+  >
+  <body>
+    <div metal:fill-slot="main"
+         tal:define="latest_karma context/latestKarma">
+
+      <p class="application-summary">
+        This is a summary of the Launchpad karma earned by
+        <span tal:replace="context/displayname" />, organized by activity
+        type.
+      </p>
+
+      <p id="no-karma" tal:condition="not: view/has_karma">
+        <tal:expired condition="view/has_expired_karma">
+            <tal:name replace="context/displayname" />'s karma has expired.
+        </tal:expired>
+        <tal:never condition="not: view/has_expired_karma">
+            No karma has yet been assigned to
+           <tal:name replace="context/displayname" />.
+            Karma is updated daily.
+        </tal:never>
+      </p>
+
+      <table class="cozy-listing" id="karmapoints"
+             tal:condition="context/karma_category_caches">
+        <tbody>
+          <tr tal:repeat="cache context/karma_category_caches">
+            <td tal:content="cache/category/title">Bug Management</td>
+            <td><strong
+                  class=""
+                  tal:attributes="class string: ${cache/category/name}-stat"
+                  tal:content="cache/karmavalue">10</strong></td>
+          </tr>
+        </tbody>
+      </table>
+      <b>Total karma:</b>
+      <tal:total_karma tal:replace="context/karma">34</tal:total_karma>
+
+      <tal:latest_events condition="latest_karma">
+        <p class="application-summary"
+           style="padding-top: 2em;" >
+          These are the latest actions which have contributed to the Launchpad
+          karma earned by <span tal:replace="context/displayname" /> and the
+          dates on which the action occurred.
+        </p>
+        <table class="listing sortable" id="karmaactions">
+          <thead>
+            <tr>
+              <th>Date</th>
+              <th>Action</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr tal:repeat="karma latest_karma">
+              <td>
+                <span class="sortkey"
+                tal:content="karma/datecreated/fmt:datetime">2005-10-06</span>
+                <span
+                  tal:attributes="title karma/datecreated/fmt:datetime"
+                  tal:content="karma/datecreated/fmt:approximatedate" />
+              </td>
+              <td tal:content="karma/action/title">Bug Filed</td>
+            </tr>
+          </tbody>
+        </table>
+      </tal:latest_events>
+    </div>
+  </body>
 </html>

=== modified file 'lib/lp/registry/templates/product-index.pt'
--- lib/lp/registry/templates/product-index.pt	2009-08-31 21:20:55 +0000
+++ lib/lp/registry/templates/product-index.pt	2009-09-02 20:40:14 +0000
@@ -6,10 +6,6 @@
   metal:use-macro="view/macro:page/main_side"
   i18n:domain="launchpad">
   <body>
-    <tal:heading metal:fill-slot="heading">
-      <h1 tal:replace="structure view/title_edit_widget">project title</h1>
-    </tal:heading>
-
     <tal:main metal:fill-slot="main"
       define="overview_menu context/menu:overview">
       <div class="top-portlet">

=== added file 'version.txt'
--- version.txt	1970-01-01 00:00:00 +0000
+++ version.txt	2009-09-01 20:24:17 +0000
@@ -0,0 +1,1 @@
+2.2.7