Index: openacs-4/packages/clickthrough/www/admin/all-from-local.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/all-from-local.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/clickthrough/www/admin/all-from-local.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/clickthrough/www/admin/all-from-local.adp	4 Sep 2002 08:35:44 -0000	1.2
@@ -1,17 +1,14 @@
-<master src="/www/default-master">
+<master src="master">
 <property name=title>Clickthroughs from @local_url@</property>
+<property name="context">@context@</property>
 
-<h2>Clickthroughs from <a href="@local_url@">@local_url@</a></h2>
+Clickthroughs from <a href="@local_url@">@local_url@</a>
 
-@context_bar@
-
-<hr>
-
 <ul>
   <multiple name="urls">
     <li>@urls.entry_date@ : 
 	<a href="one-local-one-day?local_url=<%=[ns_urlencode @local_url@]%>&query_date=<%=[ns_urlencode @urls.entry_date@]%>">
-	  @urls.n_clicks@</a>
+	  @urls.n_clicks@</a></li>
   </multiple>
 </ul>
 
Index: openacs-4/packages/clickthrough/www/admin/all-from-local.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/all-from-local.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/all-from-local.tcl	4 Jun 2001 02:35:51 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/all-from-local.tcl	4 Sep 2002 08:35:44 -0000	1.3
@@ -10,11 +10,11 @@
 } {
     local_url
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     urls:multirow
 }
 
-set context_bar [ad_context_bar "Clickthroughs from local URL"]
+set context [list "Clickthroughs from local URL"]
 
 
 set parent_package_id [clickthrough_parent_package_id]
Index: openacs-4/packages/clickthrough/www/admin/all-to-foreign.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/all-to-foreign.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/clickthrough/www/admin/all-to-foreign.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/clickthrough/www/admin/all-to-foreign.adp	4 Sep 2002 08:35:44 -0000	1.2
@@ -1,17 +1,16 @@
-<master src="/www/default-master">
+<master src="master">
 <property name=title>Clickthroughs to @foreign_url@</property>
+<property name="context">@context@</property>
 
-<h2>Clickthroughs to <a href="@foreign_url@">@foreign_url@</a></h2>
 
-@context_bar@
 
-<hr>
+Clickthroughs to <a href="@foreign_url@">@foreign_url@</a>.
 
 <ul>
   <multiple name="urls">
     <li>@urls.entry_date@ : 
 	<a href="one-foreign-one-day?foreign_url=<%=[ns_urlencode @foreign_url@]%>&query_date=<%=[ns_urlencode @urls.entry_date@]%>">
-	  @urls.n_clicks@</a>
+	  @urls.n_clicks@</a></li>
   </multiple>
 </ul>
 
Index: openacs-4/packages/clickthrough/www/admin/all-to-foreign.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/all-to-foreign.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/all-to-foreign.tcl	4 Jun 2001 02:35:51 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/all-to-foreign.tcl	4 Sep 2002 08:35:44 -0000	1.3
@@ -10,11 +10,11 @@
 } {
     foreign_url
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     urls:multirow
 }
 
-set context_bar [ad_context_bar "Clickthroughs to foreign URL"]
+set context [list "Clickthroughs to foreign URL"]
 
 
 set parent_package_id [clickthrough_parent_package_id]
Index: openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.adp	4 Sep 2002 08:35:44 -0000	1.2
@@ -1,12 +1,7 @@
-<master src="/www/default-master">
+<master src="master">
 <property name=title>Clickthroughs by foreign URL: summary report</property>
+<property name="context">@context@</property>
 
-<h2>Clickthroughs by foreign URL: summary report</h2>
-
-@context_bar@
-
-<hr>
-
 Note: this page may be slow to generate; it requires a tremendous amount of chugging by the RDBMS.
 
 <ul>
Index: openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.tcl	4 Jun 2001 02:35:51 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.tcl	4 Sep 2002 08:35:44 -0000	1.3
@@ -10,11 +10,11 @@
 } {
     {minimum 0}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     urls:multirow
 }
 
-set context_bar [ad_context_bar "Clickthroughs by local URL"]
+set context [list "Clickthroughs by local URL"]
 
 
 set parent_package_id [clickthrough_parent_package_id]
Index: openacs-4/packages/clickthrough/www/admin/by-foreign-url.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-foreign-url.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/clickthrough/www/admin/by-foreign-url.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/clickthrough/www/admin/by-foreign-url.adp	4 Sep 2002 08:35:44 -0000	1.2
@@ -1,16 +1,11 @@
-<master src="/www/default-master">
+<master src="master">
 <property name=title>Clickthroughs by foreign URL</property>
+<property name="context">@context@</property>
 
-<h2>Clickthroughs by foreign URL</h2>
-
-@context_bar@
-
-<hr>
-
 <ul>
   <multiple name="urls">
     <li><a href="one-url-pair?local_url=<%=[ns_urlencode @urls.local_url@]%>&foreign_url=<%=[ns_urlencode @urls.foreign_url@]%>">
-	  @urls.foreign_url@ (from @urls.local_url@)</a>
+	  @urls.foreign_url@ (from @urls.local_url@)</a></li>
   </multiple>
 </ul>
 
Index: openacs-4/packages/clickthrough/www/admin/by-foreign-url.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-foreign-url.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/by-foreign-url.tcl	4 Jun 2001 02:35:51 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/by-foreign-url.tcl	4 Sep 2002 08:35:44 -0000	1.3
@@ -8,11 +8,11 @@
 } {
 
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     urls:multirow
 }
 
-set context_bar [ad_context_bar "Clickthroughs by foreign URL"]
+set context [list "Clickthroughs by foreign URL"]
 
 
 set parent_package_id [clickthrough_parent_package_id]
Index: openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.adp	4 Sep 2002 08:35:44 -0000	1.2
@@ -1,18 +1,13 @@
-<master src="/www/default-master">
+<master src="master">
 <property name=title>Clickthroughs by local URL: summary report</property>
+<property name="context">@context@</property>
 
-<h2>Clickthroughs by local URL: summary report</h2>
-
-@context_bar@
-
-<hr>
-
 Note: this page may be slow to generate; it requires a tremendous amount of chugging by the RDBMS.
 
 <ul>
   <multiple name="urls">
     <li><a href="one-url-pair?local_url=<%=[ns_urlencode @urls.local_url@]%>&foreign_url=<%=[ns_urlencode @urls.foreign_url@]%>">
-	  @urls.local_url@ -&gt; @urls.foreign_url@ : @urls.n_clicks@</a>
+	  @urls.local_url@ -&gt; @urls.foreign_url@ : @urls.n_clicks@</a></li>
   </multiple>
 </ul>
 
Index: openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.tcl	4 Jun 2001 02:35:51 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.tcl	4 Sep 2002 08:35:44 -0000	1.3
@@ -10,11 +10,11 @@
 } { 
     {minimum 0}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     urls:multirow
 }
 
-set context_bar [ad_context_bar "Clickthroughs by local URL"]
+set context [list "Clickthroughs by local URL"]
 
 
 set parent_package_id [clickthrough_parent_package_id]
Index: openacs-4/packages/clickthrough/www/admin/by-local-url.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-local-url.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/clickthrough/www/admin/by-local-url.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/clickthrough/www/admin/by-local-url.adp	4 Sep 2002 08:35:44 -0000	1.2
@@ -1,12 +1,7 @@
-<master src="/www/default-master">
+<master src="master">
 <property name=title>Clickthroughs by local URL</property>
+<property name="context">@context@</property>
 
-<h2>Clickthroughs by local URL</h2>
-
-@context_bar@
-
-<hr>
-
 <ul>
   <multiple name="urls">
     <li><a href="one-url-pair?local_url=<%=[ns_urlencode @urls.local_url@]%>&foreign_url=<%=[ns_urlencode @urls.foreign_url@]%>">
Index: openacs-4/packages/clickthrough/www/admin/by-local-url.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-local-url.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/by-local-url.tcl	4 Jun 2001 02:35:51 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/by-local-url.tcl	4 Sep 2002 08:35:44 -0000	1.3
@@ -8,11 +8,11 @@
 } {
     
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     urls:multirow
 }
 
-set context_bar [ad_context_bar "Clickthroughs by local URL"]
+set context [list "Clickthroughs by local URL"]
 
 
 set parent_package_id [clickthrough_parent_package_id]
Index: openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.adp	11 Sep 2001 13:08:49 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.adp	4 Sep 2002 08:35:44 -0000	1.3
@@ -1,12 +1,9 @@
-<master src="/www/default-master">
+<master src="master">
 <property name=title>Clickthroughs to @foreign_url@ on @query_date@</property>
+<property name="context">@context@</property>
 
 <h2>Clickthroughs to <a href="@foreign_url@">@foreign_url@</a> on @query_date@</h2>
 
-@context_bar@
-
-<hr>
-
 <ul>
   <multiple name="urls">
     <li> from <a href="@urls.local_url@">@urls.local_url@</a> : @urls.click_count@
Index: openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.tcl	4 Jun 2001 02:35:51 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.tcl	4 Sep 2002 08:35:44 -0000	1.3
@@ -12,11 +12,11 @@
     foreign_url
     query_date  
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     urls:multirow
 }
 
-set context_bar [ad_context_bar [list "all-to-foreign?[export_url_vars foreign_url]" "Clickthroughs to foreign URL"] "On $query_date"]
+set context [list [list "all-to-foreign?[export_url_vars foreign_url]" "Clickthroughs to foreign URL"] "On $query_date"]
 
 
 set parent_package_id [clickthrough_parent_package_id]
Index: openacs-4/packages/clickthrough/www/admin/one-local-one-day.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/one-local-one-day.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/one-local-one-day.adp	11 Jan 2002 18:30:36 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/one-local-one-day.adp	4 Sep 2002 08:35:44 -0000	1.3
@@ -1,12 +1,9 @@
-<master src="/www/default-master">
+<master src="master">
 <property name=title>Clickthroughs from @local_url@ on @query_date@</property>
+<property name="context">@context@</property>
 
 <h2>Clickthroughs from <a href="@local_url@">@local_url@</a> on @query_date@</h2>
 
-@context_bar@
-
-<hr>
-
 <ul>
   <multiple name="urls">
     <li>to <a href="@urls.foreign_url@">@urls.foreign_url@</a> : @urls.click_count@
Index: openacs-4/packages/clickthrough/www/admin/one-local-one-day.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/one-local-one-day.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/one-local-one-day.tcl	4 Jun 2001 02:35:51 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/one-local-one-day.tcl	4 Sep 2002 08:35:44 -0000	1.3
@@ -12,11 +12,11 @@
     local_url
     query_date   
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     urls:multirow
 }
 
-set context_bar [ad_context_bar [list "all-from-local?[export_url_vars local_url]" "Clickthroughs from local URL"] "On $query_date"]
+set context [list [list "all-from-local?[export_url_vars local_url]" "Clickthroughs from local URL"] "On $query_date"]
 
 
 set parent_package_id [clickthrough_parent_package_id]
Index: openacs-4/packages/clickthrough/www/admin/one-url-pair.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/one-url-pair.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/one-url-pair.adp	11 Jan 2002 18:30:36 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/one-url-pair.adp	4 Sep 2002 08:35:44 -0000	1.3
@@ -1,19 +1,16 @@
-<master src="/www/default-master">
+<master src="master">
 <property name=title>@local_url@ -&gt; @foreign_url@</property>
+<property name="context">@context@</property>
 
 <h2>
   <a href="@local_url@">@local_url@</a> 
   -&gt; 
   <a href="@foreign_url@">@foreign_url@</a>
 </h2>
 
-@context_bar@
-
-<hr>
-
 <ul>
   <multiple name="urls">
-    <li>@urls.entry_date@ : @urls.click_count@
+    <li>@urls.entry_date@ : @urls.click_count@</li>
   </multiple>
 </ul>
 
@@ -24,8 +21,8 @@
 
 <ul>
   <li><a href="all-to-foreign?foreign_url=<%=[ns_urlencode @foreign_url@]%>">all clickthroughs to @foreign_url@</a>
-      (lumping together all the referring pages)
+      (lumping together all the referring pages)</li>
   <li><a href="all-from-local?local_url=<%=[ns_urlencode @local_url@]%>">all clickthroughs from @local_url@</a>
-      (lumping together all the foreign URLs)
+      (lumping together all the foreign URLs)</li>
 </ul>
 
Index: openacs-4/packages/clickthrough/www/admin/one-url-pair.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/one-url-pair.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/one-url-pair.tcl	4 Jun 2001 02:35:51 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/one-url-pair.tcl	4 Sep 2002 08:35:44 -0000	1.3
@@ -12,11 +12,11 @@
     local_url
     foreign_url    
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     urls:multirow
 }
 
-set context_bar [ad_context_bar "Clickthroughs for one URL pair"]
+set context [list "Clickthroughs for one URL pair"]
 
 
 set parent_package_id [clickthrough_parent_package_id]
Index: openacs-4/packages/clickthrough/www/admin/report.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/report.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/clickthrough/www/admin/report.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/clickthrough/www/admin/report.adp	4 Sep 2002 08:35:44 -0000	1.2
@@ -1,22 +1,17 @@
-<master src="/www/default-master">
+<master src="master">
 <property name=title>Clickthroughs for @package_name@</property>
+<property name="context">@context@</property>
 
-<h2>Clickthroughs for @package_name@</h2>
-
-@context_bar@
-
-<hr>
-
 <ul>
-  <li><a href="by-foreign-url">by foreign URL</a>
-  <li><a href="by-local-url">by local URL</a>
+  <li><a href="by-foreign-url">by foreign URL</a></li>
+  <li><a href="by-local-url">by local URL</a></li>
 </ul>
 
-<h4>Summary Reports (expensive queries, may take a long time)</h4>
+<h3>Summary Reports (expensive queries, may take a long time)</h3>
 
 <ul>
   <li>by foreign URL:
       <a href="by-foreign-url-aggregate">all</a> | 
-      <a href="by-foreign-url-aggregate?minimum=10">limit to those with 10 or more</a>
-  <li><a href="by-local-url-aggregate">by local URL</a>
+      <a href="by-foreign-url-aggregate?minimum=10">limit to those with 10 or more</a></li>
+  <li><a href="by-local-url-aggregate">by local URL</a></li>
 </ul>
Index: openacs-4/packages/clickthrough/www/admin/report.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/report.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/clickthrough/www/admin/report.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/clickthrough/www/admin/report.tcl	4 Sep 2002 08:35:44 -0000	1.2
@@ -8,7 +8,7 @@
 } {    
 
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     package_name:onevalue
 }
  
@@ -18,6 +18,6 @@
 
 set package_name [clickthrough_parent_package_instance_name]
 
-set context_bar [ad_context_bar]
+set context [list]
 
 ad_return_template