Merge lp:~jtv/launchpad/bug-423705 into lp:launchpad

[Jeroen T. Vermeulen]

[Jeroen T. Vermeulen (jtv)]

= Bug 423705: 3.0 Person Translations page =

This branch converts the Person page in Translations to the 3.0 style.
It also transforms the translation activity (previously "history")
listing on that page into something more like what we drew up in Buenos
Aires (minus the squiggles where the straight lines were supposed to be
:-)

The activity listing no longer floods the page with your complete
translation history; the full list has moved to a new "activity" page.
The person page now only shows the latest 10 entries.

What you see on the new page is a bit more detailed than the short list,
but also less detailed than what the existing Person page shows. The
reason is that it originally had a mixed bag of purposes, including
helping people reach the translations they've been working on. But for
that we now have the "translations you need to review" and "translations
you can help complete" listings.

I tried to get a two-column layout working for this page, but couldn't
because the elements on the page are much too variable. Each of the
portlets is conditional, all with different conditions. No static
layout is going to make that work well for even a reasonable number of
cases.

== Test ==

Best to run all Translations stories, as I did, but in particular:
{{{
./bin/test -vv -t xx-person-activity
}}}

== Demo and Q/A ==

For a nicely filled example, go to Carlos' home page:

    https://translations.launchpad.dev/~carlos

It gets better if you look at the same page but logged in as Carlos
(<email address hidden> / test).

From there, click on the "See all" link on the right, at the bottom of
the activity list. That takes you to the new, batched full activity
listing.

Also look at an empty page:

    https://translations.launchpad.dev/~salgado

And finally, there's the warning if you haven't set your preferred
languages. Log in as Brad (<email address hidden> / test) and visit Brad's
Translations page:

    https://translations.launchpad.dev/~bac

The "Please set them now" link will take you to the settings page where
you can select preferred languages.

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

Linting changed files:
  lib/canonical/launchpad/pagetitles.py
  lib/canonical/launchpad/webapp/configure.zcml
  lib/canonical/launchpad/webapp/tales.py
  lib/lp/translations/browser/configure.zcml
  lib/lp/translations/browser/person.py
  lib/lp/translations/stories/standalone/xx-person-activity.txt
  lib/lp/translations/templates/person-navlinks.pt
  lib/lp/translations/templates/person-translation-activity.pt
  lib/lp/translations/templates/person-translations-to-complete-table.pt
  lib/lp/translations/templates/person-translations-to-review-table.pt
  lib/lp/translations/templates/person-translations.pt

=== Pylint notices ===

lib/canonical/launchpad/webapp/tales.py
    21: [F0401] Unable to import 'lazr.enum' (No module named enum)
}}}

I'm not planning to do anything about that last one.

Jeroen

[Abel Deuring (adeuring)]

Hi Jeroen,

a very nice branch. We discussed two minor changes in IRC, please apply them

review: Approve

[Michael Nelson (michael.nelson)]

Great work Jeroen!

The index page looks great!

Note: RE the icons not displaying, I'd say you just need to add icon='info' to your menu 'Link's.

We agreed it would be good to perhaps not include the edit translation guidelines here on the index page, but are not including it as part of this update.

<jtv> Anyone free to give me a UI review for https://code.edge.launchpad.net/~jtv/launchpad/bug-423705/+merge/11519 ? noodles775 maybe?
<noodles775> jtv: I could - but I just saw that barry will be around on ocr soon - would you mind if I leave it to him?
<jtv> noodles775: I _hate_ to nag (well, except end-users) but this branch has been sitting on the review queue for a while, been accidentally removed from it, put back etc. If barry has no time, that pushes this to next week.
* jtv bats eyelids at noodles
<noodles775> jtv: ah, do you need to leave soon?
<jtv> noodles775: ideally, yes, though I don't think it's particularly likely :-)
<noodles775> OK, looking now...
<jtv> noodles775: great, thanks!
<noodles775> jtv: just noticed that I think you're doing something similar to https://launchpad.dev/~carlos/+related-software
<noodles775> with the 'sub-menu'...
<noodles775> The only difference being the icons?
<noodles775> jtv: btw, the index page looks great!
<jtv> noodles775: actually I copied the whole idea from there. :) _Keine_ _blasse_ _Ahnung_ why those icons don't appear for me. :(
<noodles775> heh
<jtv> noodles775: (glad you like the page btw)
<noodles775> jtv: I'm not sure about having the full translation groups table there? Well, at least the edit translation guidelines link... what do you think? I just noticed if you edit the translation guideline you obviously don't end up back on the same page...
<noodles775> But then again, I guess that's similar to clicking on the needs [link]2 strings reviewed[/link]
<jtv> noodles775: it's one of those things I would've liked to update, but avoided on the "timely and within the review limit beats perfect" principle.
<noodles775> jtv: yep, sure.
<jtv> noodles775: I do agree it can do with a makeover though
<jtv> (Or since this is all just outward appearance, is it really a combover?)

