Merge lp:~rvb/launchpad/deriv-ui-fixes into lp:launchpad

[Raphaël Badin]

[r=gmb][bug=747392] Fix a few minor UI glitches in the UI for derived series.

This branch fixes a few minor glitches in the derived series' UI.

= Test =
(modified test)
./bin/test -cvv test_distroseries test_differences_portlet_all_differences

= List of fixes/QA =
- On a difference page, the comments section's header should be <strong> (and not <h2>)
https://staging.launchpad.net/ubuntu/natty/+localpackagediffs
- The derivation portlet on a derived series home page should say "2772 packages *only* in Sid." instead of "2772 packages in Sid."
https://staging.launchpad.net/ubuntu/natty
- The links inside the derivation portlet on a derived series should have a title, and the icon next to the text should be clickable.
- The initseries page should have a message at the bottom of the page saying "Note that initializing with many thousands of packages is likely to take hours to complete.".
https://dogfood.launchpad.net/deribuntu/anewseries/+initseries
- The submit button of the initseries page should say "Commence initialization". The title of this page should say "Initialize series" (as opposed to "Initialise series")
https://dogfood.launchpad.net/deribuntu/anewseries/+initseries

[Graham Binns (gmb)]

Hi Raphaël,

Only one minor change suggested, as discussed on IRC:

<gmb> rvba: I know that bigjools suggested it in the bug, but I think "Commence Initialization" isn't a good choice of wording for the button. It sounds pretty formal (and a bit silly). It would make more sense to have the help text read something like:
<gmb> "Note that initialization is not instantaneous; initializing with many thousands of packages is likely to take hours to complete."
<gmb> And leave the button as it is already.
<gmb> rvba: How's that sound?
<rvba> gmb: sound good to me!

review: Approve (code)

=== modified file 'lib/lp/registry/browser/tests/test_distroseries.py'
--- lib/lp/registry/browser/tests/test_distroseries.py	2011-04-18 10:43:39 +0000
+++ lib/lp/registry/browser/tests/test_distroseries.py	2011-04-27 07:33:07 +0000
@@ -190,15 +190,15 @@
                 text='Derived from Sid'),
             soupmatchers.Tag(
                 'Differences link', 'a',
-                text=re.compile('\s*1 package with differences.\s*'),
+                text=re.compile('\s*1 package with differences\s*'),
                 attrs={'href': re.compile('.*/\+localpackagediffs')}),
             soupmatchers.Tag(
                 'Parent diffs link', 'a',
-                text=re.compile('\s*2 packages in Sid.\s*'),
+                text=re.compile('\s*2 packages only in Sid\s*'),
                 attrs={'href': re.compile('.*/\+missingpackages')}),
             soupmatchers.Tag(
                 'Child diffs link', 'a',
-                text=re.compile('\s*3 packages in Deri.\s*'),
+                text=re.compile('\s*3 packages only in Deri\s*'),
                 attrs={'href': re.compile('.*/\+uniquepackages')}))
 
         with person_logged_in(self.simple_user):
@@ -249,7 +249,7 @@
         portlet_display = soupmatchers.HTMLContains(
             soupmatchers.Tag(
                 'Derived series', 'h2',
-                text='Derived series'),
+                text='Series initialisation in progress'),
             soupmatchers.Tag(
                 'Init message', True,
                 text=re.compile('\s*This series is initialising.\s*')),

=== modified file 'lib/lp/registry/javascript/tests/test_distroseries.js'
--- lib/lp/registry/javascript/tests/test_distroseries.js	2011-04-21 11:56:39 +0000
+++ lib/lp/registry/javascript/tests/test_distroseries.js	2011-04-27 07:33:07 +0000
@@ -716,7 +716,7 @@
         makeActionsDiv: function() {
             var submit = Y.Node.create("<input />")
                 .set("type", "submit")
-                .set("value", "Initialize series");
+                .set("value", "Initialize Series");
             var cancel = Y.Node.create("<a>Cancel</a>");
             var div = Y.Node.create("<div />")
                 .addClass("actions")

=== modified file 'lib/lp/registry/templates/distroseries-initialize.pt'
--- lib/lp/registry/templates/distroseries-initialize.pt	2011-04-21 09:00:39 +0000
+++ lib/lp/registry/templates/distroseries-initialize.pt	2011-04-27 07:33:07 +0000
@@ -34,6 +34,10 @@
           Y.on('domready', Y.lp.registry.distroseries.initseries.setup);
         });
       </script>
