[SCM] watchdog branch, master, updated. fd60dac9bf0c7d01b9c89a4f8af11f81e5269909

[aaronsw]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "watchdog".

The branch, master has been updated
via fd60dac9bf0c7d01b9c89a4f8af11f81e5269909 (commit)
from 8aec1207a57a598a3dad9e139bd64c7c1e48b735 (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 fd60dac9bf0c7d01b9c89a4f8af11f81e5269909
Author: Aaron Swartz <m...@aaronsw.com>
Date: Mon Aug 17 11:27:16 2009 -0400

make ads condition

-----------------------------------------------------------------------

Summary of changes:
templates/base.html | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 747dc0a..2455e1a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -56,6 +56,8 @@ $if page.get('noindex'): <meta name="robots" content="noindex, nofollow">
}
}

+ document.wd_first_time = (readCookie("wd_dialog") == "fin");
+
\$(document).ready(function() {
if (readCookie("wd_dialog") == "fin") { return; }
createCookie("wd_dialog", "start", 1);
@@ -129,9 +131,13 @@ $if not page.get('map') and not page.get('front') and not page.get('maxi'):
google_ad_slot = "0522736308";
google_ad_width = 120;
google_ad_height = 600;
+
+ if (document.wd_first_time) {
+ document.write('<scr' + 'ipt type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></scr' + 'ipt>');
+ }
+
//-->
</script>
- <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
</div>

$:page.get('pretext')
@@ -151,11 +157,12 @@ $if not page.get('map') and not page.get('front') and not page.get('maxi'):
google_ad_slot = "2707019958";
google_ad_width = 728;
google_ad_height = 90;
+
+ if (document.wd_first_time) {
+ document.write('<scr' + 'ipt type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></scr' + 'ipt>');
+ }
//-->
</script>
- <script type="text/javascript"
- src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
- </script>

$if not page.get('maxi'):
</div>

hooks/post-receive
--
watchdog