Merge lp:~danilo/launchpad/fix-806925 into lp:launchpad

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

[r=adeuring][rollback=13421] Migrate expanders on DistroSourcePackage:+index page so they work with the already replaced JS. QA fix for problem found during QA. (This is not really a rollback but a fix for the revision 13421)

= Bug 806925 QA fix =

William found a problem with DistroSourcePackage:+index page expanders. Basically, I haven't realized that the same JS is used for two different templates (one was for PPA +packages page, which I QAd), so I haven't migrated the template for DSP:+index page.

Migration is simple.

== Demo and Q/A ==

https://launchpad.dev/ubuntu/+source/mozilla-firefox
https://launchpad.dev/ubuntu/+source/iceweasel (has PPAs to test the "related PPAs" expander)

[Abel Deuring (adeuring)]

review: Approve (code)

[Abel Deuring (adeuring)]

yay for more "code normalisation"!

review: Approve (code)

=== modified file 'lib/lp/registry/templates/distributionsourcepackage-index.pt'
--- lib/lp/registry/templates/distributionsourcepackage-index.pt	2011-06-16 13:50:58 +0000
+++ lib/lp/registry/templates/distributionsourcepackage-index.pt	2011-07-18 08:56:30 +0000
@@ -151,9 +151,7 @@
           <a class="expander"
              tal:attributes="id string:pub${pubid}-expander;
                              href string:${archive/fmt:url}/+sourcepub/${pubid}/+listing-archive-extra">
-            <img style="padding-right:0.5em;" src="/@@/treeCollapsed"
-                 alt="Show details" title="Show details"
-                 tal:attributes="id string:pub${pubid}-arrow"/>
+            &nbsp;
           </a>
           <a tal:attributes="href row/version">
             <img src="/@@/package-source" />
@@ -174,7 +172,7 @@
                content="string:(not published)"/>
         </td>
       </tr>
-      <tr tal:attributes="id string:pub${pubid}" style="display: none">
+      <tr tal:attributes="id string:pub${pubid}">
         <td colspan="3">
           <div class="package-details"
                tal:attributes="id string:pub${pubid}-container"></div>
@@ -240,34 +238,17 @@
       </p>
     </div>
 <script type="text/javascript">
-    LPS.use('node', 'event', 'lazr.effects', function(Y) {
+LPS.use('node', 'event', 'lp.app.widgets.expander', function(Y) {
 
     // XXX Michael Nelson 20090702 bug=340497 This slider
     // needs an integration test.
-    // Collapse the body of the slider widget initially.
-    Y.one('#related-ppa-versions .widget-bd').addClass('lazr-closed');
-
-    // Ensure that the widget header uses the correct sprite icon
-    // and gets the styling for javascript actions applied.
-    var widget_header = Y.one('#related-ppa-versions .widget-hd');
-    widget_header.addClass('sprite');
-    widget_header.addClass('treeCollapsed');
-    widget_header.addClass('js-action');
-
-    var slide;
-    Y.on('click', function(e) {
-        if (!slide) {
-            slide = Y.lazr.effects.slide_out('#related-ppa-versions .widget-bd');
-            widget_header.replaceClass('treeCollapsed', 'treeExpanded');
-        } else {
-            slide.set('reverse', !slide.get('reverse'));
-            widget_header.toggleClass('treeExpanded');
-            widget_header.toggleClass('treeCollapsed');
-        }
-        slide.stop();
-        slide.run();
-
-    }, '#slide-trigger');
+
+    var related_ppas = Y.one('#related-ppa-versions');
+    var widget_header = related_ppas.one('.widget-hd');
+    var widget_body = related_ppas.one('.widget-bd');
+    var expander = new Y.lp.app.widgets.expander.Expander(
+        widget_header, widget_body);
+    expander.setUp(true);
 });
 </script>
 

=== modified file 'lib/lp/soyuz/stories/distribution/xx-distribution-packages.txt'
--- lib/lp/soyuz/stories/distribution/xx-distribution-packages.txt	2011-06-16 13:50:58 +0000
+++ lib/lp/soyuz/stories/distribution/xx-distribution-packages.txt	2011-07-18 08:56:30 +0000
@@ -257,7 +257,7 @@
     ...     user_browser.contents, 'expander')[0]
     >>> print expander_url
     <a class="expander" href="/ubuntu/+archive/primary/+sourcepub/26/+listing-archive-extra" id="pub26-expander">
-    <img style... src="/@@/treeCollapsed" alt="Show details" title="Show details" id="pub26-arrow" />
+      &nbsp;
     </a>
 
     >>> browser.open(user_browser.getLink(id="pub26-expander").url)