Merge lp:~rvb/launchpad/derivation-ui-fixes into lp:launchpad/db-devel

[Raphaël Badin]

[r=julian-edwards][bug=783429,783433,783436,783441] Minor UI fixes for derived distros.

Minor UI fixes for derived distros.

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'lib/lp/registry/browser/distroseries.py'
--- lib/lp/registry/browser/distroseries.py	2011-05-19 16:05:17 +0000
+++ lib/lp/registry/browser/distroseries.py	2011-05-20 09:43:33 +0000
@@ -989,11 +989,6 @@
                 self.getParentName(multiple_parent_default='parent series'),
                 ))
 
-    @action(_("Update"), name="update")
-    def update_action(self, action, data):
-        """Simply re-issue the form with the new values."""
-        pass
-
     @action(_("Sync Sources"), name="sync", validator='validate_sync',
             condition='canPerformSync')
     def sync_sources(self, action, data):
@@ -1089,11 +1084,6 @@
                 self.context.displayname,
                 ))
 
-    @action(_("Update"), name="update")
-    def update_action(self, action, data):
-        """Simply re-issue the form with the new values."""
-        pass
-
     @action(_("Sync Sources"), name="sync", validator='validate_sync',
             condition='canPerformSync')
     def sync_sources(self, action, data):
@@ -1130,10 +1120,5 @@
                 self.getParentName(),
                 ))
 
-    @action(_("Update"), name="update")
-    def update_action(self, action, data):
-        """Simply re-issue the form with the new values."""
-        pass
-
     def canPerformSync(self, *args):
         return False
 
=== modified file 'lib/lp/registry/templates/distroseries-localdifferences.pt'
--- lib/lp/registry/templates/distroseries-localdifferences.pt	2011-05-19 17:06:13 +0000
+++ lib/lp/registry/templates/distroseries-localdifferences.pt	2011-05-20 09:43:33 +0000
@@ -47,14 +47,17 @@
               </th>
               <th tal:condition="view/show_parent_version">
                 <tal:one_parent condition="view/has_unique_parent">
-                  <tal:replace replace="view/unique_parent/displayname" /> version
+                  <a tal:attributes="href view/unique_parent/fmt:url"
+                     tal:content="view/unique_parent/displayname">Warty</a> version
                 </tal:one_parent>
                 <tal:multiple_parents condition="not: view/has_unique_parent">
                   Parent version
                 </tal:multiple_parents>
               </th>
               <th tal:condition="view/show_derived_version">
-                <tal:replace replace="series_name" /> version</th>
+                <a tal:attributes="href context/fmt:url"
+                   tal:content="series_name">Deriwarty</a> version
+              </th>
               <th tal:condition="view/show_parent_packagesets">
                 Parent package-sets
               </th>
@@ -81,7 +84,8 @@
                       value diff_id;
                       id string:field.selected_differences.${diff_id}"/>
 
-                  <a tal:attributes="href difference/fmt:url" class="toggle-extra"
+                  <a tal:attributes="href difference/fmt:url"
+                     class="js-action toggle-extra"
                      tal:content="src_name">Foo</a>
                 </tal:checkbox>
                 <tal:clockface condition="python: view.hasPendingSync(difference)">
@@ -176,7 +180,9 @@
             </tal:difference>
           </tbody>
         </table>
-        <tal:selectable_differences_end
+        <tal:navigation_bottom
+          replace="structure differences/@@+navigation-links-lower" />
+         <tal:selectable_differences_end
                define="widget nocall:view/widgets/selected_differences;
                        field_name widget/context/__name__;
                        error python:view.getFieldError(field_name);">