Merge lp:~danilo/launchpad/project-and-products into lp:launchpad

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

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

= Bug #427486 =

Migrate product-translations.pt and project-translations.pt pages to
3.0 layout with mostly mechanical changes.

Xmllint reports problem in a page I have touched just so it doesn't
OOPS, which is not migrated yet (next step), so that's where I'll fix
xmllint issues as well.

== Proposed fix ==

1. https://translations.launchpad.dev/gnome (project page)

   * Move permissions display and settings inline
   * Add untranslated applications next to translated applications

   (this is just a very minor step, which is why changes are considered
   'mechanical': in the future, this page should aggregate statistics
   over all translatable projects)

2. https://translations.launchpad.dev/evolution
   https://translations.launchpad.dev/firefox (not using translations, strictly mechanical changes)

   * Move 'translation focus' (direct link, and upload and download links
     for those who can see them) inline.
   * Move 'import queue' link inline.
   * Move permissions display and settings inline (reuse the same portlet)
   * Use two column layout and list all translatable series on the top of
     the page (people had trouble to find these when they were at the bottom)
   * For those who manage translations for this project, also show a list of
     all series which do not have translations with direct links on how they
     can set them up

== Tests ==

Strictly relevant tests:

  bin/test -vvt xx-productseries-translation-export.txt -t xx-product-export.txt -t xx-project-translations.txt -t xx-product-translations.txt -t xx-translation-import-queue-targets.txt -t stories.translationgroups

But basically, all translations tests cover this:

  bin/test -vvt 'translations.*stories'

== Demo and Q/A ==

 https://translations.launchpad.dev/gnome
 https://translations.launchpad.dev/evolution
 https://translations.launchpad.dev/firefox

= 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/browser/project.py
  lib/lp/translations/browser/configure.zcml
  lib/lp/translations/stories/standalone/xx-product-translations.txt
  lib/lp/translations/stories/translationgroups/20-project-translationgroup.txt
  lib/lp/translations/stories/standalone/xx-product-export.txt
  lib/lp/translations/templates/hastranslationgroup-portlet-translation-groups-and-permission.pt
  lib/lp/translations/templates/productseries-translations.pt
  lib/lp/translations/templates/product-translations.pt
  lib/lp/translations/browser/product.py
  lib/lp/translations/templates/project-translations.pt
  lib/lp/translations/stories/productseries/xx-productseries-translation-export.txt
  lib/lp/translations/stories/importqueue/xx-translation-import-queue-targets.txt
  lib/lp/translations/stories/translationgroups/46-test-distro-structured-permissions.txt
  lib/lp/translations/templates/product-portlet-translatables.pt
  lib/lp/translations/templates/productseries-translations-languages.pt
  lib/lp/translations/stories/translationgroups/15-product-translation-group.txt
  lib/lp/translations/stories/project/xx-project-translations...

[Celso Providelo (cprov)]

Hi Danilo,

Thanks for working on these pages, they looks good.

I agree that this branch fits in ui=rs, trivial but precise changes.

Land it!

review: Approve (code)

=== 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 11:44:08 +0000
@@ -815,6 +815,7 @@
         for="lp.registry.interfaces.project.IProject"
         permission="zope.Public"
         name="+translations"
+        class="lp.translations.browser.project.ProjectView"
         template="../templates/project-translations.pt"
         layer="canonical.launchpad.layers.TranslationsLayer"/>
     <browser:page

=== modified file 'lib/lp/translations/browser/product.py'
--- lib/lp/translations/browser/product.py	2009-08-31 00:31:01 +0000
+++ lib/lp/translations/browser/product.py	2009-09-10 18:35:28 +0000
@@ -29,7 +29,7 @@
     facet = 'translations'
     links = (
         'overview',
-        'translators',
+        'settings',
         'translationdownload',
         'imports',
         )
@@ -39,7 +39,7 @@
         return Link('+imports', text)
 
     @enabled_with_permission('launchpad.Edit')
-    def translators(self):
+    def settings(self):
         text = 'Settings'
         return Link('+changetranslators', text, icon='edit')
 
@@ -113,3 +113,10 @@
             'potemplates': translatable.getCurrentTranslationTemplates(),
             'base_url': canonical_url(translatable)
             }
+
+    @cachedproperty
+    def untranslatable_series(self):
+        """Return series which are not yet set up for translations."""
+        all_series = set(self.context.serieses)
+        translatable = set(self.context.translatable_series)
+        return all_series - translatable

=== modified file 'lib/lp/translations/browser/project.py'
--- lib/lp/translations/browser/project.py	2009-08-31 00:31:01 +0000
+++ lib/lp/translations/browser/project.py	2009-09-10 11:44:08 +0000
@@ -23,10 +23,10 @@
 
     usedfor = IProject
     facet = 'translations'
-    links = ['products', 'changetranslators', 'overview']
+    links = ['products', 'settings', 'overview']
 
     @enabled_with_permission('launchpad.Edit')
-    def changetranslators(self):
+    def settings(self):
         text = 'Settings'
         return Link('+changetranslators', text, icon='edit')
 
@@ -41,7 +41,12 @@
 
 
 class ProjectView(LaunchpadView):
-    pass
+    """A view for `IProject` in the translations context."""
+    @property
+    def untranslatables(self):
+        translatables = set(self.context.translatables())
+        all_products = set(self.context.products)
+        return list(all_products - translatables)
 
 
 class ProjectChangeTranslatorsView(TranslationsMixin, ProjectEditView):

=== modified file 'lib/lp/translations/stories/importqueue/xx-translation-import-queue-targets.txt'
--- lib/lp/translations/stories/importqueue/xx-translation-import-queue-targets.txt	2009-09-01 20:06:37 +0000
+++ lib/lp/translations/stories/importqueue/xx-translation-import-queue-targets.txt	2009-09-10 18:35:28 +0000
@@ -51,7 +51,7 @@
 The import queue is linked from the translations page for products.
 
     >>> user_browser.open('http://translations.launchpad.dev/evolution')
-    >>> user_browser.getLink('Import queue').click()
+    >>> user_browser.getLink('Evolution import queue').click()
 
 This time, we do have content for this product:
 

=== modified file 'lib/lp/translations/stories/productseries/xx-productseries-translation-export.txt'
--- lib/lp/translations/stories/productseries/xx-productseries-translation-export.txt	2009-08-28 15:54:41 +0000
+++ lib/lp/translations/stories/productseries/xx-productseries-translation-export.txt	2009-09-10 18:35:28 +0000
@@ -22,7 +22,7 @@
 
     >>> user_browser.open(
     ...     'http://translations.launchpad.dev/evolution/+translations')
-    >>> user_browser.getLink('Download').click()
+    >>> user_browser.getLink('download').click()
     >>> print user_browser.url
     http://translations.launchpad.dev/evolution/trunk/+export
 

=== modified file 'lib/lp/translations/stories/project/xx-project-translations.txt'
--- lib/lp/translations/stories/project/xx-project-translations.txt	2009-07-10 12:49:30 +0000
+++ lib/lp/translations/stories/project/xx-project-translations.txt	2009-09-10 18:35:28 +0000
@@ -11,28 +11,33 @@
 
   >>> evo_link = browser.getLink('Evolution')
   >>> print evo_link.url
-  http://translations.launchpad.dev/evolution
+  http://launchpad.dev/evolution/+translations
 
   >>> browser.open('http://translations.launchpad.dev/gnome')
   >>> print browser.url
   http://translations.launchpad.dev/gnome
 
-Netapplet is another product of GNOME project. It has translations, but it's not
-using Launchpad officially, so it's not in this page.
-
-  >>> browser.getLink('Network Applet')
-  Traceback (most recent call last):
-  ...
-  LinkNotFoundError
+Netapplet is another product of GNOME project. It has translations,
+but it's not using Launchpad officially, so it's not listed among
+translatable projects.
+
+  >>> translated_projects = find_tag_by_id(
+  ...     browser.contents, 'translatable-projects')
+  >>> link = translated_projects.find(text='Network Applet')
+  >>> print link
+  None
+
+It does show up among untranslated projects.
+
+  >>> untranslated_projects = find_tag_by_id(
+  ...     browser.contents, 'untranslatable-projects')
+  >>> link = untranslated_projects.find(text='NetApplet').parent
+  >>> link['href']
+  u'http://launchpad.dev/netapplet/+translations'
 
 Let's confirm what we just stated.
 
   >>> anon_browser.open('http://launchpad.dev/gnome')
-  >>> print anon_browser.title
-  The GNOME Project in Launchpad
-
-Netapplet is in fact a product belonging to GNOME project.
-
   >>> anon_browser.getLink('NetApplet').click()
   >>> print anon_browser.title
    Network Applet in Launchpad
@@ -54,17 +59,6 @@
   ...     'portlet-obsolete-translatable-series') is None
   True
 
-but administrators see translations disabled.
-
-  >>> admin_browser.open(anon_browser.url)
-  >>> print admin_browser.title
-  Translations of Network Applet in Launchpad
-  >>> print extract_text(find_tag_by_id(
-  ...     admin_browser.contents,
-  ...     'portlet-obsolete-translatable-series'))
-  All product series with obsolete templates
-  NetApplet trunk series
-
 alsa-utils is a product that doesn't belong to GNOME project. It has
 translations and is using Launchpad Translations officially, and it
 shouldn't appear in GNOME project translations page.
@@ -106,13 +100,3 @@
   >>> alsa_utils_spanish = browser.getLink('Spanish')
   >>> print alsa_utils_spanish.url
   http://translations.../alsa-utils/trunk/+pots/alsa-utils/es/+translate
-
-The translations page has also a link to the product search page to see
-whether a product is registered in Launchpad.
-
-  >>> browser.open('http://translations.launchpad.dev/gnome')
-  >>> print browser.url
-  http://translations.launchpad.dev/gnome
-  >>> browser.getLink('registered with Launchpad').click()
-  >>> print browser.url
-  http://translations.launchpad.dev/projects

=== modified file 'lib/lp/translations/stories/standalone/xx-product-export.txt'
--- lib/lp/translations/stories/standalone/xx-product-export.txt	2009-08-28 15:54:41 +0000
+++ lib/lp/translations/stories/standalone/xx-product-export.txt	2009-09-10 18:35:28 +0000
@@ -4,7 +4,7 @@
 translation downloads.
 
     >>> user_browser.open('http://translations.launchpad.dev/evolution')
-    >>> download = user_browser.getLink('Download "trunk"')
+    >>> download = user_browser.getLink('download')
 
 For products, that option downloads translations for the series that is
 currently the preferred translation target.
@@ -45,7 +45,7 @@
     >>> product.official_rosetta = False
     >>> product.sync()
     >>> user_browser.open('http://translations.launchpad.dev/evolution')
-    >>> user_browser.getLink('Download "trunk"')
+    >>> user_browser.getLink('download')
     Traceback (most recent call last):
     ...
     LinkNotFoundError
@@ -54,7 +54,7 @@
     >>> product.official_rosetta = True
     >>> product.sync()
     >>> user_browser.open('http://translations.launchpad.dev/evolution')
-    >>> user_browser.getLink('Download "trunk"') is not None
+    >>> user_browser.getLink('download') is not None
     True
 
 
@@ -63,7 +63,7 @@
 Only logged-in users get the option to request downloads.
 
     >>> anon_browser.open('http://translations.launchpad.dev/evolution/')
-    >>> anon_browser.getLink('Download "trunk"').click()
+    >>> anon_browser.getLink('download').click()
     Traceback (most recent call last):
     ...
     LinkNotFoundError

=== modified file 'lib/lp/translations/stories/standalone/xx-product-translations.txt'
--- lib/lp/translations/stories/standalone/xx-product-translations.txt	2009-08-13 19:03:36 +0000
+++ lib/lp/translations/stories/standalone/xx-product-translations.txt	2009-09-10 18:35:28 +0000
@@ -79,9 +79,9 @@
     >>> unprivileged = setupBrowser(auth='Basic [e-mail]:test')
     >>> unprivileged.open('http://translations.launchpad.dev/gnomebaker')
     >>> print extract_text(find_main_content(unprivileged.contents))
-    Overview / Import queue
+    Gnome Baker
+    ...
     Translation setup needed
-    ...
     This project is not configured to use Launchpad for translations.
     The gnomebaker project is not set up for translation in Launchpad.
     You might want to talk with Foo Bar, the project registrant, about
@@ -121,9 +121,9 @@
 
     >>> anon_browser.open('http://translations.launchpad.dev/gnomebaker')
     >>> print extract_text(find_main_content(anon_browser.contents))
-    Overview / Import queue
+    Gnome Baker
+    ...
     Translation setup needed
-    ...
     This project is not configured to use Launchpad for translations.
     The gnomebaker project is not set up for translation in Launchpad.
     If you are Foo Bar, log in to begin the setup process.
@@ -153,21 +153,12 @@
     >>> print find_tag_by_id(anon_browser.contents, 'language-chart')
     None
 
-When browsing it as an admin, we can see that it has some 'obsolete'
-translation templates, which is just that the product is not using
-them anymore.
+Even when browsing it as an admin, 'obsolete' translations are not
+shown since it is not marked as using Launchpad for translation.
 
     >>> admin_browser.open('http://translations.launchpad.dev/netapplet')
-    >>> print extract_text(
-    ...     find_tag_by_id(admin_browser.contents,
-    ...                    'portlet-obsolete-translatable-series'))
-    All product series with obsolete templates
-    NetApplet trunk series
-
-While we can see that anonymous people are not getting such information:
-
-    >>> print find_tag_by_id(anon_browser.contents,
-    ...                'portlet-obsolete-translatable-series')
+    >>> print find_tag_by_id(admin_browser.contents,
+    ...                      'portlet-obsolete-translatable-series')
     None
 
 If the netapplet project is updated to use Launchpad for translations...

=== modified file 'lib/lp/translations/stories/translationgroups/15-product-translation-group.txt'
--- lib/lp/translations/stories/translationgroups/15-product-translation-group.txt	2009-08-31 22:13:07 +0000
+++ lib/lp/translations/stories/translationgroups/15-product-translation-group.txt	2009-09-10 18:35:28 +0000
@@ -36,13 +36,12 @@
     ...     find_tag_by_id(netapplet_owner_browser.contents,
     ...                    'translation-permissions'))
     NetApplet (Unspecified) is translated with Open permissions.
-    You can modify permissions on the Settings page.
 
 Now let's make sure we can see the page to let us change translation
 group and permissions.
 
     >>> translations_page_url = netapplet_owner_browser.url
-    >>> netapplet_owner_browser.getLink('Settings').click()
+    >>> netapplet_owner_browser.getLink('Change permissions').click()
     >>> change_translators_url = netapplet_owner_browser.url
 
     >>> print netapplet_owner_browser.title
@@ -57,11 +56,11 @@
     ...     'Translation group').displayValue
     ['(no value)']
 
-Ordinary users cannot see the "Settings" link or the page it
+Ordinary users cannot see the "Change permissions" link or the page it
 leads to.
 
     >>> user_browser.open(translations_page_url)
-    >>> user_browser.getLink('Settings').click()
+    >>> user_browser.getLink('Change permissions').click()
     Traceback (most recent call last):
     ...
     LinkNotFoundError

=== modified file 'lib/lp/translations/stories/translationgroups/20-project-translationgroup.txt'
--- lib/lp/translations/stories/translationgroups/20-project-translationgroup.txt	2009-08-31 22:13:07 +0000
+++ lib/lp/translations/stories/translationgroups/20-project-translationgroup.txt	2009-09-10 18:35:28 +0000
@@ -13,7 +13,7 @@
 And now make sure we can see the form to change the translation group
 and permissions on a project.
 
-    >>> gnome_owner_browser.getLink('Settings').click()
+    >>> gnome_owner_browser.getLink('Change permissions').click()
     >>> print gnome_owner_browser.title
     Set translation permissions for GNOME
 
@@ -21,7 +21,7 @@
 to access the page it leads to.
 
     >>> user_browser.open(translations_page_url)
-    >>> user_browser.getLink('Settings').click()
+    >>> user_browser.getLink('Change permissions').click()
     Traceback (most recent call last):
     ...
     LinkNotFoundError

=== modified file 'lib/lp/translations/stories/translationgroups/46-test-distro-structured-permissions.txt'
--- lib/lp/translations/stories/translationgroups/46-test-distro-structured-permissions.txt	2009-08-31 22:13:07 +0000
+++ lib/lp/translations/stories/translationgroups/46-test-distro-structured-permissions.txt	2009-09-10 18:35:28 +0000
@@ -13,7 +13,7 @@
 as the translation group for the netapplet product...
 
     >>> admin_browser.getLink('Translations').click()
-    >>> admin_browser.getLink('Settings').click()
+    >>> admin_browser.getLink('Change permissions').click()
     >>> admin_browser.getControl('Translation group').displayOptions
     ['(no value)', 'Single-language Translators',
      'The PolyGlot Translation Group', 'Just a testing team']

=== modified file 'lib/lp/translations/templates/hastranslationgroup-portlet-translation-groups-and-permission.pt'
--- lib/lp/translations/templates/hastranslationgroup-portlet-translation-groups-and-permission.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/hastranslationgroup-portlet-translation-groups-and-permission.pt	2009-09-10 18:47:57 +0000
@@ -1,22 +1,21 @@
-<div class="portlet" id="portlet-translation-permissions">
-  <h2>Translation permissions</h2>
-  <div class="portletBody">
-    <table>
-      <tr>
-        <th>Translation group:</th>
-        <td tal:condition="not: context/translationgroup">
-          Not assigned
-        </td>
-        <td tal:condition="context/translationgroup">
-          <a tal:attributes="href context/translationgroup/fmt:url"
-             tal:content="context/translationgroup/title" />
-        </td>
-      </tr>
-      <tr>
-        <th>Permissions:</th>
-        <td tal:content="context/translationpermission/title">Open</td>
-      </tr>
-    </table>
+<div id="portlet-translation-permissions"
+     xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:tal="http://xml.zope.org/namespaces/tal">
+  <p id="translation-permissions">
+    <tal:product replace="structure context/fmt:link">This
+      project</tal:product> is translated
+    <tal:hasgroup condition="context/translationgroup">by
+      <a tal:replace="structure context/translationgroup/fmt:link"
+         >translators</a>
+    </tal:hasgroup>
+    with <a target="help" href="/+help/permissions-policies.html"
+            tal:content="context/translationpermission/title">certain</a>
+    permissions.
+  </p>
+  <div tal:condition="context/required:launchpad.Edit">
+    <a class="edit sprite"
+       tal:define="link context/menu:navigation/settings"
+       tal:attributes="href link/url"
+       >Change permissions</a>
   </div>
 </div>
-

=== modified file 'lib/lp/translations/templates/product-portlet-translatables.pt'
--- lib/lp/translations/templates/product-portlet-translatables.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/product-portlet-translatables.pt	2009-09-10 18:35:28 +0000
@@ -6,10 +6,9 @@
 
 <div class="portlet" id="portlet-translatable-branches"
      tal:condition="context/translatable_series">
-  <h2>All translatable series</h2>
+  <h3>All translatable series</h3>
 
   <div class="portletBody portletContent">
-
     <ul>
       <li class="translations"
           tal:repeat="series context/translatable_series">
@@ -18,14 +17,37 @@
           series title</a>
       </li>
     </ul>
-
+  </div>
+</div>
+
+<div tal:condition="context/required:launchpad.Edit">
+  <div class="portlet" id="portlet-untranslatable-branches"
+       tal:condition="view/untranslatable_series">
+    <h3>Set up translations for other series</h3>
+
+    <div class="portletBody portletContent">
+      <ul>
+        <li class="translations"
+            tal:repeat="series view/untranslatable_series">
+          <a tal:content="series/title"
+             tal:attributes="href string:${series/fmt:url}/+translations">
+            series title</a> —
+          <a tal:attributes="
+              href string:${series/fmt:url}/+translations-upload">
+            upload</a> or
+          <a tal:attributes="
+              href string:${series/fmt:url}/+translations-settings">
+            set up a bzr import</a>.
+        </li>
+      </ul>
+    </div>
   </div>
 </div>
 
 <div class="portlet" id="portlet-translatable-packages"
      tal:condition="context/translatable_packages">
 
-  <h2>All translatable distribution packages</h2>
+  <h3>All translatable distribution packages</h3>
 
   <div class="portletBody portletContent ">
 

=== modified file 'lib/lp/translations/templates/product-translations.pt'
--- lib/lp/translations/templates/product-translations.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/product-translations.pt	2009-09-10 18:35:28 +0000
@@ -2,30 +2,13 @@
   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="view/macro:page/onecolumn"
-  i18n:domain="launchpad"
+  metal:use-macro="view/macro:page/main_only"
 >
-  <!-- metal:use-macro="context/@@main_template/master" -->
 
   <body>
     <div metal:fill-slot="main"
          tal:define="uses_translations view/uses_translations;
                      admin_user context/required:launchpad.TranslationsAdmin">
-      <tal:uses-translations condition="uses_translations">
-        <h1>Translation overview</h1>
-      </tal:uses-translations>
-      <tal:not-uses-translations condition="not: uses_translations">
-        <h1 tal:condition="admin_user">
-          How to start using Launchpad Translations
-        </h1>
-        <h1 tal:condition="not: admin_user">
-          Translation setup needed
-        </h1>
-      </tal:not-uses-translations>
       <ul class="helplinks">
         <li>
           <a href="https://help.launchpad.net/Translations"
@@ -35,31 +18,80 @@
         </li>
       </ul>
       <tal:uses-translations condition="uses_translations">
+        <h1>Translation overview</h1>
+      </tal:uses-translations>
+      <tal:not-uses-translations condition="not: uses_translations">
+        <h1 tal:condition="admin_user">
+          How to start using Launchpad Translations
+        </h1>
+        <h1 tal:condition="not: admin_user">
+          Translation setup needed
+        </h1>
+      </tal:not-uses-translations>
+      <tal:uses-translations condition="uses_translations">
         <tal:translatable define="target context/primary_translatable">
