github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-05 03:00:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move GA into a utility. Add GA to mobile and track usage.

Browse Source
This commit is contained in:
Max Goodman
2011-07-20 12:09:58 -07:00
parent 88e5ad2763
commit d2c2e90c28
3 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
r2/r2/templates/base.compact
View File

@@ -23,7 +23,7 @@
from r2.lib.template_helpers import static
from r2.lib import js
%>
<%namespace file="utils.html" import="js_preamble"/>
<%namespace file="utils.html" import="js_preamble, googleanalytics"/>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="${c.lang}">
<head>
@@ -46,6 +46,7 @@
<script type="text/javascript">
${js_preamble()}
</script>
${googleanalytics('mobile')}
</head>
${self.bodyHTML()}
</html>

22
r2/r2/templates/base.html
View File

@@ -25,7 +25,7 @@
from r2.models import Link, Comment, Subreddit
from r2.lib.tracking import UserInfo
%>
<%namespace file="utils.html" import="js_preamble"/>
<%namespace file="utils.html" import="js_preamble, googleanalytics"/>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="${c.lang}"
xml:lang="${c.lang}" ${c.lang_rtl and unsafe('dir="rtl"') or ''}>
@@ -102,25 +102,7 @@ reddit, reddit.com, vote, comment, submit
</script>
%endif
%if g.googleanalytics and thing.site_tracking:
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '${g.googleanalytics}']);
_gaq.push(['_setCustomVar', 1, 'site', '${UserInfo.get_site()}', 3]);
_gaq.push(['_setCustomVar', 2, 'srpath', '${UserInfo.get_srpath()}', 3]);
_gaq.push(['_setCustomVar', 3, 'usertype', '${UserInfo.get_usertype()}', 2]);
_gaq.push(['_trackPageview']);
_gaq.push(['_trackPageLoadTime']);
(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';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
%endif
${googleanalytics('web')}
</%def>

24
r2/r2/templates/utils.html
View File

@@ -24,6 +24,7 @@
from r2.lib.filters import spaceCompress, unsafe
from r2.lib.template_helpers import add_sr
from r2.lib.utils import cols, long_datetime, timesince
from r2.lib.tracking import UserInfo
%>
<%def name="tags(**kw)">
%for k, v in kw.iteritems():
@@ -395,6 +396,29 @@ ${unsafe(txt)}
};
</%def>
<%def name="googleanalytics(uitype)">
%if g.googleanalytics and thing.site_tracking:
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '${g.googleanalytics}']);
_gaq.push(['_setCustomVar', 1, 'site', '${UserInfo.get_site()}', 3]);
_gaq.push(['_setCustomVar', 2, 'srpath', '${UserInfo.get_srpath()}', 3]);
_gaq.push(['_setCustomVar', 3, 'usertype', '${UserInfo.get_usertype()}', 2]);
_gaq.push(['_setCustomVar', 4, 'uitype', '${uitype}', 3]);
_gaq.push(['_trackPageview']);
_gaq.push(['_trackPageLoadTime']);
(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';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
%endif
</%def>
<%def name="logout(top=False,dest=None,a_class='')">
<form method="post" action="/logout" class="logout hover"
%if top: