From 3166d957633003db57aab01994efa7cc6930a24e Mon Sep 17 00:00:00 2001
From: Uriel <u@berlinblue.org>
Date: Tue, 10 Jun 2008 16:33:28 +0200
Subject: [PATCH] Make troff-generated  html pages look a bit better

---
 bin/gensitemaptxt.rc               |  8 +++++---
 bin/hgweb.config                   |  2 +-
 bin/md_cache                       |  1 +
 pub/style/style.css                |  2 +-
 sites/uriel.cat-v.org/_default.tpl | 16 ++++++++--------
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/bin/gensitemaptxt.rc b/bin/gensitemaptxt.rc
index deedc95..5105de0 100755
--- a/bin/gensitemaptxt.rc
+++ b/bin/gensitemaptxt.rc
@@ -1,6 +1,8 @@
-#!/bin/rc
-for ( d in sites/*/ ) {
+#!/usr/bin/env rc
 
-du -a $d | awk '/\.(md|html)$/ { print $2 }; {}' | 9 sed -e 's/\.(md|html)$//' -e 's,/index$,/,' -e 's,^sites/,http://,' > $d/sitemap.txt
+echo foo
+for ( d in sites/*/ ) {
+echo $d
+9 du -a $d | awk '/\.(md|html)$/ { print $2 }; {}' | 9 sed -e 's/\.(md|html)$//' -e 's,/index$,/,' -e 's,^sites/,http://,' > $d/sitemap.txt
 
 }
diff --git a/bin/hgweb.config b/bin/hgweb.config
index 42cafc0..2334437 100644
--- a/bin/hgweb.config
+++ b/bin/hgweb.config
@@ -8,5 +8,5 @@ allow_archive = bz2 zip
 [collections]
 #allow_archive = bz2 zip
 /gsoc/hg = /gsoc/hg/
-/var/hg = /var/hg/
+#/var/hg = /var/hg/
 
diff --git a/bin/md_cache b/bin/md_cache
index 4e23349..c78494e 100755
--- a/bin/md_cache
+++ b/bin/md_cache
@@ -1,3 +1,4 @@
+#!/usr/bin/env rc
 #!/bin/rc
 . 9.rc
 
diff --git a/pub/style/style.css b/pub/style/style.css
index 08f0d81..4828bc7 100644
--- a/pub/style/style.css
+++ b/pub/style/style.css
@@ -225,7 +225,7 @@ li ul {
 
 
 #main-copy p {
-  margin: 1em 1ex 1em 1ex;
+  margin: 1em 1ex 1em 1ex !important; /* Need !important so troff-generated pages don't look totally squezed */
   padding: 0;
 }
 
diff --git a/sites/uriel.cat-v.org/_default.tpl b/sites/uriel.cat-v.org/_default.tpl
index e273584..c023673 100644
--- a/sites/uriel.cat-v.org/_default.tpl
+++ b/sites/uriel.cat-v.org/_default.tpl
@@ -30,16 +30,16 @@
 </div>
 
 <div id="footer">
-<br class="doNotDisplay doNotPrint" />
+% cat sites/$masterSite/_inc/footer.inc
 </div>
 
-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+<!-- Google Analytics -->
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
 </script>
 <script type="text/javascript">
-_uacct = "UA-1220719-8";
-urchinTracker();
+var pageTracker = _gat._getTracker("UA-1220719-8");
+pageTracker._initData();
+pageTracker._trackPageview();
 </script>
-
-</body>
-</html>
-