Index: openacs-4/packages/page/lib/one-page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/page/lib/one-page.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/page/lib/one-page.adp	24 Sep 2004 11:45:22 -0000	1.1
@@ -0,0 +1,7 @@
+<master>
+<property name="title">@title@</property>
+
+<if @control_html@ not nil>
+<div style="float: right;">@control_html;noquote@</div>
+</if>
+@content;noquote@
Index: openacs-4/packages/page/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/page/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/page/www/index.tcl	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/packages/page/www/index.tcl	24 Sep 2004 11:45:22 -0000	1.2
@@ -1,5 +1,4 @@
 # packages/page/www/index.tcl
-
 ad_page_contract {
 
   @author rhs@mit.edu
@@ -35,19 +34,9 @@
 if {[llength $controls] > 0} {
   set control_html "\[ [join $controls " | "] \]"
 } else {
-  set control_html "&nbsp;"
+    set control_html {}
 }
 
-set body "[ad_header $instance_name]
+set body [template::adp_include /packages/page/lib/one-page [list title $instance_name content $content control_html $control_html]]
 
-<h2>$instance_name</h2>
-
-<table width=100%><tr><td>[ad_context_bar]</td><td align=right>$control_html</td></table>
-<hr>
-
-$content
-
-[ad_footer]
-"
-
 doc_return 200 text/html $body
Index: openacs-4/packages/page/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/page/www/admin/index.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/page/www/admin/index.adp	24 Sep 2004 11:45:23 -0000	1.1
@@ -0,0 +1,7 @@
+<master>
+<property name="title">@instance_name@</property>
+
+<form method="post" action="content-update">
+<p><textarea name="content" rows="30" cols="78" wrap="soft">@content@</textarea></p>
+<p><input type="submit" value="Save"></p>
+</form>
Index: openacs-4/packages/page/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/page/www/admin/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/page/www/admin/index.tcl	18 Sep 2002 14:54:57 -0000	1.2
+++ openacs-4/packages/page/www/admin/index.tcl	24 Sep 2004 11:45:23 -0000	1.3
@@ -23,30 +23,3 @@
   set content ""
 }
 
-set body "[ad_header $instance_name]
-
-<h3>$instance_name</h3>
-
-[ad_context_bar]
-<hr>
-
-<form method=post action=\"content-update\">
-
-<table align=center>
-
-<tr><td>
-<textarea name=content rows=30 cols=60 wrap=soft>[ns_quotehtml $content]</textarea>
-</td></tr>
-
-<tr><td align=center>
-<input type=submit value=Save>
-</td></tr>
-
-</table>
-
-</form>
-
-[ad_footer]
-"
-
-doc_return 200 text/html $body