[SCM] watchdog branch, master, updated. 481c657e340a912f0aaa5d3251a809d50f897594
aaronsw
generated because a ref change was pushed to the repository containing
the project "watchdog".
The branch, master has been updated
via 481c657e340a912f0aaa5d3251a809d50f897594 (commit)
via caef6b327526aabb054b2f1bb1926e93eb50a31d (commit)
from 71e2b95973b8b0f742f2744b724044815c51a6a6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 481c657e340a912f0aaa5d3251a809d50f897594
Merge: caef6b327526aabb054b2f1bb1926e93eb50a31d 71e2b95973b8b0f742f2744b724044815c51a6a6
Author: Aaron Swartz <aar...@watchdog.net>
Date: Thu Aug 13 19:39:24 2009 +0000
Merge branch 'master' of /home/watchdog/git/dev
commit caef6b327526aabb054b2f1bb1926e93eb50a31d
Author: Aaron Swartz <aar...@watchdog.net>
Date: Thu Aug 13 19:39:19 2009 +0000
cleanup
-----------------------------------------------------------------------
Summary of changes:
templates/base.html | 26 ++++++++++++--------------
templates/occupation.html | 5 ++++-
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/templates/base.html b/templates/base.html
index c5a3c2d..747dc0a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -2,18 +2,17 @@ $def with (page)
<!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">
<head>
- <script>
- function utmx_section(){}function utmx(){}
- (function(){var k='2347546721',d=document,l=d.location,c=d.cookie;function f(n){
- if(c){var i=c.indexOf(n+'=');if(i>-1){var j=c.indexOf(';',i);return c.substring(i+n.
- length+1,j<0?c.length:j)}}}var x=f('__utmx'),xx=f('__utmxx'),h=l.hash;
- d.write('<sc'+'ript src="'+
- 'http'+(l.protocol=='https:'?'s://ssl':'://www')+'.google-analytics.com'
- +'/siteopt.js?v=1&utmxkey='+k+'&utmx='+(x?x:'')+'&utmxx='+(xx?xx:'')+'&utmxtime='
- +new Date().valueOf()+(h?'&utmxhash='+escape(h.substr(1)):'')+
- '" type="text/javascript" charset="utf-8"></sc'+'ript>')})();
- </script>
-
+<script>
+function utmx_section(){}function utmx(){}
+(function(){var k='1615833661',d=document,l=d.location,c=d.cookie;function f(n){
+if(c){var i=c.indexOf(n+'=');if(i>-1){var j=c.indexOf(';',i);return c.substring(i+n.
+length+1,j<0?c.length:j)}}}var x=f('__utmx'),xx=f('__utmxx'),h=l.hash;
+d.write('<sc'+'ript src="'+
+'http'+(l.protocol=='https:'?'s://ssl':'://www')+'.google-analytics.com'
++'/siteopt.js?v=1&utmxkey='+k+'&utmx='+(x?x:'')+'&utmxx='+(xx?xx:'')+'&utmxtime='
++new Date().valueOf()+(h?'&utmxhash='+escape(h.substr(1)):'')+
+'" type="text/javascript" charset="utf-8"></sc'+'ript>')})();
+</script>
$if page.get('front'):
<title>watchdog.net: $:page.title.strip()</title>
<meta name="verify-v1" content="V7KJtoWCZfItupnGhaoUY6gwX1aVkrFszhCOoM0qgbg=" />
@@ -283,7 +282,6 @@ if(typeof(_gat)!='object')document.write('<sc'+'ript src="http'+
<script type="text/javascript">
try {
var pageTracker=_gat._getTracker("UA-7198052-2");
-pageTracker._trackPageview("/2347546721/test");
+pageTracker._trackPageview("/1615833661/test");
}catch(err){}</script>
-</body>
</html>
diff --git a/templates/occupation.html b/templates/occupation.html
index 2b72dad..827ff1f 100644
--- a/templates/occupation.html
+++ b/templates/occupation.html
@@ -43,4 +43,7 @@ $for c in committees:
</table>
-<p><a href="/occupation/$occupation/committees" class="footer">More...</a></p>
\ No newline at end of file
+<p><a href="/occupation/$occupation/committees" class="footer">More...</a></p>
+
+
+
hooks/post-receive
--
watchdog