Merge lp:~danilo/launchpad/bug-417082 into lp:launchpad

[Данило Шеган]

[Данило Шеган (danilo)]

 reviewer jtv

= Bug #417082 =

Migrate translation group overview pages and all the related forms to 3.0.

I have not provided any more tests. I'd like to provide some for
Breadcrumb adapters, and at least basic tests for views but branch will
go very quickly (and I'd be happy to get a merge-conditional on that).

== Tests ==

bin/test -vvt translationgroup

== Demo and Q/A ==

https://translations.launchpad.dev/+groups/launchpad-translators
https://translations.launchpad.dev/+groups/ubuntu-translators

= Launchpad lint =

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

Linting changed files:
  lib/lp/translations/stories/translationgroups/05-add-translation-group.txt
  lib/lp/translations/stories/translationgroups/45-test-distro-restricted-permissions.txt
  lib/lp/translations/browser/configure.zcml
  lib/lp/translations/templates/translationgroup-reassignment.pt
  lib/lp/translations/templates/translationgroup-portlet-projects.pt
  lib/lp/translations/templates/translationgroup-index.pt
  lib/lp/translations/stories/translationgroups/30-show-group-translation-targets.txt
  lib/lp/translations/stories/translationgroups/36-change-translator.txt
  lib/lp/translations/configure.zcml
  lib/lp/translations/browser/translationgroup.py
  lib/lp/translations/stories/translationgroups/06-edit-translation-group.txt
  lib/lp/translations/stories/translationgroups/xx-link-to-documentation.txt
  lib/lp/translations/stories/translationgroups/35-appoint-translators.txt

[Jeroen T. Vermeulen (jtv)]

The code looks good to me, although it's a shame there are still several
"style" attributes in the TAL. The UI looks much nicer than it is now.

One thing I don't care for in the translation group page is how, under
"Projects using this group," the references to the group itself are
linkified. It does make it clear that the text refers to a named
object, but the name's capitalization generally does that anyway. It's
a bit restless to have two consecutive paragraphs each link back to the
same page they're on. Especially since there's also a link to the
Translation Teams section on the same page.

Speaking of that link: when you have that paragraph in view, unless
you're working on a telephone screen, it's just about impossible not to
have the Translation Teams section visible at the same time. I'd just
leave these links out.

I also noticed that the Guidelines URLs in the table can get a bit ugly,
but I don't see any better way of showing them.

None of this is fatal, but please make an effort to improve these points
if you can.

On the other hand, I'm deliberately not asking for breadcrumb tests. If
the breadcrumb breaks, the pagetests will show it. Or if we're going to
test that every breadcrumb in the UI appears when we expect it to, we'd
better have a generic, lightweight way of doing it everywhere. The real
problem with breadcrumbs is usually them not being designed in in the
first place, and that's not something that a test will change in this
case.

Jeroen

review: Approve

=== modified file 'lib/lp/translations/browser/configure.zcml'
--- lib/lp/translations/browser/configure.zcml	2009-08-25 14:35:03 +0000
+++ lib/lp/translations/browser/configure.zcml	2009-08-25 16:52:31 +0000
@@ -448,6 +448,7 @@
         <browser:url
             for="lp.translations.interfaces.translationgroup.ITranslationGroup"
             path_expression="name"
+            rootsite="translations"
             parent_utility="lp.translations.interfaces.translationgroup.ITranslationGroupSet"/>
         <browser:pages
             for="lp.translations.interfaces.translationgroup.ITranslationGroup"
@@ -457,29 +458,26 @@
             <browser:page
                 template="../templates/translationgroup-index.pt"
                 name="+index"/>
-            
+
             <!-- TranslationGroup portlets -->
-            
-            <browser:page
-                name="+portlet-relateds"
-                template="../templates/translationgroup-portlet-relateds.pt"/>
-            <browser:page
-                name="+portlet-details"
-                template="../templates/translationgroup-portlet-details.pt"/>
+
+            <browser:page
+                name="+portlet-projects"
+                template="../templates/translationgroup-portlet-projects.pt"/>
         </browser:pages>
         <browser:page
             name="+edit"
             for="lp.translations.interfaces.translationgroup.ITranslationGroup"
             permission="launchpad.Edit"
             class="lp.translations.browser.translationgroup.TranslationGroupEditView"
-            template="../templates/translationgroup-edit.pt"
+            template="../../app/templates/generic-edit.pt"
             layer="canonical.launchpad.layers.TranslationsLayer"/>
         <browser:page
             name="+appoint"
             for="lp.translations.interfaces.translationgroup.ITranslationGroup"
             permission="launchpad.Edit"
             class="lp.translations.browser.translationgroup.TranslationGroupAddTranslatorView"
-            template="../templates/translationgroup-appoint.pt"
+            template="../../app/templates/generic-edit.pt"
             layer="canonical.launchpad.layers.TranslationsLayer"/>
         <browser:page
             name="+reassign"

=== modified file 'lib/lp/translations/browser/translationgroup.py'
--- lib/lp/translations/browser/translationgroup.py	2009-08-25 14:32:37 +0000
+++ lib/lp/translations/browser/translationgroup.py	2009-08-25 16:44:22 +0000
@@ -7,6 +7,7 @@
 __all__ = [
     'TranslationGroupAddTranslatorView',
     'TranslationGroupAddView',
+    'TranslationGroupBreadcrumb',
     'TranslationGroupEditView',
     'TranslationGroupNavigation',
     'TranslationGroupReassignmentView',
@@ -49,6 +50,13 @@
     text = u"Translation groups"
 
 
+class TranslationGroupBreadcrumb(Breadcrumb):
+    """Builds a breadcrumb for an `ITranslationGroup`."""
+
+    @property
+    def text(self):
+        return self.context.title
+
 class TranslationGroupView:
 
     def __init__(self, context, request):
@@ -63,8 +71,10 @@
             result.append({'lang': item.language.englishname,
                            'person': item.translator,
                            'code': item.language.code,
+                           'language' : item.language,
                            'datecreated': item.datecreated,
                            'style_guide_url': item.style_guide_url,
+                           'context' : item,
                            })
         result.sort(key=operator.itemgetter('lang'))
         return result
@@ -76,8 +86,8 @@
     schema = ITranslator
     field_names = ['language', 'translator', 'style_guide_url']
 
-    @action("Add", name="add")
-    def add_action(self, action, data):
+    @action("Appoint", name="appoint")
+    def appoint_action(self, action, data):
         """Appoint a translator to do translations for given language.
 
         Create a translator who, within this group, will be responsible for
@@ -99,8 +109,18 @@
                 "There is already a translator for this language")
 
     @property
+    def cancel_url(self):
+        return canonical_url(self.context)
+
+    @property
     def next_url(self):
-        return canonical_url(self.context)
+        return self.cancel_url
+
+    label = "Appoint a translation team"
+
+    @property
+    def page_title(self):
+        return 'Apoint a translation team in "%s"' % (self.context.title)
 
 
 class TranslationGroupEditView(LaunchpadEditFormView):
@@ -130,8 +150,20 @@
                 "There is already a translation group with this name")
 
     @property
+    def cancel_url(self):
+        return canonical_url(self.context)
+
+    @property
     def next_url(self):
-        return canonical_url(self.context)
+        return self.cancel_url
+
+    @property
+    def label(self):
+        return "Change %s details" % (self.context.title)
+
+    @property
+    def page_title(self):
+        return 'Change "%s" translation group details' % (self.context.title)
 
 
 class TranslationGroupAddView(LaunchpadFormView):

=== modified file 'lib/lp/translations/configure.zcml'
--- lib/lp/translations/configure.zcml	2009-08-25 14:32:37 +0000
+++ lib/lp/translations/configure.zcml	2009-08-25 16:44:22 +0000
@@ -394,6 +394,11 @@
                 permission="launchpad.Edit"
                 set_schema="lp.translations.interfaces.translationgroup.ITranslationGroup"/>
         </class>
+        <adapter
+            provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
+            for="lp.translations.interfaces.translationgroup.ITranslationGroup"
+            factory="lp.translations.browser.translationgroup.TranslationGroupBreadcrumb"
+            permission="zope.Public"/>
 
         <!-- TranslationGroupSet -->
 

=== modified file 'lib/lp/translations/stories/translationgroups/05-add-translation-group.txt'
--- lib/lp/translations/stories/translationgroups/05-add-translation-group.txt	2009-08-25 10:26:43 +0000
+++ lib/lp/translations/stories/translationgroups/05-add-translation-group.txt	2009-08-25 16:42:56 +0000
@@ -82,7 +82,7 @@
 
     >>> docs = find_tag_by_id(admin_browser.contents, 'documentation')
     >>> print extract_text(docs)
-    Please read translation instructions...
+    Please read the translation instructions...
     >>> docs_url = docs.find('a')
     >>> extract_link_from_tag(docs_url)
     u'https://help.launchpad.net/Translations/PolyglotPolicies'
@@ -113,7 +113,7 @@
 The Rosetta administrator assigns ownership of the group to Sample
 Person.
 
-    >>> browser.getLink('Reassign').click()
+    >>> browser.getLink(id='link-reassign').click()
     >>> browser.url
     'http://translations.launchpad.dev/+groups/monolingua/+reassign'
 
@@ -124,7 +124,7 @@
 
 The Rosetta administrator is still able to administer this group:
 
-    >>> browser.getLink('Appoint')
+    >>> browser.getLink('Appoint a new translation team')
     <...+appoint'>
 
 But Sample Person is now listed as its owner:
@@ -139,7 +139,7 @@
     >>> browser.open(
     ...     'http://translations.launchpad.dev/'
     ...     'translations/groups/monolingua/')
-    >>> browser.getLink('Appoint')
+    >>> browser.getLink('Appoint a new translation team')
     <...+appoint'>
 
 The new groups should show up on the "Translation groups" page.

=== modified file 'lib/lp/translations/stories/translationgroups/06-edit-translation-group.txt'
--- lib/lp/translations/stories/translationgroups/06-edit-translation-group.txt	2009-01-22 18:53:43 +0000
+++ lib/lp/translations/stories/translationgroups/06-edit-translation-group.txt	2009-08-25 16:42:56 +0000
@@ -20,7 +20,7 @@
 
 And select to edit its details.
 
-    >>> admin_browser.getLink('Edit translation group details').click()
+    >>> admin_browser.getLink('Change details').click()
     >>> print admin_browser.url
     http://translations.launchpad.dev/+groups/testing-translation-team/+edit
 
@@ -52,7 +52,7 @@
 
 You can also edit the generic translation instructions for the team
 
-    >>> admin_browser.getLink('Edit translation group details').click()
+    >>> admin_browser.getLink('Change details').click()
     >>> admin_browser.getControl('Translation instructions').value = (
     ...     u'https://help.launchpad.net/Translations/RenamedGroup')
     >>> admin_browser.getControl('Change').click()

=== modified file 'lib/lp/translations/stories/translationgroups/30-show-group-translation-targets.txt'
--- lib/lp/translations/stories/translationgroups/30-show-group-translation-targets.txt	2009-08-13 21:32:59 +0000
+++ lib/lp/translations/stories/translationgroups/30-show-group-translation-targets.txt	2009-08-25 16:42:56 +0000
@@ -9,15 +9,14 @@
     >>> def find_projects_portlet(browser):
     ...     """Find the portlet with projects/distros this group works with.
     ...     """
-    ...     return find_portlet(
-    ...         browser.contents, "This group supervises translations for")
+    ...     return find_tag_by_id(browser.contents, "related-projects")
 
     >>> portlet = find_projects_portlet(browser)
     >>> for link in portlet.findAll('a'):
     ...     print '%s: %s' % (link.find(text=True), link['href'])
-    Ubuntu: /ubuntu
-    NetApplet: /netapplet
-    GNOME: /gnome
+    Ubuntu: http://launchpad.dev/ubuntu
+    GNOME: http://launchpad.dev/gnome
+    NetApplet: http://launchpad.dev/netapplet
 
 If we disable some of these projects...
 
@@ -43,7 +42,7 @@
     >>> portlet = find_projects_portlet(browser)
     >>> for link in portlet.findAll('a'):
     ...     print '%s: %s' % (link.string, link['href'])
-    Ubuntu: /ubuntu
+    Ubuntu: http://launchpad.dev/ubuntu
 
 Let's undo this so we don't get in trouble with other tests in this
 story!

=== modified file 'lib/lp/translations/stories/translationgroups/35-appoint-translators.txt'
--- lib/lp/translations/stories/translationgroups/35-appoint-translators.txt	2008-07-24 12:16:08 +0000
+++ lib/lp/translations/stories/translationgroups/35-appoint-translators.txt	2009-08-25 16:42:56 +0000
@@ -13,16 +13,16 @@
     >>> browser.addHeader('Authorization', 'Basic [e-mail]:test')
     >>> browser.open(
     ...   'http://translations.launchpad.dev/+groups/polyglot/')
-    >>> print find_portlet(browser.contents, 'Translation Teams')
+    >>> print find_tag_by_id(browser.contents, "translation-teams-listing")
     <...
-    No translation teams or supervisors have been appointed yet in this
-    group.
+    No translation teams or supervisors have been appointed in this
+    group yet.
     ...
 
 Verify that the appointments form displays, and offers the option to
 appoint a translator.
 
-    >>> browser.getLink('Appoint').click()
+    >>> browser.getLink('Appoint a new translation team').click()
     >>> browser.url
     'http://translations.launchpad.dev/+groups/polyglot/+appoint'
 
@@ -30,14 +30,14 @@
 
     >>> browser.getControl('Language').value=['ab']
     >>> browser.getControl('Translator').value='name21'
-    >>> browser.getControl('Add').click()
+    >>> browser.getControl('Appoint').click()
 
 We should get redirected back to the group page.
 
     >>> browser.url
     'http://translations.launchpad.dev/+groups/polyglot'
 
-    >>> browser.getLink('Appoint').click()
+    >>> browser.getLink('Appoint a new translation team').click()
     >>> browser.url
     'http://translations.launchpad.dev/+groups/polyglot/+appoint'
 
@@ -45,7 +45,7 @@
 
     >>> browser.getControl('Language').value=['af']
     >>> browser.getControl('Translator').value='no-priv'
-    >>> browser.getControl('Add').click()
+    >>> browser.getControl('Appoint').click()
 
 Now we should see both of those appointments on the polyglot page:
 
@@ -59,10 +59,10 @@
 Appointing a new Abkhazian translator must fail gracefully, not crash as
 it used to do (Bug #52991).
 
-    >>> browser.getLink('Appoint').click()
+    >>> browser.getLink('Appoint a new translation team').click()
     >>> browser.getControl('Language').value=['ab']
     >>> browser.getControl('Translator').value='name12'
-    >>> browser.getControl('Add').click()
+    >>> browser.getControl('Appoint').click()
 
 The error means we stay on the appoint page:
 
@@ -79,7 +79,7 @@
 
     >>> admin_browser.open(
     ...   'http://translations.launchpad.dev/+groups/polyglot/')
-    >>> admin_browser.getLink('Appoint').click()
+    >>> admin_browser.getLink('Appoint a new translation team').click()
     >>> admin_browser.url
     'http://translations.launchpad.dev/+groups/polyglot/+appoint'
 
@@ -87,7 +87,7 @@
 
     >>> admin_browser.open(
     ...   'http://translations.launchpad.dev/+groups/polyglot/')
-    >>> admin_browser.getLink('Edit translation group details').click()
+    >>> admin_browser.getLink('Change details').click()
     >>> admin_browser.url
     'http://translations.launchpad.dev/+groups/polyglot/+edit'
 
@@ -98,18 +98,18 @@
     >>> user_browser.url
     'http://translations.launchpad.dev/+groups/polyglot/'
 
-    >>> user_browser.getLink('Appoint').click()
+    >>> user_browser.getLink('Appoint a new translation team')
     Traceback (most recent call last):
     ...
-    Unauthorized:...
+    LinkNotFoundError
 
     >>> user_browser.open(
     ...   'http://translations.launchpad.dev/+groups/polyglot/')
     >>> user_browser.url
     'http://translations.launchpad.dev/+groups/polyglot/'
 
-    >>> user_browser.getLink('Edit translation group details').click()
+    >>> user_browser.getLink('Change details').click()
     Traceback (most recent call last):
     ...
-    Unauthorized:...
+    LinkNotFoundError
 

=== modified file 'lib/lp/translations/stories/translationgroups/36-change-translator.txt'
--- lib/lp/translations/stories/translationgroups/36-change-translator.txt	2009-01-08 23:19:08 +0000
+++ lib/lp/translations/stories/translationgroups/36-change-translator.txt	2009-08-25 16:42:56 +0000
@@ -9,14 +9,16 @@
     >>> print anon_browser.url
     http://translations.launchpad.dev/+groups/polyglot
 
-    >>> portlet = find_portlet(anon_browser.contents, 'Translation Teams')
+    >>> portlet = find_tag_by_id(
+    ...     anon_browser.contents, "translation-teams-listing")
     >>> language_rows = portlet.find('tbody').findAll('tr')
     >>> for language_row in language_rows:
-    ...     lang_name = language_row.findNext('td')
-    ...     lang_team = lang_name.findNext('td')
-    ...     print '%s: %s' % (lang_name.renderContents(), lang_team.a.string)
-    Abkhazian: Hoary Gnome Team
-    Afrikaans: No Privileges Person
+    ...     cell = language_row.findNext('td')
+    ...     lang_name = extract_text(cell)
+    ...     lang_team = extract_text(cell.findNext('td').findNext('a'))
+    ...     print '%s: %s' % (lang_name, lang_team)
+    Abkhazian (ab): Hoary Gnome Team
+    Afrikaans (af): No Privileges Person
 
     >>> browser.addHeader('Authorization', 'Basic [e-mail]:test')
     >>> browser.open(
@@ -26,7 +28,7 @@
 
     # We are going to change the Afrikaans (af) translator.
 
-    >>> browser.getLink(url='af').click()
+    >>> browser.getLink(id='edit-af-translator').click()
     >>> print browser.url
     http://translations.launchpad.dev/+groups/polyglot/af
 
@@ -78,12 +80,14 @@
 
     # And the 'Translation Teams' portlet shows the new information.
 
-    >>> portlet = find_portlet(browser.contents, 'Translation Teams')
+    >>> portlet = find_tag_by_id(
+    ...     browser.contents, "translation-teams-listing")
     >>> language_rows = portlet.find('tbody').findAll('tr')
     >>> for language_row in language_rows:
-    ...     lang_name = language_row.findNext('td')
-    ...     lang_team = lang_name.findNext('td')
-    ...     print '%s: %s' % (lang_name.renderContents(), lang_team.a.string)
-    Abkhazian: Hoary Gnome Team
-    Welsh: No Privileges Person
+    ...     cell = language_row.findNext('td')
+    ...     lang_name = extract_text(cell)
+    ...     lang_team = extract_text(cell.findNext('td').findNext('a'))
+    ...     print '%s: %s' % (lang_name, lang_team)
+    Abkhazian (ab): Hoary Gnome Team
+    Welsh (cy): No Privileges Person
 

=== modified file 'lib/lp/translations/stories/translationgroups/45-test-distro-restricted-permissions.txt'
--- lib/lp/translations/stories/translationgroups/45-test-distro-restricted-permissions.txt	2009-07-02 10:27:50 +0000
+++ lib/lp/translations/stories/translationgroups/45-test-distro-restricted-permissions.txt	2009-08-25 16:42:56 +0000
@@ -88,7 +88,7 @@
     ...     'http://translations.launchpad.dev/+groups/polyglot/+appoint')
     >>> admin_browser.getControl('Language').value=['st']
     >>> admin_browser.getControl('Translator').value='name21'
-    >>> admin_browser.getControl('Add').click()
+    >>> admin_browser.getControl('Appoint').click()
 
 No Privileges Person can now enter text, but the page does warn that it
 will only accept suggestions.

=== modified file 'lib/lp/translations/stories/translationgroups/xx-link-to-documentation.txt'
--- lib/lp/translations/stories/translationgroups/xx-link-to-documentation.txt	2009-08-21 18:47:31 +0000
+++ lib/lp/translations/stories/translationgroups/xx-link-to-documentation.txt	2009-08-25 16:42:56 +0000
@@ -30,11 +30,12 @@
 
 The link now appears in the table next to the name of the team.
 
-    >>> info = first_tag_by_class(carlos_browser.contents, 'translator_info')
-    >>> info_a = info.findAll('a')
-    >>> print extract_text(info_a[0])
+    >>> team = first_tag_by_class(carlos_browser.contents, 'translator-team')
+    >>> print extract_text(team.findAll('a')[0])
     testing Spanish team
-    >>> print info_a[1]['href']
+
+    >>> link = first_tag_by_class(carlos_browser.contents, 'translator-link')
+    >>> print link.findAll('a')[0]['href']
     http://www.ubuntu.com/
 
 Back on the translations page, the link is now present, too.
@@ -56,7 +57,7 @@
     ...     '+groups/testing-translation-team/+appoint')
     >>> carlos_browser.getControl('Language').value = ['eo']
     >>> carlos_browser.getControl('Translator').value = 'name12'
-    >>> carlos_browser.getControl('Add').click()
+    >>> carlos_browser.getControl('Appoint').click()
     >>> print carlos_browser.url
     http://translations.launchpad.dev/+groups/testing-translation-team
 

=== removed file 'lib/lp/translations/templates/translationgroup-appoint.pt'
--- lib/lp/translations/templates/translationgroup-appoint.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/translationgroup-appoint.pt	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad">
-  <body>
-    <div metal:fill-slot="main">
-      <div>
-        <a href="/+groups">Translation groups:</a>
-        <a tal:attributes="href context/fmt:url"
-           tal:content="string:${context/title} translation group">
-            Foo bar translation group
-        </a>
-      </div>
-      <h1>Appoint a translation team or supervisor</h1>
-
-      <div metal:use-macro="context/@@launchpad_form/form" />
-    </div>
-
-    <div metal:fill-slot="help">
-      <p>
-        Here you can appoint a translation team (or an individual supervisor)
-        to be responsible for a particular language within this translation
-        group.  One translation team can take care of any number of languages,
-        but the group can only appoint one team for any single language.  To
-        avoid mistakes, this form will not allow you to appoint a new team for
-        a language that already has one assigned in this group.
-      </p>
-      <p>
-        A supervisor does not have to be a single person.  If you want to have
-        several people taking care of a single language in this translation
-        group, make them a team and appoint that whole team as the translation
-        team.
-      </p>
-      <ul class="info">
-        <li>
-          <a href="https://help.launchpad.net/RosettaFAQ"
-          >Frequently asked questions</a>
-        </li>
-      </ul>
-    </div>
-  </body>
-</html>

=== removed file 'lib/lp/translations/templates/translationgroup-edit.pt'
--- lib/lp/translations/templates/translationgroup-edit.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/translationgroup-edit.pt	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad">
-  <body>
-    <div metal:fill-slot="main">
-      <div>
-        <a href="/+groups">Translation groups:</a>
-        <a tal:attributes="href context/fmt:url">
-          <tal:translation-group replace="context/title">
-            Foo bar
-          </tal:translation-group> translation group
-        </a>
-      </div>
-      <h1>
-        Edit
-        <tal:translation-group replace="context/title">
-          Foo bar
-        </tal:translation-group> translation group details
-      </h1>
-
-      <div metal:use-macro="context/@@launchpad_form/form" />
-    </div>
-  </body>
-</html>

=== modified file 'lib/lp/translations/templates/translationgroup-index.pt'
--- lib/lp/translations/templates/translationgroup-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/translationgroup-index.pt	2009-08-25 16:42:56 +0000
@@ -3,150 +3,137 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad">
   <body>
-    <div metal:fill-slot="main">
-      <div>
-        <a href="/+groups">Translation groups</a>
-      </div>
+    <div metal:fill-slot="heading">
       <h1>
         <tal:translation-group replace="context/title">
           Foo bar
         </tal:translation-group> translation group
       </h1>
-
-      <p class="documentDescription" tal:content="context/summary">
+    </div>
+
+    <div metal:fill-slot="main"
+         style="max-width:800px;">
+      <p>
+        Administered by
+        <a tal:content="context/owner/fmt:displayname"
+           tal:attributes="href context/owner/fmt:url"
+           class="link" />
+        <a tal:condition="context/required:launchpad.Edit"
+           href="+reassign" title="Change administrator"
+           class="edit sprite" id="link-reassign"></a>
+      </p>
+
+      <div tal:content="structure context/summary/fmt:text-to-html"
+           class="summary">
         $TranslationGroup.summary goes here. This should be quite short,
         just a single paragraph of text really, giving a summary of
         this TranslationGroup.
-      </p>
+      </div>
+
       <p id="documentation" tal:condition="context/translation_guide_url">
-        <em>Please read <a tal:attributes="
+        <em>Please read the <a tal:attributes="
            href context/translation_guide_url">translation instructions</a>
           to learn about policies, recommendations and caveats for doing
           translations in this translation group.</em>
       </p>
-      <p>
-        Group owner:
-        <a tal:content="context/owner/fmt:displayname"
-           tal:attributes="href context/owner/fmt:url"
-           class="link" />
-        <a tal:condition="context/required:launchpad.Edit" href="+reassign">
-          <img src="/@@/edit" alt="Reassign" title="Change Owner" />
-        </a>
-      </p>
-
-      <div class="left">
-        <div class="section">
-          <div class="portlet">
-            <h2>Translation Teams</h2>
-            <tal:translators condition="context/translators">
-              <table class="sortable listing" id="group-members">
-                <thead>
-                  <tr>
-                    <th>Language</th>
-                    <th>Team/Supervisor</th>
-                    <th></th>
-                    <th>Appointed</th>
-                    <th tal:condition="context/required:launchpad.Edit"></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr tal:repeat="translator view/translator_list">
-                    <td tal:content="translator/lang" />
-                    <td class="translator_info">
-                        <a tal:content="translator/person/displayname"
-                            tal:attributes="href translator/person/fmt:url" />
-                        <a tal:condition="translator/style_guide_url"
-                            tal:attributes="href translator/style_guide_url"
-                             ><img src="/@@/link" alt="Doc"
+
+      <div tal:condition="context/required:launchpad.Edit">
+        <a href="+edit" class="edit sprite">Change details</a>
+      </div>
+
+      <div style="height:2em;"></div><!-- separator -->
+
+      <div id="translation-teams-listing">
+      <h2><a name="teams"></a>Translation teams</h2>
+        <tal:translators condition="context/translators">
+          <table class="sortable listing" id="group-members">
+            <thead>
+              <tr>
+                <th style="text-align:left">Language</th>
+                <th>Team/Supervisor</th>
+                <th>Guidelines</th>
+                <th>Appointed</th>
+                <th tal:condition="context/required:launchpad.Edit"></th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr tal:repeat="translator view/translator_list">
+                <td class="translator-language">
+                  <a tal:attributes="href translator/language/fmt:url"
+                     tal:content="translator/language/displayname">
+                    Serbian</a>
+                </td>
+                <td class="translator-team">
+                  <a tal:replace="structure translator/person/fmt:link">
+                    Translator</a>
+                  <tal:team condition="translator/person/is_team">
+                    with
+                    <tal:count replace="
+                      translator/person/active_member_count">6</tal:count>
+                    members
+                  </tal:team>
+                </td>
+                <td class="translator-link">
+                  <a tal:condition="translator/style_guide_url"
+                     tal:attributes="href translator/style_guide_url"
+                     ><img src="/@@/link" alt="Doc"
                            tal:attributes="title translator/style_guide_url"
-                              /></a>
-                    </td>
-                    <td><a tal:attributes="href translator/code"><img
-                           src="/@@/edit" alt="Change"
-                           title="Change Translator" /></a>
-                    </td>
-                    <td>
-                      <span class="sortkey"
-                        tal:content="translator/datecreated/fmt:datetime" />
-                      <span
-                        tal:attributes="title translator/datecreated/fmt:datetime"
-                        tal:content="translator/datecreated/fmt:approximatedate">
-                        2007-09-17
-                      </span>
-                    </td>
-                    <td>
-                      <a
-                        tal:attributes="href string:${translator/code}/+remove">
-                        <input type="image" style="border: 0;"
-                               src="/@@/remove" alt="Remove Translator"
-                               title="Remove Translator" name="rmform" />
-                      </a>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-            </tal:translators>
-            <tal:no-translators condition="not: context/translators">
-              No translation teams or supervisors have been appointed yet in
-              this group.
-            </tal:no-translators>
-            <ul class="menu">
-              <tal:can-edit condition="context/required:launchpad.Edit">
-                <li class="add">
-                  <a href="+appoint">Appoint translation team or supervisor</a>
-                </li>
-                <li class="edit">
-                  <a href="+edit">Edit translation group details</a>
-                </li>
-              </tal:can-edit>
-              <tal:cannot-edit
-                condition="not:context/required:launchpad.Edit">
-                <li class="locked">
-                  <a href="+appoint">Appoint translation team or supervisor</a>
-                </li>
-                <li class="locked">
-                  <a href="+edit">Edit translation group details</a>
-                </li>
-              </tal:cannot-edit>
-            </ul>
-          </div>
+                           />
+                    <tal:link
+                       replace="translator/style_guide_url/fmt:shorten/30"
+                       ></tal:link></a>
+                  <span tal:condition="not:translator/style_guide_url">
+                    none
+                  </span>
+                  <tal:notadmin
+                     condition="not:context/required:launchpad.Edit">
+                    &nbsp;<a tal:condition="
+                         translator/context/required:launchpad.Edit"
+                         tal:attributes="href string:${translator/code}/+edit"
+                         class="edit sprite"></a>
+                  </tal:notadmin>
+                </td>
+                <td>
+                  <span
+                     tal:attributes="title translator/datecreated/fmt:datetime"
+                     tal:content="translator/datecreated/fmt:approximatedate">
+                    2007-09-17
+                  </span>
+                </td>
+                <td tal:condition="context/required:launchpad.Edit">
+                  <a tal:attributes="
+                      href translator/code;
+                      id string:edit-${translator/code}-translator"
+                     title="Change translator and documentation link"
+                     alt="Change" class="edit sprite"></a>
+                  <a tal:attributes="href string:${translator/code}/+remove"
+                     alt="Remove" title="Remove translator"
+                     class="remove sprite"></a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </tal:translators>
+        <tal:no-translators condition="not: context/translators">
+          No translation teams or supervisors have been appointed in
+          this group yet.
+        </tal:no-translators>
+        <div style="margin-top:1em; margin-bottom: 2em;">
+          <a tal:condition="context/required:launchpad.Edit"
+             href="+appoint" class="add sprite">Appoint a new translation
+            team</a>
         </div>
-      </div>
-      <div class="right">
+        </div><!-- id="translations-team-listing" -->
+
         <div class="section">
-          <div tal:replace="structure context/@@+portlet-relateds" />
+          <a name="projects"></a>
+          <div tal:replace="structure context/@@+portlet-projects" />
         </div>
-      </div>
-    </div>
-
-    <div metal:fill-slot="help">
-      <p>
-        This is an overview of the
-        "<span tal:replace="context/name">transgroup</span>" translation
-        group.  A translation group is a collection of teams and/or
-        people who supervise the translations for a piece of software.
-        A translation group can manage translations for any number of
-        projects into any number of languages.  Translation groups make it
-        easier to coordinate and oversee large translation efforts.
-      </p>
-      <p>
-        Within the group, a translation team or individual supervisor is
-        appointed for every language that the group supports.  One
-        person or team may work on multiple languages if desired, and
-        even participate in multiple translation groups.
-      </p>
-      <ul class="info">
-        <li>
-          <a href="https://help.launchpad.net/RosettaFAQ"
-          >Frequently asked questions</a>
-        </li>
-      </ul>
-    </div>
+
+    </div><!-- main -->
+
   </body>
 </html>

=== removed file 'lib/lp/translations/templates/translationgroup-portlet-details.pt'
--- lib/lp/translations/templates/translationgroup-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/translationgroup-portlet-details.pt	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-<tal:root
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  omit-tag="">
-
-<div class="portlet" id="portlet-details">
-  <h2>Current details</h2>
-  <div class="portletBody portletContent">
-    Owner:
-    <a tal:replace="structure context/owner/fmt:link" />
-  </div>
-</div>
-</tal:root>

=== renamed file 'lib/lp/translations/templates/translationgroup-portlet-relateds.pt' => 'lib/lp/translations/templates/translationgroup-portlet-projects.pt'
--- lib/lp/translations/templates/translationgroup-portlet-relateds.pt	2009-08-13 21:32:59 +0000
+++ lib/lp/translations/templates/translationgroup-portlet-projects.pt	2009-08-25 16:42:56 +0000
@@ -4,45 +4,52 @@
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   omit-tag="">
 
-<div class="portlet" id="portlet-related">
-  <h2>This group supervises translations for</h2>
-
-  <div class="portletBody">
-    <div class="portletContent">
-
-      <tal:distributions condition="context/distributions">
-        <h3>Distributions:</h3>
-        <ul>
-          <li tal:repeat="distribution context/distributions">
-            <a href="#"
-              tal:content="distribution/displayname"
-              tal:attributes="href distribution/fmt:url">Ubuntu</a>
-          </li>
-        </ul>
-      </tal:distributions>
-
-      <tal:products condition="context/products">
-        <h3>Projects:</h3>
-        <ul>
-          <li tal:repeat="product context/products">
-            <tal:link replace="structure product/fmt:link:translations" />
-            <tal:link replace="structure product/fmt:url:translations" />
-          </li>
-        </ul>
-      </tal:products>
-
-      <tal:projects condition="context/projects">
-        <h3>Project Groups:</h3>
-        <ul>
-          <li tal:repeat="project context/projects">
-            <a href="#"
-                tal:content="project/displayname"
-                tal:attributes="href project/fmt:url">Gnome</a>
-          </li>
-        </ul>
-      </tal:projects>
-
-    </div>
+  <h2>Projects using this group</h2>
+
+  <p>
+    Projects listed here are using
+    <a tal:attributes="href context/fmt:url"
+       tal:content="context/title"
+       >this group</a> to manage their translations.
+    This means that members of the group (as displayed above in
+    the <a href="#teams">Translation teams</a> section) are in charge
+    of managing translations for their particular language.
+  </p>
+
+  <p>
+    Want to set your project as using 
+    <a tal:attributes="href context/fmt:url"
+       tal:content="context/title"
+       >this group</a>?  Set it on Translations Settings page.
+  </p>
+
+  <div id="related-projects">
+    <div tal:condition="context/distributions" style="margin-top:1em;">
+      <h3 style="display: inline;">Distributions:</h3>
+      <tal:distribution
+         repeat="distribution context/distributions">
+        <a href="#" tal:replace="structure distribution/fmt:link">Ubuntu
+        </a><tal:comma condition="not:repeat/distribution/end">, </tal:comma>
+      </tal:distribution>
+    </div>
+
+    <div tal:condition="context/projects" style="margin-top:1em;">
+      <h3 style="display: inline;">Project groups:</h3>
+      <tal:project
+         repeat="project context/projects">
+        <a href="#" tal:replace="structure project/fmt:link">GNOME
+        </a><tal:comma condition="not:repeat/project/end">, </tal:comma>
+      </tal:project>
+    </div>
+
+    <div tal:condition="context/products" style="margin-top:1em;">
+      <h3 style="display: inline;">Projects:</h3>
+      <tal:product
+       repeat="product context/products">
+        <a href="#" tal:replace="structure product/fmt:link">Firefox
+        </a><tal:comma condition="not:repeat/product/end">, </tal:comma>
+      </tal:product>
+    </div>
+
   </div>
-</div>
 </tal:root>

=== modified file 'lib/lp/translations/templates/translationgroup-reassignment.pt'
--- lib/lp/translations/templates/translationgroup-reassignment.pt	2009-08-13 20:28:35 +0000
+++ lib/lp/translations/templates/translationgroup-reassignment.pt	2009-08-25 13:32:26 +0000
@@ -3,27 +3,13 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad">
   <body>
     <div metal:fill-slot="main">
-      <div>
-        <a tal:attributes="href context/fmt:url">
-          <tal:translation-group replace="context/title">
-            Foo bar
-          </tal:translation-group> translation group
-        </a>
-      </div>
-      <h1>
-        Change the
-        <tal:role replace="view/ownerOrMaintainerAttr" /> of
-        <tal:thing replace="view/contextName" />
-      </h1>
 
-      <div metal:use-macro="context/@@+object-reassignment/object-reassignment" />
+      <div metal:use-macro="
+             context/@@+object-reassignment/object-reassignment" />
     </div>
   </body>
 </html>