Index: openacs-4/packages/edit-this-page/templates/article-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/article-content.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/templates/article-content.adp	22 May 2003 14:51:35 -0000	1.2
+++ openacs-4/packages/edit-this-page/templates/article-content.adp	11 Aug 2003 21:06:56 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="../www/etp-master">
 <property name="title">@pa.title;noquote@</property>
-<property name="context_bar">@pa.context_bar;noquote@</property>
+<property name="context">@pa.context;noquote@</property>
 
-@pa.content@
\ No newline at end of file
+@pa.content;noquote@
Index: openacs-4/packages/edit-this-page/templates/article-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/article-index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/templates/article-index.adp	22 May 2003 14:51:35 -0000	1.2
+++ openacs-4/packages/edit-this-page/templates/article-index.adp	11 Aug 2003 21:06:56 -0000	1.3
@@ -1,9 +1,9 @@
 <master src="../www/etp-master">
 <property name="title">@pa.title;noquote@</property>
-<property name="context_bar">@pa.context_bar;noquote@</property>
+<property name="context">@pa.context;noquote@</property>
 
 <if @pa.content@ not nil>
-@pa.content@
+@pa.content;noquote@
 </if>
 
 <blockquote>
Index: openacs-4/packages/edit-this-page/templates/faq-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/faq-content.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/templates/faq-content.adp	22 May 2003 14:51:35 -0000	1.2
+++ openacs-4/packages/edit-this-page/templates/faq-content.adp	11 Aug 2003 21:06:56 -0000	1.3
@@ -1,10 +1,10 @@
 <master src="/packages/edit-this-page/www/etp-master">
 <property name="title">@pa.title;noquote@</property>
-<property name="context_bar">@pa.context_bar;noquote@</property>
+<property name="context">@pa.context;noquote@</property>
 
 <blockquote>
 <b>Q:</b> <em>@pa.title@</em>
 <p>
 <b>A:</b> 
-@pa.content@
+@pa.content;noquote@
 </blockquote>
Index: openacs-4/packages/edit-this-page/templates/faq-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/faq-index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/templates/faq-index.adp	22 May 2003 14:51:35 -0000	1.2
+++ openacs-4/packages/edit-this-page/templates/faq-index.adp	11 Aug 2003 21:06:56 -0000	1.3
@@ -1,11 +1,11 @@
 <master src="/packages/edit-this-page/www/etp-master">
 <property name="title">@pa.title;noquote@</property>
-<property name="context_bar">@pa.context_bar;noquote@</property>
+<property name="context">@pa.context;noquote@</property>
 
 <p>
 
 <if @pa.content@ not nil>
-@pa.content@
+@pa.content;noquote@
 <p>
 </if>
 
@@ -28,7 +28,7 @@
 <b>Q:</b> <em>@content_items.title@</em>
 <p>
 <b>A:</b> 
-@content_items.content@
+@content_items.content;noquote@
 <p>
 </li>
 </multiple>
Index: openacs-4/packages/edit-this-page/templates/journal-article.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/journal-article.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/templates/journal-article.adp	22 May 2003 14:51:35 -0000	1.2
+++ openacs-4/packages/edit-this-page/templates/journal-article.adp	11 Aug 2003 21:06:56 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="../www/etp-master">
 <property name="title">@pa.title;noquote@</property>
-<property name="context_bar">@pa.context_bar;noquote@</property>
+<property name="context">@pa.context;noquote@</property>
 
-@pa.content@
+@pa.content;noquote@
Index: openacs-4/packages/edit-this-page/templates/journal-issue.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/journal-issue.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/templates/journal-issue.adp	22 May 2003 14:51:35 -0000	1.2
+++ openacs-4/packages/edit-this-page/templates/journal-issue.adp	11 Aug 2003 21:06:56 -0000	1.3
@@ -1,9 +1,9 @@
 <master src="../www/etp-master">
 <property name="title">@pa.title;noquote@</property>
-<property name="context_bar">@pa.context_bar;noquote@</property>
+<property name="context">@pa.context;noquote@</property>
 
 <if @pa.content@ not nil>