review: Approve (ui)

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-09-10 01:35:03 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-09-10 10:09:18 +0000
@@ -739,8 +739,6 @@
 
 person_specworkload = ContextDisplayName('Blueprint workload for %s')
 
-person_translations = ContextDisplayName('Translations related to %s')
-
 person_translations_to_review = ContextDisplayName(
     'Translations for review by %s')
 

=== modified file 'lib/canonical/launchpad/webapp/configure.zcml'
--- lib/canonical/launchpad/webapp/configure.zcml	2009-09-01 08:37:31 +0000
+++ lib/canonical/launchpad/webapp/configure.zcml	2009-09-09 11:45:55 +0000
@@ -513,6 +513,12 @@
         name="fmt"
         />
     <adapter
+        for="lp.translations.interfaces.pofile.IPOFile"
+        provides="zope.traversing.interfaces.IPathAdapter"
+        factory="canonical.launchpad.webapp.tales.POFileFormatterAPI"
+        name="fmt"
+        />
+    <adapter
         for="*"
         provides="zope.traversing.interfaces.IPathAdapter"
         factory="canonical.launchpad.webapp.tales.PermissionRequiredQuery"

=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py	2009-09-07 12:16:29 +0000
+++ lib/canonical/launchpad/webapp/tales.py	2009-09-09 11:45:55 +0000
@@ -3181,3 +3181,27 @@
     def displayname(self, view_name, rootsite=None):
         """Return the displayname as a string."""
         return self._context.title
+
+
+class POFileFormatterAPI(ObjectFormatterAPI):
+    """Adapter for `IPOFile` objects to a formatted string."""
+
+    traversable_names = {
+        'link': 'link',
+        'url': 'url', 
+        'displayname': 'displayname',
+    }
+
+    def url(self, view_name=None, rootsite='translations'):
+        """See `ObjectFormatterAPI`."""
+        return super(POFileFormatterAPI, self).url(view_name, rootsite)
+
+    def link(self, view_name, rootsite='translations'):
+        """See `ObjectFormatterAPI`."""
+        pofile = self._context
+        url = self.url(view_name, rootsite)
+        return u'<a href="%s">%s</a>' % (url, cgi.escape(pofile.title))
+
+    def displayname(self, view_name, rootsite=None):
+        """Return the displayname as a string."""
+        return self._context.title

=== modified file 'lib/lp/translations/browser/configure.zcml'
--- lib/lp/translations/browser/configure.zcml	2009-09-01 11:09:53 +0000
+++ lib/lp/translations/browser/configure.zcml	2009-09-10 10:09:18 +0000
@@ -709,7 +709,6 @@
         <browser:page
             for="lp.registry.interfaces.person.IPerson"
             name="+licensing"
-            facet="translations"
             class="
               lp.translations.browser.person.PersonTranslationRelicensingView"
             permission="launchpad.Edit"
@@ -719,12 +718,24 @@
             for="lp.registry.interfaces.person.IPerson"
             name="+imports"
             class="lp.translations.browser.hastranslationimports.HasTranslationImportsView"
-            facet="translations"
             permission="zope.Public"
             template="../templates/hastranslationimports-index.pt"
             layer="canonical.launchpad.layers.TranslationsLayer"/>
         <browser:page
             for="lp.registry.interfaces.person.IPerson"
