Merge lp:~kfogel/launchpad/google-analytics-everywhere into lp:launchpad

[Karl Fogel]

Activate Google Analytics for all of Launchpad, instead of just for 'edge'.

Activate Google Analytics for all of Launchpad, instead of just for 'edge'.

[Gary Poster (gary)]

review: Approve

[Karl Fogel (kfogel)]

Gary, I had to make a couple of test changes (turns out that EC2 run was not a waste of time!). Can you please review them before I land? Thanks.

review: Resubmit

[Karl Fogel (kfogel)]

Passes EC2 now, by the way.

[Gary Poster (gary)]

gary_poster: kfogel: re https://code.edge.launchpad.net/~kfogel/launchpad/google-analytics-everywhere/+merge/22891 , it's fine. I would remove the lines with only ellipses, because I don't think they buy anything, but if you disagree, I'm ok with it as is.
[09:58am] kfogel: gary_poster: that's a good idea; I wasn't sure quite how "..." matching worked and actually meant to test without those lines, then forgot to.
[09:58am] gary_poster: kfogel: it's very greedy, think ``.*``
[09:59am] kfogel: gary_poster: ok
[09:59am] gary_poster: kfogel: fwiw actually, I think ``.+`` is more accurate
[09:59am] kfogel: gary_poster: gotcha

review: Approve

=== modified file 'lib/lp/app/browser/tests/base-layout.txt'
--- lib/lp/app/browser/tests/base-layout.txt	2010-03-05 02:57:25 +0000
+++ lib/lp/app/browser/tests/base-layout.txt	2010-04-07 14:07:35 +0000
@@ -70,6 +70,9 @@
           main_side
           public
           yui-skin-sam">
+             <script type="text/javascript">
+             ...google-analytics.com...
+             </script>
         <div class="yui-d0">
     <BLANKLINE>
           <div id="locationbar">
@@ -274,6 +277,9 @@
           searchless
           public
           yui-skin-sam">
+             <script type="text/javascript">
+             ...google-analytics.com...
+             </script>
         <div class="yui-d0">
     ...
 
@@ -386,6 +392,9 @@
           locationless
           public
           yui-skin-sam">
+             <script type="text/javascript">
+             ...google-analytics.com...
+             </script>
         <div class="yui-d0">
     ...
 

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2010-02-04 11:17:39 +0000
+++ lib/lp/app/templates/base-layout.pt	2010-04-07 14:07:35 +0000
@@ -69,7 +69,7 @@
       ${view/macro:pagetype}
       ${view/context/fmt:public-private-css}
       yui-skin-sam">
-        <script type="text/javascript" tal:condition="is_edge">
+        <script type="text/javascript">
           var _gaq = _gaq || [];
           _gaq.push(['_setAccount', 'UA-12833497-1']);
           _gaq.push(['_setDomainName', '.launchpad.net']);

=== modified file 'lib/lp/bugs/stories/bugs/xx-bugtarget-bugs-page.txt'
--- lib/lp/bugs/stories/bugs/xx-bugtarget-bugs-page.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bugs/xx-bugtarget-bugs-page.txt	2010-04-07 14:07:35 +0000
@@ -12,7 +12,7 @@
 so the search field is focused by default.
 
     >>> from BeautifulSoup import BeautifulSoup
-    >>> print BeautifulSoup(browser.contents).body('script')[0]
+    >>> print BeautifulSoup(browser.contents).body('script')[1]
     <script...$('field.searchtext').focus();...
 
 But once you're on the search results page, you're quite likely to want