Merge lp:~rharding/launchpad/fix_cal2 into lp:launchpad

[Richard Harding]

[r=jcsackett][bug=949856] Update the way the yui2 calendar bits are included so as to work with the way it's included in launchpad.js.

= Summary =
The YUI2 calendar is getting pulled from the Yahoo CDN because it's listed as
a YUI.use() section of the calendar bootstrap code.

== Proposed fix ==
- Move the dependencies over to the actual lp.app.calendar module where they
belong.

- Add the list of yui2 modules to the YUIConfig as ignored since they're auto
built into launchpad.js now

- Remove the old links to the calendar files since we don't need them,
calendar bits are in launchpad.js

== Demo and Q/A ==
Make sure that you do not get any external yahoo cdn calls when visiting:
https://launchpad.net/projects/+review-licenses

Make sure that the calendar widgets at the bottom of the page still function
when you click "Choose"

[j.c.sackett (jcsackett)]

Looks good to me.

review: Approve

=== modified file 'lib/lp/app/javascript/calendar.js'
--- lib/lp/app/javascript/calendar.js	2011-04-19 18:03:50 +0000
+++ lib/lp/app/javascript/calendar.js	2012-03-19 17:56:39 +0000
@@ -245,5 +245,9 @@
     Y.on("domready", namespace.add_calendar_widgets);
 };
 
-}, "0.1", {"requires": ["node"]});
-
+}, "0.1", {
+    'requires': [
+        'node', 'yui2-yahoo', 'yui2-event', 'yui2-dom', 'yui2-calendar',
+        'yui2-dom-event'
+    ]
+});

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2012-03-06 10:11:53 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2012-03-19 17:56:39 +0000
@@ -69,7 +69,11 @@
        YUI.GlobalConfig = {
            debug: ${yui_console_debug},
            fetchCSS: false,
-           timeout: 50
+           timeout: 50,
+           ignore: [
+               'yui2-yahoo', 'yui2-event', 'yui2-dom',
+               'yui2-calendar','yui2-dom-event'
+           ]
         }
        ">
     </script>

=== modified file 'lib/lp/app/templates/launchpad-widget-macros.pt'
--- lib/lp/app/templates/launchpad-widget-macros.pt	2012-02-01 15:31:32 +0000
+++ lib/lp/app/templates/launchpad-widget-macros.pt	2012-03-19 17:56:39 +0000
@@ -2,7 +2,7 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  omit-tag=""> 
+  omit-tag="">
   <tal:comment condition="nothing">
     This is a customised version of lib/zope/form/browser/widget_macros.pt
     for Launchpad use.
@@ -92,36 +92,15 @@
       tal:define="yui2 string:${icingroot}/yui_2.7.0b/build;">
 
       <script type="text/javascript">
