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

Proposed by Karl Fogel
Status: Merged
Approved by: Karl Fogel
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~kfogel/launchpad/google-analytics-everywhere
Merge into: lp:launchpad
Diff against target: 59 lines (+11/-2)
3 files modified
lib/lp/app/browser/tests/base-layout.txt (+9/-0)
lib/lp/app/templates/base-layout.pt (+1/-1)
lib/lp/bugs/stories/bugs/xx-bugtarget-bugs-page.txt (+1/-1)
To merge this branch: bzr merge lp:~kfogel/launchpad/google-analytics-everywhere
Reviewer Review Type Date Requested Status
Gary Poster (community) Approve
Karl Fogel (community) Needs Resubmitting
Review via email: mp+22891@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Gary Poster (gary) :
review: Approve
Revision history for this message
Karl Fogel (kfogel) wrote :

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: Needs Resubmitting
Revision history for this message
Karl Fogel (kfogel) wrote :

Passes EC2 now, by the way.

Revision history for this message
Gary Poster (gary) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
70 main_side70 main_side
71 public71 public
72 yui-skin-sam">72 yui-skin-sam">
73 <script type="text/javascript">
74 ...google-analytics.com...
75 </script>
73 <div class="yui-d0">76 <div class="yui-d0">
74 <BLANKLINE>77 <BLANKLINE>
75 <div id="locationbar">78 <div id="locationbar">
@@ -274,6 +277,9 @@
274 searchless277 searchless
275 public278 public
276 yui-skin-sam">279 yui-skin-sam">
280 <script type="text/javascript">
281 ...google-analytics.com...
282 </script>
277 <div class="yui-d0">283 <div class="yui-d0">
278 ...284 ...
279285
@@ -386,6 +392,9 @@
386 locationless392 locationless
387 public393 public
388 yui-skin-sam">394 yui-skin-sam">
395 <script type="text/javascript">
396 ...google-analytics.com...
397 </script>
389 <div class="yui-d0">398 <div class="yui-d0">
390 ...399 ...
391400
392401
=== 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 @@
69 ${view/macro:pagetype}69 ${view/macro:pagetype}
70 ${view/context/fmt:public-private-css}70 ${view/context/fmt:public-private-css}
71 yui-skin-sam">71 yui-skin-sam">
72 <script type="text/javascript" tal:condition="is_edge">72 <script type="text/javascript">
73 var _gaq = _gaq || [];73 var _gaq = _gaq || [];
74 _gaq.push(['_setAccount', 'UA-12833497-1']);74 _gaq.push(['_setAccount', 'UA-12833497-1']);
75 _gaq.push(['_setDomainName', '.launchpad.net']);75 _gaq.push(['_setDomainName', '.launchpad.net']);
7676
=== 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 @@
12so the search field is focused by default.12so the search field is focused by default.
1313
14 >>> from BeautifulSoup import BeautifulSoup14 >>> from BeautifulSoup import BeautifulSoup
15 >>> print BeautifulSoup(browser.contents).body('script')[0]15 >>> print BeautifulSoup(browser.contents).body('script')[1]
16 <script...$('field.searchtext').focus();...16 <script...$('field.searchtext').focus();...
1717
18But once you're on the search results page, you're quite likely to want18But once you're on the search results page, you're quite likely to want