Merge lp:~rharding/launchpad/gallery-accordian_fix into lp:launchpad

[Richard Harding]

[r=jcsackett][no-qa] Remove lp/contrib by removing css and js into new homes and updating tests.

= Summary =
Ignore the poor branch name. This started out as fixing gallery-accordion for the combo loader so that it can be served via the build/js directory. In the end, the goal was to wipe out contrib and find better homes for all of the code there.

== Proposed Fix ==
We've moved the accordion and mustache code into lib/lp/app. We then moved the google analytics to the icing directory and pull it in with the rest of the GA setup code in the base-layout instead. Finally, we moved the webfonts to the place it was originally symlinked from.

== Implementation Details ==
These changes required us to update tests to pull from the build location vs the contrib directory, but in the end, since things are pulled in via YUI.use(), it doesn't require any changes to the real JS blocks.

== Tests ==
lib/lp/app/javascript/tests/test_listing_navigator.html
lib/lp/bugs/javascript/tests/test_buglisting.html
lib/lp/registry/javascript/tests/test_structural_subscription.html
lib/lp/app/javascript/tests/test_beta_notification.html
lib/lp/code/javascript/tests/test_branchmergeproposal.nominate.html

== Demo and Q/A ==
- The mustache templates when using the bug listings should still work fine
- The Google Analytics code should still load on each page load if you have the combo loader FF or not.
- You should still get the custom fonts css on every page load
- The structural subscriptions view should still be able to load the accordion code if you have the combo loader FF or not enabled.

[j.c.sackett (jcsackett)]

Rick--

This looks good to me. Thanks for cutting through the underbrush of our JS some. :-)

review: Approve

=== modified file 'buildout-templates/bin/combine-css.in'
--- buildout-templates/bin/combine-css.in	2011-12-23 18:06:50 +0000
+++ buildout-templates/bin/combine-css.in	2012-02-16 14:33:22 +0000
@@ -11,10 +11,6 @@
 from lp.scripts.utilities.js.jsbuild import ComboFile
 from lp.scripts.utilities.js.combo import combine_files
 
-# This constant helps us meet maximum line-length goals.
-GALLERY_ACCORDION = 'yui3-gallery/gallery-accordion/assets/'
-
-
 root = os.path.abspath('.')
 root = os.path.normpath(${buildout:directory|path-repr})
 icing = os.path.join(root, 'lib/canonical/launchpad/icing')
@@ -42,8 +38,8 @@
     'build/activator/assets/skins/sam/activator.css',
     'build/choiceedit/assets/choiceedit-core.css',
     'build/ordering/assets/ordering-core.css',
-    GALLERY_ACCORDION + 'gallery-accordion-core.css',
-    GALLERY_ACCORDION + 'skins/sam/gallery-accordion-skin.css',
+    'build/gallery-accordion/assets/gallery-accordion-core.css',
+    'build/gallery-accordion/assets/skins/sam/gallery-accordion-skin.css',
     'build/sprite.css',
     # Include our main stylesheets at the end so they
     # take precedence over the others.

=== modified file 'buildout-templates/bin/combo-rootdir.in'
--- buildout-templates/bin/combo-rootdir.in	2012-02-15 03:54:32 +0000
+++ buildout-templates/bin/combo-rootdir.in	2012-02-16 14:33:22 +0000
@@ -33,8 +33,6 @@
 find $BUILD_DIR/lp -name 'tests' -type d | xargs rm -rf
 
 # We have to move some modules around.
-cp lib/lp/contrib/javascript/lp.mustache.js $BUILD_DIR/lp
-rm $BUILD_DIR/lp/contrib/mustache.js
 rm $BUILD_DIR/lp/app/worlddata
 cp lib/lp/services/worlddata/javascript/languages.js $BUILD_DIR/lp
 cp lib/lp/app/longpoll/javascript/longpoll.js $BUILD_DIR/lp

=== renamed directory 'lib/lp/contrib/javascript/google-analytics' => 'lib/canonical/launchpad/icing/google-analytics'
=== renamed file 'lib/lp/contrib/css/ubuntu-webfonts.css' => 'lib/canonical/launchpad/icing/ubuntu-webfonts.css'
=== removed symlink 'lib/canonical/launchpad/icing/ubuntu-webfonts.css'
=== target was u'../../../lp/contrib/css/ubuntu-webfonts.css'
=== renamed directory 'lib/lp/contrib/javascript/yui3-gallery/gallery-accordion' => 'lib/lp/app/javascript/gallery-accordion'
=== renamed file 'lib/lp/contrib/javascript/lp.mustache.js' => 'lib/lp/app/javascript/mustache.js'
=== modified file 'lib/lp/app/javascript/tests/test_beta_notification.html'
--- lib/lp/app/javascript/tests/test_beta_notification.html	2012-02-10 13:51:00 +0000
+++ lib/lp/app/javascript/tests/test_beta_notification.html	2012-02-16 14:33:22 +0000
@@ -27,7 +27,7 @@
 
       <!-- Dependencies -->
       <script type="text/javascript"
-          src="../../../../../build/js/lp/lp.mustache.js"></script>
+          src="../../../../../build/js/lp/app/mustache.js"></script>
 
       <!-- The module under test. -->
       <script type="text/javascript" src="../beta-notification.js"></script>

=== modified file 'lib/lp/app/javascript/tests/test_listing_navigator.html'
--- lib/lp/app/javascript/tests/test_listing_navigator.html	2012-02-10 13:51:00 +0000
+++ lib/lp/app/javascript/tests/test_listing_navigator.html	2012-02-16 14:33:22 +0000
@@ -43,7 +43,7 @@
       <script type="text/javascript"
           src="../../../../../build/js/lp/app/lp.js"></script>
       <script type="text/javascript"
-          src="../../../../../build/js/lp/lp.mustache.js"></script>
+          src="../../../../../build/js/lp/app/mustache.js"></script>
       <script type="text/javascript"
           src="../../../../../build/js/lp/app/overlay/overlay.js"></script>
       <script type="text/javascript"

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2012-02-13 18:51:42 +0000
+++ lib/lp/app/templates/base-layout.pt	2012-02-16 14:33:22 +0000
@@ -80,6 +80,9 @@
           _gaq.push(['_setAllowHash', false]);
           _gaq.push(['_trackPageview']);
         </script>
+        <script type="text/javascript"
+            tal:condition="python: is_lpnet"
+            tal:attributes="src string:${icingroot}/google-analytics/ga.js"></script>
     <div class="yui-d0">
       <div id="locationbar" class="login-logout">
         <tal:login replace="structure context/@@login_status" />

=== modified file 'lib/lp/bugs/javascript/tests/test_buglisting.html'
--- lib/lp/bugs/javascript/tests/test_buglisting.html	2012-02-16 14:33:21 +0000
+++ lib/lp/bugs/javascript/tests/test_buglisting.html	2012-02-16 14:33:22 +0000
@@ -27,7 +27,7 @@
 
       <!-- Dependencies -->
       <script type="text/javascript"
-          src="../../../../../build/js/lp/lp.mustache.js"></script>
+          src="../../../../../build/js/lp/app/mustache.js"></script>
       <script type="text/javascript"
           src="../../../../../build/js/lp/app/client.js"></script>
       <script type="text/javascript"

=== modified file 'lib/lp/bugs/javascript/tests/test_bugtask_delete.html'
--- lib/lp/bugs/javascript/tests/test_bugtask_delete.html	2012-02-16 14:33:21 +0000
+++ lib/lp/bugs/javascript/tests/test_bugtask_delete.html	2012-02-16 14:33:22 +0000
@@ -30,11 +30,10 @@
       <script type="text/javascript" src="../../../../../build/js/lp/app/client.js"></script>
       <script type="text/javascript" src="../../../../../build/js/lp/app/errors.js"></script>
       <script type="text/javascript" src="../../../../../build/js/lp/app/lp.js"></script>
-  
+
       <!-- Other dependencies -->
       <script type="text/javascript" src="../../../../../build/js/lp/app/testing/mockio.js"></script>