-          <p id="translation-permissions">
-            <tal:product replace="structure context/fmt:link">This
-            project</tal:product> is translated
-            <tal:hasgroup condition="context/translationgroup">by
-              <a tal:attributes="href context/translationgroup/fmt:url"
-                 tal:content="context/translationgroup/title">translators</a>
-            </tal:hasgroup>
-            with <a target="help" href="/+help/permissions-policies.html"
-              tal:content="context/translationpermission/title">certain</a>
-            permissions.
-            <tal:permissions condition="context/required:launchpad.Edit">
-              You can modify permissions on the
-              <a
-                tal:define="link context/menu:navigation/translators"
-                tal:attributes="href link/url"
-              >Settings</a> page.
-            </tal:permissions>
-          </p>
-          <h2>Translation for
-            <span tal:replace="target/displayname">main</span></h2>
-          <div tal:replace="structure target/@@+languages" />
-          <div style="height:1em;"></div>
-          <div tal:replace="structure context/@@+rosetta-status-legend" />
-          <div tal:replace="structure context/@@+portlet-translatables" />
+
+          <div class="top-portlet">
+          </div>
+
+          <div class="yui-g">
+            <div class="yui-u first">
+              <div class="portlet">
+                <h3>Translation details</h3>
+                <p>
+                  Launchpad currently recommends translating
+                  <tal:target replace="structure target/fmt:link/+translations"
+                              >trunk</tal:target>.
+                  <tal:admins condition="context/required:launchpad.AnyPerson">
+                    You can also
+                    <a tal:attributes="href target/fmt:url/+export"
+                       >download</a> or
+                    <a tal:attributes="
+                        href target/fmt:url/+translations-upload"
+                     >upload</a> translations for
+                    <tal:target replace="structure target/name"
+                                >trunk</tal:target>.
+                  </tal:admins>
+                </p>
+                <p>To see all the translation files that are waiting to be
+                  imported, please look at
+                  <a tal:attributes="href context/fmt:url/+imports"
+                     tal:content="string:${context/displayname} import queue">
+                    import queue</a>.
+                </p>
+              </div>
+              <div class="portlet">
+                <h3>Permissions</h3>
+                <p>
+                  <tal:permissions replace="
+                     structure
+                     context/@@+portlet-translation-groups-and-permission"/>
+                </p>
+              </div>
+            </div>
+            <div class="yui-u">
+              <div>
+                <tal:registrant-or-admin
+                   condition="admin_user">
+                  <tal:has-obsolete-entries
+                     condition="context/obsolete_translatable_series">
+                    <div tal:replace="
+                        structure
+                        context/@@+portlet-obsolete-translatables" />
+                  </tal:has-obsolete-entries>
+                </tal:registrant-or-admin>
+              </div>
+              <div tal:replace="structure context/@@+portlet-translatables" />
+            </div>
+          </div>
+
+          <div class="yui-b">
+            <h2>Translation for
+              <span tal:replace="target/displayname">main</span></h2>
+            <div tal:replace="structure target/@@+languages" />
+            <div style="height:1em;"></div>
+            <div tal:replace="structure context/@@+rosetta-status-legend" />
+          </div>
         </tal:translatable>
       </tal:uses-translations>
       <tal:not-uses-translations condition="not: uses_translations">
@@ -123,14 +155,6 @@
           </p>
         </tal:other>
       </tal:not-uses-translations>
-      <tal:registrant-or-admin
-        condition="admin_user">
-        <tal:has-obsolete-entries
-          condition="context/obsolete_translatable_series">
-          <div
-            tal:replace="structure context/@@+portlet-obsolete-translatables" />
-        </tal:has-obsolete-entries>
-      </tal:registrant-or-admin>
     </div>
   </body>
 </html>

=== modified file 'lib/lp/translations/templates/productseries-translations-languages.pt'
--- lib/lp/translations/templates/productseries-translations-languages.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/productseries-translations-languages.pt	2009-09-10 07:24:24 +0000
@@ -3,7 +3,7 @@
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   omit-tag="">
-      <table class="sortable listing" style="width:auto;" id="languagestats">
+      <table class="sortable listing" style="width:100%;" id="languagestats">
         <thead>
           <tr>
             <th>Language</th>

=== modified file 'lib/lp/translations/templates/productseries-translations.pt'
--- lib/lp/translations/templates/productseries-translations.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/productseries-translations.pt	2009-09-10 07:24:24 +0000
@@ -70,7 +70,7 @@
             <tal:permissions condition="context/product/required:launchpad.Edit">
               You can modify permissions on the
               <a
-                tal:define="link context/product/menu:navigation/translators"
+                tal:define="link context/product/menu:navigation/settings"
                 tal:attributes="href link/url"
               >project settings</a> page.
             </tal:permissions>

=== modified file 'lib/lp/translations/templates/project-translations.pt'
--- lib/lp/translations/templates/project-translations.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/project-translations.pt	2009-09-10 18:35:28 +0000
@@ -2,80 +2,88 @@
   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="view/macro:page/onecolumn"
-  i18n:domain="launchpad"
+  metal:use-macro="view/macro:page/main_only"
 >