+            class="lp.translations.browser.person.PersonTranslationView"
+            permission="zope.Public"
+            name="+person-navlinks"
+            template="../templates/person-navlinks.pt"/>
+        <browser:page
+            for="lp.registry.interfaces.person.IPerson"
+            name="+activity"
+            class="lp.translations.browser.person.TranslationActivityView"
+            permission="zope.Public"
+            template="../templates/person-translation-activity.pt"
+            layer="canonical.launchpad.layers.TranslationsLayer"/>
+        <browser:page
+            for="lp.registry.interfaces.person.IPerson"
             name="+translations-to-review"
             class="lp.translations.browser.person.PersonTranslationView"
             permission="zope.Public"

=== modified file 'lib/lp/translations/browser/person.py'
--- lib/lp/translations/browser/person.py	2009-09-09 16:49:35 +0000
+++ lib/lp/translations/browser/person.py	2009-09-10 11:56:21 +0000
@@ -8,13 +8,16 @@
 __all__ = [
     'PersonTranslationView',
     'PersonTranslationRelicensingView',
+    'TranslationActivityView',
 ]
 
 from datetime import datetime, timedelta
 import pytz
 import urllib
+
 from zope.app.form.browser import TextWidget
 from zope.component import getUtility
+from zope.interface import implements, Interface
 
 from canonical.launchpad import _
 from canonical.launchpad.webapp.interfaces import ILaunchBag
@@ -25,7 +28,6 @@
 from canonical.launchpad.webapp.batching import BatchNavigator
 from canonical.launchpad.webapp.publisher import LaunchpadView
 from canonical.widgets import LaunchpadRadioWidget
-from lp.registry.interfaces.person import IPerson
 from lp.registry.interfaces.sourcepackage import ISourcePackage
 from lp.translations.browser.translationlinksaggregator import (
     TranslationLinksAggregator)
@@ -89,18 +91,56 @@
         return pofile.untranslatedCount()
 
 
+def compose_pofile_filter_url(pofile, person):
+    """Compose URL for `Person`'s contributions to `POFile`."""
+    person_name = urllib.urlencode({'person': person.name})
+    return canonical_url(pofile) + "/+filter?%s" % person_name
+
+
+class ActivityDescriptor:
+    """Description of a past translation activity."""
+
+    date = None
+    title = None
+    url = None
+
+    def __init__(self, person, pofiletranslator):
+        """Describe a past translation activity by `person`.
+
+        :param person: The `Person` whose activity is being described.
+        :param pofiletranslator: A `POFileTranslator` record for
+            `person`.
+        """
+        assert person == pofiletranslator.person, (
+            "This POFileTranslator record is for the wrong person.")
+
+        self.date = pofiletranslator.date_last_touched
+
+        pofile = pofiletranslator.pofile
+
+        self.title = pofile.potemplate.translationtarget.title
+        self.url = compose_pofile_filter_url(pofile, person)
+
+
 def person_is_reviewer(person):
     """Is `person` a translations reviewer?"""
     groups = ITranslationsPerson(person).translation_groups
     return groups.any() is not None
 
 
+class IPersonTranslationsMenu(Interface):
+    """Marker interface for `Person` Translations navigation menu."""
+
+
 class PersonTranslationsMenu(NavigationMenu):
 
-    usedfor = IPerson
+    usedfor = IPersonTranslationsMenu
     facet = 'translations'
     links = ('overview', 'licensing', 'imports', 'translations_to_review')
-    title = "Related pages"
+
+    @property
+    def person(self):
+        return self.context.context
 
     def overview(self):
         text = 'Overview'
@@ -112,37 +152,45 @@
 
     def licensing(self):
         text = 'Translations licensing'
-        enabled = (self.context == self.user)
+        enabled = (self.person == self.user)
         return Link('+licensing', text, enabled=enabled)
 
     def translations_to_review(self):
         text = 'Translations to review'
-        enabled = person_is_reviewer(self.context)
+        enabled = person_is_reviewer(self.person)
         return Link('+translations-to-review', text, enabled=enabled)
 
 
 class PersonTranslationView(LaunchpadView):
     """View for translation-related Person pages."""
+    implements(IPersonTranslationsMenu)
 
-    _pofiletranslator_cache = None
+    reviews_to_show = 10
 
     def __init__(self, *args, **kwargs):
         super(PersonTranslationView, self).__init__(*args, **kwargs)
         now = datetime.now(pytz.timezone('UTC'))
         self.history_horizon = now - timedelta(90, 0, 0)
 
-    @cachedproperty
-    def batchnav(self):
+    @property
+    def page_title(self):
+        return "Translations related to %s" % self.context.displayname
+
+    @cachedproperty
+    def recent_activity(self):
+        """Recent translation activity by this person."""
+        entries = ITranslationsPerson(self.context).translation_history[:10]
+        return [ActivityDescriptor(self.context, entry) for entry in entries]
+
+    @cachedproperty
+    def latest_activity(self):
+        """Single latest translation activity by this person."""
         translations_person = ITranslationsPerson(self.context)
-        batchnav = BatchNavigator(
-            translations_person.translation_history, self.request)
-
-        pofiletranslatorset = getUtility(IPOFileTranslatorSet)
-        batch = batchnav.currentBatch()
-        self._pofiletranslator_cache = (
-            pofiletranslatorset.prefetchPOFileTranslatorRelations(batch))
-
-        return batchnav
+        latest = list(translations_person.translation_history[:1])
+        if len(latest) == 0:
+            return None
+        else:
+            return ActivityDescriptor(self.context, latest[0])
 
     @cachedproperty
     def translation_groups(self):
@@ -156,11 +204,6 @@
         translations_person = ITranslationsPerson(self.context)
         return list(translations_person.translators)
 
-    @cachedproperty
-    def person_filter_querystring(self):
-        """Return person's name appropriate for including in links."""
-        return urllib.urlencode({'person': self.context.name})
-
     @property
     def person_is_reviewer(self):
         """Is this person in a translation group?"""
@@ -429,3 +472,29 @@
                 "Unknown allow_relicensing value: %r" % allow_relicensing)
         self.next_url = self.getSafeRedirectURL(data['back_to'])
 
+
+class TranslationActivityView(LaunchpadView):
+    """View for person's activity listing."""
+
+    _pofiletranslator_cache = None
+
+    @property
+    def page_title(self):
+        return "Translation activity by %s" % self.context.displayname
+
+    @cachedproperty
+    def batchnav(self):
+        """Iterate over person's translation_history."""
+        translations_person = ITranslationsPerson(self.context)
+        batchnav = BatchNavigator(
+            translations_person.translation_history, self.request)
+
+        pofiletranslatorset = getUtility(IPOFileTranslatorSet)
+        batch = batchnav.currentBatch()
+        self._pofiletranslator_cache = (
+            pofiletranslatorset.prefetchPOFileTranslatorRelations(batch))
+
+        return batchnav
+
+    def composeURL(self, pofile):
+        return compose_pofile_filter_url(pofile, self.context)

=== renamed file 'lib/lp/translations/stories/standalone/xx-person-translations.txt' => 'lib/lp/translations/stories/standalone/xx-person-activity.txt'
--- lib/lp/translations/stories/standalone/xx-person-translations.txt	2009-09-01 09:51:12 +0000
+++ lib/lp/translations/stories/standalone/xx-person-activity.txt	2009-09-10 11:56:21 +0000
@@ -1,13 +1,13 @@
-Test that the person's translation history page displays the latest
-translations and translation groups related to the person in question.
+Person's translation activity
+=============================
+
+A person's translation activity page displays the translations that the
+person has contributed to.
+
+Here the person whose activity we're going to look at is Carlos.
 
     >>> anon_browser.open(
-    ...     "http://translations.launchpad.dev/people/carlos/+translations")
-
-    >>> header = find_tag_by_id(
-    ...     anon_browser.contents, 'translation-history-header')
-    >>> print extract_text(header)
-    Applications and packages translated
+    ...     "http://translations.launchpad.dev/people/carlos/+activity")
 
 The user can see in the page navigation that Carlos has so far worked
 on six files, five of which are shown on this page.