-      <script type="text/javascript"
-        src="../../../contrib/javascript/mustache.j../../build/js/lp/s"><
+      <script type="text/javascript" src="../../../../../build/js/lp/app/mustache.js"><
       <script type="text/javascript" src="../../../../../build/js/lp/app/activator/activator.js"></script>
       <script type="text/javascript" src="../../../../../build/js/lp/app/anim/anim.js"></script>
       <script type="text/javascript" src="../../../../../build/js/lp/app/confirmationoverlay/confirmationoverlay.js"></script>

=== modified file 'lib/lp/bugs/javascript/tests/test_bugtask_delete.js'
--- lib/lp/bugs/javascript/tests/test_bugtask_delete.js	2012-01-31 02:45:45 +0000
+++ lib/lp/bugs/javascript/tests/test_bugtask_delete.js	2012-02-16 14:33:22 +0000
@@ -1,6 +1,6 @@
 YUI().use('lp.testing.runner', 'lp.testing.mockio', 'base', 'test', 'console',
           'node', 'node-event-simulate', 'lp.bugs.bugtask_index',
-          'lp.app.picker',
+          'lp.app.picker', 'lp.mustache',
     function(Y) {
 
 var suite = new Y.Test.Suite("Bugtask deletion Tests");

=== modified file 'lib/lp/code/javascript/tests/test_branchmergeproposal.nominate.html'
--- lib/lp/code/javascript/tests/test_branchmergeproposal.nominate.html	2012-02-16 14:33:21 +0000
+++ lib/lp/code/javascript/tests/test_branchmergeproposal.nominate.html	2012-02-16 14:33:22 +0000
@@ -26,7 +26,7 @@
       <link rel="stylesheet" href="../../../app/javascript/testing/test.css" />
 
       <!-- Dependencies -->
-      <script type="text/javascript" src="../../../../../build/js/lp/lp.mustache.js"></script>
+      <script type="text/javascript" src="../../../../../build/js/lp/app/mustache.js"></script>
       <script type="text/javascript" src="../../../../../build/js/lp/app/client.js"></script>
       <script type="text/javascript" src="../../../../../build/js/lp/app/lp.js"></script>
       <script type="text/javascript" src="../../../../../build/js/lp/app/activator/activator.js"></script>
@@ -72,4 +72,3 @@
 
     </body>
 </html>
-

=== removed directory 'lib/lp/contrib'
=== removed directory 'lib/lp/contrib/css'
=== removed directory 'lib/lp/contrib/javascript'
=== removed symlink 'lib/lp/contrib/javascript/mustache.js'
=== target was u'../../../../sourcecode/mustache.js/mustache.js'
=== removed directory 'lib/lp/contrib/javascript/yui3-gallery'
=== modified file 'lib/lp/registry/javascript/tests/test_structural_subscription.html'
--- lib/lp/registry/javascript/tests/test_structural_subscription.html	2012-02-16 14:33:21 +0000
+++ lib/lp/registry/javascript/tests/test_structural_subscription.html	2012-02-16 14:33:22 +0000
@@ -43,7 +43,7 @@
       <script type="text/javascript"
           src="../../../../../build/js/lp/app/inlinehelp/inlinehelp.js"></script>
       <script type="text/javascript"
-          src="../../../contrib/javascript/yui3-gallery/gallery-accordion/gallery-accordion.js"></script>
+          src="../../../../../build/js/lp/app//gallery-accordion/gallery-accordion.js"></script>
 
       <!-- The module under test. -->
       <script type="text/javascript" src="../structural-subscription.js"></script>

=== modified file 'lib/lp/registry/javascript/tests/test_team_mailinglists.html'
--- lib/lp/registry/javascript/tests/test_team_mailinglists.html	2012-02-16 14:33:21 +0000
+++ lib/lp/registry/javascript/tests/test_team_mailinglists.html	2012-02-16 14:33:22 +0000
@@ -1,4 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+
   "http://www.w3.org/TR/html4/strict.dtd">
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
@@ -27,7 +28,7 @@
 
       <!-- Dependencies -->
       <script type="text/javascript"
-          src="../../../../../build/js/lp/lp.mustache.js"></script>
+          src="../../../../../build/js/lp/app/mustache.js"></script>
 
       <!-- The module under test. -->
       <script type="text/javascript" src="../team_mailinglists.js"></script>