-  <body>
-    <metal:portlets fill-slot="portlets">
-      <tal:portlet
-        replace="structure context/@@+portlet-translation-groups-and-permission"
-      />
-      <tal:portlet replace="structure context/@@+portlet-preflangs" />
-    </metal:portlets>
-
-  <metal:heading fill-slot="pageheading">
-
-    <tal:block condition="view/required:launchpad.Edit">
-      <p tal:condition="not: context/products" class="warning message"> 
-        There are no projects registered for
-        <span tal:replace="context/displayname">project displayname</span>.
-        <br />
-        You need to <a href="+newproduct">register another project that is
-        part of <tal:project replace="context/displayname" /></a> or associate
-        an existing project with it.
-      </p>
-    </tal:block>
-
-    <tal:untranslatable condition="not: context/translatables">
-      <h1 tal:condition="context/required:launchpad.Edit">
-        How to set up translations
-      </h1>
-      <h1 tal:condition="not: context/required:launchpad.Edit">
-        Translation setup needed
-      </h1>
-    </tal:untranslatable>
-  </metal:heading>
-
-    <div metal:fill-slot="main">
-
-      <h2>Translatable applications</h2>
+<body>
+  <div metal:fill-slot="main">
+
+    <h1>Translatable applications</h1>
+
+    <div class="top-portlet">
+      <p tal:condition="context/translatables">
+        Select a project you want to translate into your own language.
+      </p>
+      <p tal:condition="not:context/translatables">
+        There are no translatable projects in
+        <span tal:content="context/displayname">GNOME</span>.
+      </p>
+      <p tal:condition="not:view/required:launchpad.Edit">
+        If a project for <span tal:content="context/displayname">Project
+        </span> is not listed here, get in touch with
+        <a tal:replace="structure context/owner/fmt:link">owner</a> who is
+        the administrator for the project.
+      </p>
 
       <p>
-        Select a project to begin translating it into your own language.
-        If a project for <span tal:content="context/displayname">Project
-        </span> is not listed here, check that it&#8217;s
-        <a href="/projects">registered with Launchpad</a>, and follow the
-        instructions described at
-        <a href="https://help.launchpad.net/RosettaFAQ">RosettaFAQ</a>
-      </p>
-
-      <table class="listing">
-        <thead>
-          <tr>
-            <th>Project</th>
-            <th>Title</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr tal:repeat="product context/translatables">
-            <td>
-              <img alt="" src="/@@/product" />
-              <a tal:content="product/displayname"
-                 tal:attributes="
-                   href product/fmt:url">Evolution</a>
-            </td>
-            <td>
-              <span tal:replace="product/title">
-                The Evolution Groupware Application
-              </span>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div><!--main-->
-  </body>
+        <tal:permissions
+           replace="structure
+                    context/@@+portlet-translation-groups-and-permission"
+           />
+      </p>
+    </div>
+
+    <div class="yui-g">
+      <div class="yui-u first">
+        <div class="portlet" id="translatable-projects">
+          <h3>Translatable projects</h3>
+          <dl tal:condition="context/translatables">
+            <tal:project repeat="product context/translatables">
+              <dt>
+                <a tal:replace="structure product/fmt:link/+translations">
+                  Evolution
+                </a>
+              </dt>
+              <dd>
+                <span tal:replace="product/title">
+                  The Evolution Groupware Application
+                </span>
+              </dd>
+            </tal:project>
+          </dl>
+        </div>
+      </div>
+      <div class="yui-u">
+        <div class="portlet" id="untranslatable-projects">
+          <h3>Other projects in
+            <tal:group replace="context/displayname">GNOME</tal:group>
+          </h3>
+          <p>
+            These projects are not yet set up for translation in Launchpad.
+          </p>
+          <dl tal:condition="view/untranslatables">
+            <tal:project repeat="product view/untranslatables">
+              <dt>
+                <a tal:replace="structure product/fmt:link/+translations">
+                  Evolution
+                </a>
+              </dt>
+              <dd>
+                <span tal:replace="product/title">
+                  The Evolution Groupware Application
+                </span>
+              </dd>
+            </tal:project>
+          </dl>
+        </div>
+      </div>
+    </div>
+    <div class="yui-b">
+      <p tal:condition="view/required:launchpad.Edit">
+        <a class="add sprite" href="+newproduct">Add another project</a>
+      </p>
+    </div>
+
+
+  </div><!--main-->
+</body>
 </html>