@@ -20,74 +20,60 @@
 
     # Prints a heading and formatted list of POFiles and latest submissions.
     >>> import re
-    >>> def print_list_of_contributions(listing):
-    ...     listing_head = listing.findAll('thead')[0].findAll('tr')[0]
-    ...     heading_cells = listing_head.findAll('th')
-    ...     print "%-24s %-8s %-8s %-26s" % (
-    ...         extract_text(heading_cells[0]),
-    ...         extract_text(heading_cells[1])[:6] + '...',
-    ...         extract_text(heading_cells[2])[:6] + '...',
-    ...         extract_text(heading_cells[3]))
-    ...     listing_body = listing.find('tbody')
-    ...     for row in listing_body.findAll('tr'):
-    ...         cells = row.findAll('td')
-    ...         pofile = extract_text(cells[0])
-    ...         if len(pofile) > 24:
-    ...             pofile = pofile[:21] + '...'
-    ...         untranslated = extract_text(cells[1])
-    ...         needs_review = extract_text(cells[2])
-    ...         message = re.sub(' +', ' ', extract_text(cells[3]))
-    ...         if len(message) > 26:
-    ...             message = message[:23] + '...'
-    ...         print "%-24s %-10s %-10s %-26s" % (
-    ...             pofile, untranslated, needs_review, message)
-
-    >>> listing = find_tags_by_class(anon_browser.contents, 'listing')[0]
-    >>> print_list_of_contributions(listing)
-    Translation file         Untra... Need... Latest translation
-    English (en) translat... 6        0        2007-07-12    auto, esddsp...
-    Spanish (es) translat... 3        0        2007-04-07    _: EMAIL OF ...
-    Spanish (es) translat... 0        0        2007-01-24    test man pag...
-    Spanish (es) translat... 14       2        2006-12-22    have    lalalala
-    Japanese (ja) transla... 21       0        2005-10-11    %d contact    %...
-
-When the user clicks one of the entries, he is shown a page listing
-all translations done by Carlos in this file.
+    >>> def print_activity_list(listing):
+    ...     for row in listing.findAll('tr'):
+    ...         print extract_text(row)
+
+    >>> listing = find_tag_by_id(anon_browser.contents, 'activity-table')
+    >>> print_activity_list(listing)
+    2007-07-12
+    English (en) translation of pkgconf-mozilla in Ubuntu Hoary package
+    "mozilla"
+    2007-04-07
+    Spanish (es) translation of alsa-utils in alsa-utils trunk
+    2007-01-24
+    Spanish (es) translation of man in Ubuntu Hoary package "evolution"
+    2006-12-22
+    Spanish (es) translation of evolution-2.2 in Evolution trunk
+    2005-10-11
+    Japanese (ja) translation of evolution-2.2 in Ubuntu Hoary package
+    "evolution"
+
+Clicking one of the entries takes you to a page listing all of Carlos'
+contributions to the selected translation.
 
     >>> alsa_utils_link = 'Spanish (es) translation of alsa-utils in alsa-utils trunk'
     >>> anon_browser.getLink(alsa_utils_link).click()
-    >>> anon_browser.title
-    'Translations by Carlos...of alsa-utils...'
-
-From the full listing of all contributions, Carlos can jump to the pages
-containing only untranslated or only translations that need reviewing.
-
-    >>> anon_browser.goBack()
-    >>> untranslated_link = find_tags_by_class(anon_browser.contents,
-    ...                                        'untranslated-count')[1]
-    >>> extract_link_from_tag(untranslated_link)
-    u'/alsa-utils/trunk/+pots/alsa-utils/es/+translate?show=untranslated'
-
-    >>> unreviewed_link = find_tags_by_class(anon_browser.contents,
-    ...                                      'unreviewed-count')[1]
-    >>> extract_link_from_tag(unreviewed_link)
-    u'/alsa-utils/trunk/+pots/alsa-utils/es/+translate?show=new_suggestions'
-
-A person is created with a name containing characters that need escaping
-before being used in query strings.
+    >>> print anon_browser.title
+    Translations by Carlos...of alsa-utils...
+
+
+URL-escaped user names
+----------------------
+
+Since the user's name is included in the URL, and user names can contain
+some slightly weird characters, it is escaped especially for this usage.
+
+For instance, here's a user called a+b.
 
     >>> login('[e-mail]')