+      <p class="formHelp">
+        Note that initialization is not instantaneous; initializing with
+        many thousands of packages is likely to take hours to complete.
+      </p>
       </tal:enabled>
       <tal:disabled condition="not:view/is_derived_series_feature_enabled">
       <p class="error message">

=== modified file 'lib/lp/registry/templates/distroseries-portlet-derivation.pt'
--- lib/lp/registry/templates/distroseries-portlet-derivation.pt	2011-04-12 15:38:07 +0000
+++ lib/lp/registry/templates/distroseries-portlet-derivation.pt	2011-04-27 07:33:07 +0000
@@ -12,27 +12,33 @@
                          nb_diffs_in_parent view/num_differences_in_parent;
                          nb_diffs_in_child view/num_differences_in_child;">
         <ul id="derivation_stats">
-          <li class="sprite info" tal:condition="nb_diffs">
-            <a tal:attributes="href string:${context/fmt:url}/+localpackagediffs">
+          <li tal:condition="nb_diffs">
+            <a tal:attributes="href string:${context/fmt:url}/+localpackagediffs"
+               class="sprite info"
+               title="Source package differences between this series and his parent">
               <tal:nb_diffs replace="nb_diffs"/> package<tal:plural
                 content="string:s"
-                condition="python:nb_diffs!=1"/> with differences.
+                condition="python:nb_diffs!=1"/> with differences
             </a>
           </li>
-         <li class="sprite info" tal:condition="nb_diffs_in_parent">
-            <a tal:attributes="href string:${context/fmt:url}/+missingpackages">
+         <li tal:condition="nb_diffs_in_parent">
+            <a tal:attributes="href string:${context/fmt:url}/+missingpackages"
+               class="sprite info"
+               title="Source packages only in parent series">
               <tal:nb_diffs replace="nb_diffs_in_parent"/> package<tal:plural
                 content="string:s"
-                condition="python:nb_diffs_in_parent!=1"/> in <tal:replace
-                  replace="context/parent_series/displayname">Sid</tal:replace>.
+                condition="python:nb_diffs_in_parent!=1"/> only in <tal:replace
+                  replace="context/parent_series/displayname">Sid</tal:replace>
             </a>
           </li>
-          <li class="sprite info" tal:condition="nb_diffs_in_child">
-            <a tal:attributes="href string:${context/fmt:url}/+uniquepackages">
+          <li tal:condition="nb_diffs_in_child">
+            <a tal:attributes="href string:${context/fmt:url}/+uniquepackages"
+               class="sprite info"
+               title="Source packages only in derived series">
               <tal:nb_diffs replace="nb_diffs_in_child"/> package<tal:plural
                 content="string:s"
-                condition="python:nb_diffs_in_child!=1"/> in <tal:replace
-                  replace="context/displayname">Natty</tal:replace>.
+                condition="python:nb_diffs_in_child!=1"/> only in <tal:replace
+                  replace="context/displayname">Natty</tal:replace>
             </a>
           </li>
          </ul>
@@ -43,7 +49,7 @@
       </tal:diffs>
   </tal:is_initialised>
   <tal:is_initialising condition="context/is_initialising">
-    <h2>Derived series</h2>
+    <h2>Series initialisation in progress</h2>
       This series is initialising.
   </tal:is_initialising>
   </tal:is_derived>

=== modified file 'lib/lp/registry/templates/distroseriesdifference-listing-extra.pt'
--- lib/lp/registry/templates/distroseriesdifference-listing-extra.pt	2011-04-18 14:23:22 +0000
+++ lib/lp/registry/templates/distroseriesdifference-listing-extra.pt	2011-04-27 07:33:07 +0000
@@ -120,7 +120,7 @@
     </tal:package-diffs>
   </dl>
 
-  <h2>Comments:</h2>
+  <strong>Comments:</strong>
   <tal:conversation replace="structure view/@@+render"/>
   <tal:show_options condition="view/show_edit_options"
                     define="src_name context/source_package_name/name">