-          LPJS.use(
-              'lang', 'node', 'lp.app.calendar', 'yui2-yahoo',
-              'yui2-event', 'yui2-dom', 'yui2-calendar', 'yui2-dom-event',
-              function(Y) {
+          LPJS.use('lang', 'node', 'lp.app.calendar', function(Y) {
                   Y.lp.app.calendar.setup_calendar_widgets();
               }
           );
       </script>
 
-      <tal:js-legacy condition="not: features/js.combo_loader.enabled">
-        <tal:devmode condition="devmode">
-        <script type="text/javascript"
-                tal:attributes="src string:${yui2}/yahoo/yahoo.js"></script>
-        <script type="text/javascript"
-                tal:attributes="src string:${yui2}/event/event.js"></script>
-        <script type="text/javascript"
-                tal:attributes="src string:${yui2}/dom/dom.js"></script>
-        <script type="text/javascript"
-                tal:attributes="src string:${yui2}/calendar/calendar.js"></script>
-        </tal:devmode>
-        <tal:nondevmode condition="not: devmode">
-        <script type="text/javascript"
-                tal:attributes="src string:${yui2}/yahoo-dom-event/yahoo-dom-event.js"></script>
-        <script type="text/javascript"
-                tal:attributes="src string:${yui2}/calendar/calendar-min.js"></script>
-        </tal:nondevmode>
-      </tal:js-legacy>
-        <link rel="stylesheet" type="text/css"
-            tal:attributes="href
-            string:${yui2}/calendar/assets/skins/sam/calendar.css" />
+      <link rel="stylesheet" type="text/css"
+          tal:attributes="href
+          string:${yui2}/calendar/assets/skins/sam/calendar.css" />
     </tal:yui2resources>
 
 </metal:yui2calendar-dependencies>

=== modified file 'lib/lp/registry/javascript/tests/test_milestone_creation_failures.html'
--- lib/lp/registry/javascript/tests/test_milestone_creation_failures.html	2012-02-13 15:43:25 +0000
+++ lib/lp/registry/javascript/tests/test_milestone_creation_failures.html	2012-03-19 17:56:39 +0000
@@ -13,6 +13,16 @@
       <script type="text/javascript"
               src="../../../../../build/js/yui/yui/yui.js">
       </script>
+      <script type="text/javascript">
+          YUI.GlobalConfig = {
+              fetchCSS: false,
+              timeout: 50,
+              ignore: [
+                  'yui2-yahoo', 'yui2-event', 'yui2-dom',
+                  'yui2-calendar','yui2-dom-event'
+              ]
+          }
+      </script>
       <link rel="stylesheet"
       href="../../../../../build/js/yui/console/assets/console-core.css" />
       <link rel="stylesheet"
@@ -21,12 +31,23 @@
       href="../../../../../build/js/yui/test/assets/skins/sam/test.css" />
 
       <script type="text/javascript"
-              src="../../../../../build/js/lp/app/testing/testrunner.js"></script>
+          src="../../../../../build/js/lp/app/testing/testrunner.js"></script>
 
       <link rel="stylesheet" href="../../../app/javascript/testing/test.css" />
 
       <!-- Dependencies -->
       <script type="text/javascript"
+          src="../../../../../build/js/yui2/yahoo/yahoo.js"></script>
+      <script type="text/javascript"
+          src="../../../../../build/js/yui2/event/event.js"></script>
+      <script type="text/javascript"
+          src="../../../../../build/js/yui2/calendar/calendar.js"></script>
+      <script type="text/javascript"
+          src="../../../../../build/js/yui2/yahoo-dom-event/yahoo-dom-event.js"></script>
+      <script type="text/javascript"
+          src="../../../../../build/js/yui2/dom/dom.js"></script>
+
+      <script type="text/javascript"
           src="../../../../../build/js/lp/app/calendar.js"></script>
       <script type="text/javascript"
           src="../../../../../build/js/lp/app/client.js"></script>

=== modified file 'lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt'
--- lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt	2012-01-25 04:56:50 +0000
+++ lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt	2012-03-19 17:56:39 +0000
@@ -54,7 +54,6 @@
     >>> print extract_all_script_and_style_links(cprov_browser.contents)
     /...
     ...
-    http://launchpad.dev/+icing/.../build/calendar/calendar.js
     http://launchpad.dev/+icing/.../yui_2.7.0b/build/calendar/assets/skins/sam/calendar.css
 
 Initially there are no subscriptions for a newly privatized PPA (although,

=== modified file 'lib/lp/testing/yuixhr.py'
--- lib/lp/testing/yuixhr.py	2012-01-15 12:22:55 +0000
+++ lib/lp/testing/yuixhr.py	2012-03-19 17:56:39 +0000
@@ -171,6 +171,16 @@
           <title>Test</title>
           <script type="text/javascript"
             src="/+icing/rev%(revno)s/build/launchpad.js"></script>
+          <script type="text/javascript">
+              YUI.GlobalConfig = {
+                  fetchCSS: false,
+                  timeout: 50,
+                  ignore: [
+                      'yui2-yahoo', 'yui2-event', 'yui2-dom',
+                      'yui2-calendar','yui2-dom-event'
+                  ]
+              }
+          </script>
           <link rel="stylesheet"
             href="/+icing/yui/assets/skins/sam/skin.css"/>
           <link rel="stylesheet" href="/+icing/rev%(revno)s/combo.css"/>