-    >>> foobar = factory.makePerson(name='foo+bar', email='[e-mail]')
-    >>> message = factory.makeTranslationMessage(translator=foobar)
-    >>> person_url = canonical_url(foobar, rootsite='translations')
+    >>> ab = factory.makePerson(name='a+b')
+    >>> message = factory.makeTranslationMessage(translator=ab)
+    >>> person_url = canonical_url(ab, rootsite='translations')
     >>> logout()
 
-When that person goes to see the translations she has done, she sees
-a correctly encoded link to a filtered PO file page.
-
-    >>> user_browser.open(person_url)
-    >>> table = first_tag_by_class(user_browser.contents, 'listing')
-    >>> tbody = table.find('tbody')
-    >>> link = tbody.find('a')
-    >>> link['href'].split('/')[-1]
-    u'+filter?person=foo%2Bbar'
+When a+b goes to see the translations she has done, she sees a correctly
+encoded link to a filtered PO file page.
+
+    >>> user_browser.open(person_url + '/+activity')
+    >>> table = find_tag_by_id(user_browser.contents, 'activity-table')
+    >>> link = table.find('a')
+    >>> url = link['href']
+    >>> print url.split('/')[-1]
+    +filter?person=a%2Bb
+
+Because of this, the link actually works.
+
+    >>> user_browser.open(url.encode('ascii'))
+    >>> print user_browser.title
+    Translations by ...

=== added file 'lib/lp/translations/templates/person-navlinks.pt'
--- lib/lp/translations/templates/person-navlinks.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/templates/person-navlinks.pt	2009-09-10 11:56:21 +0000
@@ -0,0 +1,21 @@
+<tal:root
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  omit-tag="">
+
+  <ul id="navlinks" class="horizontal">
+    <li>
+      <a tal:replace="structure view/menu:navigation/overview/render"/>
+    </li>
+    <li>
+      <a tal:replace="structure view/menu:navigation/licensing/render"/>
+    </li>
+    <li>
+      <a tal:replace="structure view/menu:navigation/imports/render"/>
+    </li>
+    <li>
+      <a tal:replace="structure view/menu:navigation/translations_to_review/render"/>
+    </li>
+  </ul>
+</tal:root>

=== added file 'lib/lp/translations/templates/person-translation-activity.pt'
--- lib/lp/translations/templates/person-translation-activity.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/templates/person-translation-activity.pt	2009-09-10 11:53:09 +0000
@@ -0,0 +1,41 @@
+<html
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="view/macro:page/main_only"
+>
+<body>
+  <div metal:fill-slot="main">
+    <div class="top-portlet" style="max-width: 800px">
+      <p>
+        <tal:person replace="structure context/fmt:link">R. Viewer</tal:person>
+        has contributed to the following translations.
+      </p>
+
+      <div class="lesser" id="top-navigation">
+        <tal:navigation content="structure view/batchnav/@@+navigation-links-upper" />
+      </div>
+
+      <table class="listing" id="activity-table">
+        <tr tal:repeat="record view/batchnav/currentBatch">
+          <td tal:attributes="title record/date_last_touched/fmt:datetime"
+              tal:content="record/date_last_touched/fmt:approximatedate">
+            2009-10-28
+          </td>
+          <td>
+            <a tal:attributes="href python:view.composeURL(record.pofile)"
+               tal:content="record/pofile/title">
+              Greek (el) translations of alsa-utils in alsa-utils trunk
+            </a>
+          </td>
+        </tr>
+      </table>
+
+      <div class="lesser">
+        <tal:navigation content="structure view/batchnav/@@+navigation-links-lower" />
+      </div>
+    </div>
+  </div>
+</body>
+</html>

