launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/no-more-external-js into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/no-more-external-js/+merge/83887

External JS is now verboten. Kill off Google Analytics, and the Google Web Fonts CSS (since Gecko/Trident extensions allow JS execution).

We may want to rehost the fonts locally later on.
-- 
https://code.launchpad.net/~wgrant/launchpad/no-more-external-js/+merge/83887
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/no-more-external-js into lp:launchpad.

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2011-11-15 21:04:08 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2011-11-30 01:51:31 +0000
@@ -174,12 +174,6 @@
         type="text/css"
         rel="stylesheet"
         media="screen, print"
-        href="https://fonts.googleapis.com/css?family=Ubuntu:400,400italic,700,700italic"; />
-
-  <link
-        type="text/css"
-        rel="stylesheet"
-        media="screen, print"
         tal:attributes="href string:${icingroot}/combo.css" />
 </metal:launchpad-stylesheet-3-0>
 

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2011-11-25 02:19:28 +0000
+++ lib/lp/app/templates/base-layout.pt	2011-11-30 01:51:31 +0000
@@ -72,20 +72,6 @@
       ${view/macro:pagetype}
       ${view/context/fmt:public-private-css}
       yui3-skin-sam">
-        <script type="text/javascript"
-          tal:condition="python: is_lpnet">
-          var _gaq = _gaq || [];
-          _gaq.push(['_setAccount', 'UA-12833497-1']);
-          _gaq.push(['_setDomainName', '.launchpad.net']);
-          _gaq.push(['_setAllowHash', false]);
-          _gaq.push(['_trackPageview']);
-
-          (function() {
-            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
-          })();
-        </script>
     <div class="yui-d0">
       <div id="locationbar" class="login-logout">
         <tal:login replace="structure context/@@login_status" />

=== modified file 'lib/lp/testing/yuixhr.py'
--- lib/lp/testing/yuixhr.py	2011-11-22 12:29:32 +0000
+++ lib/lp/testing/yuixhr.py	2011-11-30 01:51:31 +0000
@@ -171,8 +171,6 @@
             src="/+icing/rev%(revno)s/build/launchpad.js"></script>
           <link rel="stylesheet"
             href="/+icing/yui/assets/skins/sam/skin.css"/>
-          <link type="text/css" rel="stylesheet" media="screen, print"
-                href="https://fonts.googleapis.com/css?family=Ubuntu:400,400italic,700,700italic"; />
           <link rel="stylesheet" href="/+icing/rev%(revno)s/combo.css"/>
           <style>
           /* Taken and customized from testlogger.css */
@@ -220,8 +218,6 @@
           <title>YUI XHR Tests</title>
           <script type="text/javascript"
             src="/+icing/rev%(revno)s/build/launchpad.js"></script>
-          <link type="text/css" rel="stylesheet" media="screen, print"
-                href="https://fonts.googleapis.com/css?family=Ubuntu:400,400italic,700,700italic"; />
           <link rel="stylesheet"
             href="/+icing/yui/assets/skins/sam/skin.css"/>
           <link rel="stylesheet" href="/+icing/rev%(revno)s/combo.css"/>