-@pa.content@
+@pa.content;noquote@
 </if>
 
 <p>
Index: openacs-4/packages/edit-this-page/templates/news-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/news-content.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/templates/news-content.adp	22 May 2003 14:51:35 -0000	1.2
+++ openacs-4/packages/edit-this-page/templates/news-content.adp	11 Aug 2003 21:06:56 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../www/etp-master">
 <property name="title">@pa.title;noquote@</property>
-<property name="context_bar">@pa.context_bar;noquote@</property>
+<property name="context">@pa.context;noquote@</property>
 
 <if @pa.subtitle@ not nil>
 <blockquote><b>@pa.subtitle@</b></blockquote>
@@ -19,6 +19,6 @@
 
 </b>
 
-@pa.content@
+@pa.content;noquote@
 
 <p>
\ No newline at end of file
Index: openacs-4/packages/edit-this-page/templates/news-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/news-index.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/edit-this-page/templates/news-index.adp	22 May 2003 14:51:35 -0000	1.3
+++ openacs-4/packages/edit-this-page/templates/news-index.adp	11 Aug 2003 21:06:56 -0000	1.4
@@ -1,9 +1,11 @@
 <master src="../www/etp-master">
 <property name="title">@pa.title;noquote@</property>
-<property name="context_bar">@pa.context_bar;noquote@</property>
+<property name="context">@pa.context;noquote@</property>
 
 <if @pa.content@ not nil>
-@pa.content@
+@pa.content;noquote@
+<br>
+<br>
 </if>
 
 <if @content_items:rowcount@ eq 0>
Index: openacs-4/packages/edit-this-page/www/etp-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/edit-this-page/www/etp-edit.tcl	4 Apr 2003 15:59:38 -0000	1.5
+++ openacs-4/packages/edit-this-page/www/etp-edit.tcl	11 Aug 2003 21:06:57 -0000	1.6
@@ -77,7 +77,7 @@
 
 set form_vars [export_form_vars name attribute]
 
-set page_title "$attribute_title for page \"$page_title\""
+set page_title "$attribute_title for page '$page_title'"
 
 if {$name == "index"} {
     set context [list [list "etp?[export_url_vars name]" Edit] $attribute_title]
Index: openacs-4/packages/edit-this-page/www/etp-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-master.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/edit-this-page/www/etp-master.adp	1 Aug 2003 16:09:52 -0000	1.5
+++ openacs-4/packages/edit-this-page/www/etp-master.adp	11 Aug 2003 21:06:57 -0000	1.6
@@ -11,6 +11,6 @@
 
 <if @etp_link@ not nil>
 <table width="100%">
-<tr><td align="right">@etp_link@</td></tr>
+<tr><td align="right">@etp_link;noquote@</td></tr>
 </table>
 </if>
Index: openacs-4/packages/edit-this-page/www/etp.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/edit-this-page/www/etp.adp	22 May 2003 14:52:16 -0000	1.3
+++ openacs-4/packages/edit-this-page/www/etp.adp	11 Aug 2003 21:06:57 -0000	1.4
@@ -26,7 +26,12 @@
 <tr>
 </else>
 <td valign="top" width="12%"><b>@page_attributes.pretty_name@</b>
+<if @page_attributes.name@ eq content>
+<td valign="top">@page_attributes.value;noquote@
+</if>
+<else>
 <td valign="top">@page_attributes.value@
+</else>
 <td align="right" width="12%"><a href="etp-edit?name=@pa.name@&attribute=@page_attributes.name@">edit</a>
 </tr>
 </multiple>
Index: openacs-4/packages/edit-this-page/www/etp.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/edit-this-page/www/etp.tcl	4 Apr 2003 15:59:38 -0000	1.4
+++ openacs-4/packages/edit-this-page/www/etp.tcl	11 Aug 2003 21:06:57 -0000	1.5
@@ -60,7 +60,7 @@
 }
 
 
-set page_title "Attributes for page \"$pa(title)\""
+set page_title "Attributes for page '$pa(title)'"
 if { $name == "index" } {
     set context [list "Edit"]
 } else {