=== modified file 'lib/lp/translations/templates/person-translations-to-complete-table.pt'
--- lib/lp/translations/templates/person-translations-to-complete-table.pt	2009-08-28 09:44:31 +0000
+++ lib/lp/translations/templates/person-translations-to-complete-table.pt	2009-09-09 09:51:14 +0000
@@ -4,7 +4,7 @@
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   omit-tag="">
 
-<table class="listing" id="translations-to-complete-table">
+<table class="summary" id="translations-to-complete-table">
   <tr tal:repeat="target_info view/top_projects_and_packages_to_translate">
     <td>
       <tal:product condition="target_info/is_product"

=== modified file 'lib/lp/translations/templates/person-translations-to-review-table.pt'
--- lib/lp/translations/templates/person-translations-to-review-table.pt	2009-08-12 07:59:37 +0000
+++ lib/lp/translations/templates/person-translations-to-review-table.pt	2009-09-09 09:51:14 +0000
@@ -4,7 +4,7 @@
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   omit-tag="">
 
-<table class="listing" id="translations-to-review-table">
+<table class="summary" id="translations-to-review-table">
   <tr tal:repeat="target_info view/top_projects_and_packages_to_review">
     <td>
       <tal:product condition="target_info/is_product"

=== modified file 'lib/lp/translations/templates/person-translations.pt'
--- lib/lp/translations/templates/person-translations.pt	2009-09-09 16:49:35 +0000
+++ lib/lp/translations/templates/person-translations.pt	2009-09-10 11:53:09 +0000
@@ -3,35 +3,56 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="view/macro:page/onecolumn"
 >
 
 <body>
 
-<h1>Translations related to <tal:name content="context/displayname" /></h1>
+<div metal:fill-slot="heading">
+  <h1 tal:content="view/page_title" />
+</div>
 
 <div metal:fill-slot="main">
+  <div class="top-portlet">
+    <tal:navlinks replace="structure context/@@+person-navlinks" />
+  </div>
 
   <tal:me condition="view/person_includes_me">
-    <p tal:condition="view/requires_preferred_languages" id="no-languages">
+    <div tal:condition="view/requires_preferred_languages"
+         class="portlet"
+         id="no-languages">
       You have not selected your preferred languages.  Please
       <a href="/+editmylanguages" id="set-languages">set them now</a>.
-    </p>
+    </div>
+  </tal:me>
+
+  <div class="portlet">
+    <tal:active tal:condition="view/latest_activity">
+      Last translation activity by
+      <tal:name replace="context/displayname">Foo Bar</tal:name>
+      was
+      <tal:date replace="view/latest_activity/date/fmt:displaydate">
+        on 2009-10-12</tal:date>.
+    </tal:active>
+    <tal:inactive tal:condition="not: view/latest_activity">
+      No translation activities recorded for
+      <tal:name replace="context/displayname">Foo Bar</tal:name>.
+    </tal:inactive>
+  </div>
+
+  <tal:me condition="view/person_includes_me">
     <tal:reviewer condition="view/person_is_reviewer">
-      <div id="translations-to-review-section" style="max-width:800px">
-          <span style="float:right">
-            <a href="http://help.launchpad.net/Translations/Reviewing">
-              Why is this important?
-            </a>
-          </span>
+      <div id="translations-to-review-section" class="portlet">
         <h2>Translations you need to review</h2>
+        <span style="display:block; text-align:right">
+          <a href="http://help.launchpad.net/Translations/Reviewing">
+            Why is this important?
+          </a>
+        </span>
         <metal:translations-to-review
           tal:replace="structure context/@@+translations-to-review-table" />
-        <span style="float:right"
+        <span style="display:block; text-align:right"
               tal:condition="python: view.num_projects_and_packages_to_review > 1">
           <a href="+translations-to-review" id="translations-to-review-link">
             See all
@@ -42,9 +63,11 @@
         </span>
       </div>
     </tal:reviewer>
+  </tal:me>
 
+  <tal:me condition="view/person_includes_me">
     <tal:translator condition="view/person_is_translator">
-      <div id="translations-to-complete-section" style="max-width:800px">
+      <div id="translations-to-complete-section" class="portlet">
         <h2>Translations you can help complete</h2>
         <metal:translations-to-complete
           tal:replace="structure context/@@+translations-to-complete-table" />
