Index: openacs-4/packages/authorize-gateway/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/authorize-gateway/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/authorize-gateway/www/index.adp	3 Sep 2002 13:02:01 -0000	1.2
+++ openacs-4/packages/authorize-gateway/www/index.adp	12 Sep 2002 19:06:57 -0000	1.3
@@ -1,19 +1,10 @@
 <master>
   <property name="title">@title@</property>
-  <property name="context_bar">@context_bar@</property>
+  <if @admin_p@ eq 1>
+    <property name="context_bar"><table width="100%"><tbody><tr><td align="left">@context_bar@</td><td align="right">[ <a href="admin/">Administer</a> ]</td></tr></tbody></table></property>
+  </if> 
+  <else>
+    <property name="context_bar">@context_bar@</property>
+  </else>
 
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-	<td align="right">&nbsp;
-          <if @admin_p@ eq 1>
-            [ <a href="admin/">Administer</a> ]
-          </if>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
   <p>This package has no user pages.</p>
Index: openacs-4/packages/authorize-gateway/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/authorize-gateway/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/authorize-gateway/www/admin/index.adp	3 Sep 2002 13:02:02 -0000	1.2
+++ openacs-4/packages/authorize-gateway/www/admin/index.adp	12 Sep 2002 19:06:58 -0000	1.3
@@ -1,17 +1,7 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+  <property name="title">@title@</property>
+  <property name="context_bar"><table width="100%"><tbody><tr><td align="left">@context_bar@</td><td align="right">[ <a href="/doc/authorize-gateway/">help</a> ]</td></tr></tbody></table></property>
 
-<h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-	<td align="right">[ <a href="/doc/authorize-gateway/">help</a> ]</td>
-      </tr>
-    </tbody>
-  </table>
-<hr>
-@dimensional_bar@
-<p>@result_table@</p>
+  @dimensional_bar@
+  <p>@result_table@</p>
 
Index: openacs-4/packages/authorize-gateway/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/authorize-gateway/www/doc/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/authorize-gateway/www/doc/index.adp	21 May 2002 18:36:25 -0000	1.1
+++ openacs-4/packages/authorize-gateway/www/doc/index.adp	12 Sep 2002 19:06:59 -0000	1.2
@@ -1,24 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "bla">
- 
 <master>
   <property name="title">@title@</property>
   <property name="signatory">@signatory@</property>
   <property name="header_stuff"><link href="index.css" type="text/css" rel="stylesheet"></property>
-
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-	<td align="right">
   <if @admin_p@ and @authorize_gateway_mounted@>
-    [ <a href="@package_url@admin/">Administer</a> ]
+    <property name="context_bar"><table width="100%"><tbody><tr><td align="left">@context_bar@</td><td align="right">[ <a href="@package_url@admin/">Administer</a> ]</td></tr> </tbody></table></property>
   </if>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
+  <else>
+    <property name="context_bar">@context_bar@</property>
+  </else>
 
   <h2>Why</h2>
 
Index: openacs-4/packages/authorize-gateway/www/doc/license.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/authorize-gateway/www/doc/license.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/authorize-gateway/www/doc/license.adp	21 May 2002 18:36:25 -0000	1.1
+++ openacs-4/packages/authorize-gateway/www/doc/license.adp	12 Sep 2002 19:06:59 -0000	1.2
@@ -1,20 +1,9 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
 <master>
   <property name="title">@title@</property>
   <property name="signatory">@signatory@</property>
+  <property name="context_bar">@context_bar@</property>
   <property name="header_stuff"><link href="index.css" type="text/css" rel="stylesheet"></property>
 
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
   <h2>GNU General Public License</h2>
 
   <p>Version 2, June 1991</p>
Index: openacs-4/packages/shipping-gateway/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/shipping-gateway/www/doc/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/shipping-gateway/www/doc/index.adp	12 Sep 2002 18:40:39 -0000	1.2
+++ openacs-4/packages/shipping-gateway/www/doc/index.adp	12 Sep 2002 19:11:26 -0000	1.3
@@ -1,5 +1,3 @@
-<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
 <master>
   <property name="title">@title@</property>
   <property name="signatory">@signatory@</property>
Index: openacs-4/packages/shipping-gateway/www/doc/license.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/shipping-gateway/www/doc/license.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/shipping-gateway/www/doc/license.adp	21 May 2002 18:34:38 -0000	1.1
+++ openacs-4/packages/shipping-gateway/www/doc/license.adp	12 Sep 2002 19:11:26 -0000	1.2
@@ -1,20 +1,9 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
 <master>
   <property name="title">@title@</property>
   <property name="signatory">@signatory@</property>
+  <property name="context_bar">@context_bar@</property>
   <property name="header_stuff"><link href="index.css" type="text/css" rel="stylesheet"></property>
 
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
   <h2>GNU General Public License</h2>
 
   <p>Version 2, June 1991</p>