@@ -52,87 +75,40 @@
     </tal:translator>
   </tal:me>
 
-
-  <h2 id="translation-history-header">Applications and packages translated</h2>
-
-  <tal:block define="history view/batchnav/currentBatch">
-
-    <tal:block condition="history">
-
-      <div class="lesser" id="top-navigation">
-        <tal:navigation content="structure view/batchnav/@@+navigation-links-upper" />
-      </div>
-
-      <table class="listing" style="max-width:800px">
-        <thead>
-          <tr>
-            <th>Translation file</th>
-            <th>Untranslated</th>
-            <th>Need review</th>
-            <th>Latest translation</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr tal:repeat="record history">
-            <tal:block define="translationmessage record/latest_message">
-            <td><a tal:content="record/pofile/title"
-                   tal:attributes="href string:${record/pofile/fmt:url}/+filter?${view/person_filter_querystring}">foo bar in package bla</a>
-            </td>
-            <td><a tal:content="record/pofile/untranslatedCount"
-                   tal:attributes="href string:${record/pofile/fmt:url}/+translate?show=untranslated"
-                   class="untranslated-count"
-                   >17</a>
-            </td>
-            <td><a tal:content="record/pofile/unreviewedCount"
-                   tal:attributes="href string:${record/pofile/fmt:url}/+translate?show=new_suggestions"
-                   class="unreviewed-count"
-                   >17</a>
-            </td>
-            <td style="padding-left: 2em;">
-              <em
-                tal:attributes="title record/date_last_touched/fmt:datetime"
-                tal:content="record/date_last_touched/fmt:approximatedate"
-                style="margin-left: -2em;" />
-              <div tal:content="translationmessage/potmsgset/singular_text" />
-              <div
-                tal:condition="python:not(view.should_display_message(translationmessage))">
-                <strong>For privacy reasons this translation is not visible to
-                 anonymous visitors.  To see it,
-                <a href="+login">log in</a> first.</strong></div>
-              <div
-                tal:condition="python:view.should_display_message(translationmessage)">
-                <tal:block
-                  tal:condition="translationmessage/msgstr0"
-                  tal:content="translationmessage/msgstr0/translation" />
-              </div>
-            </td>
-            </tal:block>
-          </tr>
-        </tbody>
-      </table>
-
-      <div class="lesser">
-        <tal:navigation content="structure view/batchnav/@@+navigation-links-lower" />
-      </div>
-
-    </tal:block>
-
-    <tal:block condition="not: history">
-      <p><i>No translations recorded from
-      <span tal:replace="context/displayname">Foo Bar</span>.</i></p>
+  <tal:block tal:define="activities view/recent_activity">
+    <tal:block condition="activities">
+      <div class="portlet">
+        <h2>Activity</h2>
+        <p>
+          These are the translations that
+          <tal:name replace="context/displayname">Foo Bar</tal:name>
+          last worked on:
+        </p>
+        <table class="summary">
+          <tr tal:repeat="activity activities">
+            <td tal:attributes="title activity/date/fmt:datetime"
+                tal:content="activity/date/fmt:approximatedate">
+              2009-08-15
+            </td>
+            <td>
+              <a tal:content="activity/title"
+                 tal:attributes="href activity/url">foo bar in package bla</a>
+            </td>
+          </tr>
+        </table>
+        <span style="display:block; text-align:right">
+          <a href="+activity">See all</a>
+        </span>
+      </div>
     </tal:block>
   </tal:block>
 
-  <tal:block condition="view/translation_groups">
-
+  <div tal:condition="view/translation_groups" class="portlet">
     <h2>Translation Groups</h2>
-
     <span tal:replace="context/displayname">Mark Shuttleworth</span> is
     a member of the following translation groups:
 
-    <table class="listing"
-           id="translation-group-memberships"
-           style="max-width:800px">
+    <table class="listing" id="translation-group-memberships">
       <thead>
         <tr>
           <th>Translation group</th>
@@ -158,9 +134,7 @@
         </tr>
       </tbody>
     </table>
-
-  </tal:block>
-
+  </div>
 </div>
 </body>
 </html>