Index: openacs-4/packages/edit-this-page/edit-this-page.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/edit-this-page.info,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/edit-this-page/edit-this-page.info	6 Sep 2011 14:37:45 -0000	1.15
+++ openacs-4/packages/edit-this-page/edit-this-page.info	29 Jul 2015 02:06:21 -0000	1.16
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="1.9d2" url="http://openacs.org/repository/download/apm/edit-this-page-1.9d2.apm">
+    <version name="1.9d3" url="http://openacs.org/repository/download/apm/edit-this-page-1.9d3.apm">
     <database-support>
         <database>postgresql</database>
     </database-support>
@@ -17,7 +17,7 @@
         <summary>An easy-to-use content management system.</summary>
         <description format="text/html">An Easy to use publishing system with versioning and permissions.</description>
 
-        <provides url="edit-this-page" version="1.9d2"/>
+        <provides url="edit-this-page" version="1.9d3"/>
         <requires url="acs-kernel" version="4.6.2"/>
         <requires url="acs-subsite" version="4.6.3"/>
         <requires url="acs-templating" version="4.1.2"/>
Index: openacs-4/packages/edit-this-page/tcl/etp-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/tcl/etp-procs-postgresql.xql,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/edit-this-page/tcl/etp-procs-postgresql.xql	13 Oct 2013 14:31:27 -0000	1.14
+++ openacs-4/packages/edit-this-page/tcl/etp-procs-postgresql.xql	29 Jul 2015 02:06:21 -0000	1.15
@@ -15,9 +15,9 @@
 	        :pretty_name,
 	        :pretty_plural,
 	        'etp_page_revision',
-	        :content_type,
-	        :content_type,
 	        null,
+	        null,
+	        null,
 	        'f',
 	        null,
 	        null
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 -r1.5 -r1.6
--- openacs-4/packages/edit-this-page/templates/article-index.adp	3 Jul 2015 11:19:01 -0000	1.5
+++ openacs-4/packages/edit-this-page/templates/article-index.adp	29 Jul 2015 02:06:21 -0000	1.6
@@ -9,7 +9,7 @@
 <blockquote>
 
 <multiple name="content_items">
-<a href="@content_items.url@">@content_items.title@</a>
+<p><a href="@content_items.url@">@content_items.title@</a>
 <if @content_items.description@ not nil>
  - @content_items.description@
 </if>
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 -r1.5 -r1.6
--- openacs-4/packages/edit-this-page/templates/faq-index.adp	3 Jul 2015 11:19:01 -0000	1.5
+++ openacs-4/packages/edit-this-page/templates/faq-index.adp	29 Jul 2015 02:06:21 -0000	1.6
@@ -23,11 +23,9 @@
 Questions and Answers:
 <ol>
 <multiple name="content_items">
-<a name="@content_items.rownum@"></a>
-<li>
-<b>Q:</b> <em>@content_items.title@</em>
-<p>
-<b>A:</b> 
+<li><a name="@content_items.rownum@"></a>
+<p><b>Q:</b> <em>@content_items.title@</em>
+<p><b>A:</b> 
 @content_items.content;noquote@
 <p>
 </li>
Index: openacs-4/packages/edit-this-page/www/etp-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/edit-this-page/www/etp-create.adp	3 Jul 2015 11:19:01 -0000	1.6
+++ openacs-4/packages/edit-this-page/www/etp-create.adp	29 Jul 2015 02:06:21 -0000	1.7
@@ -9,20 +9,21 @@
 <b>#edit-this-page.Page_name#</b>
 <td valign="top">
 <input name="name" value="@new_page_name@">
-<td valign="top" width="50%">
+<td valign="top" style="width:50%;">
 #edit-this-page.lt_This_must_be_a_short_# <code>#edit-this-page.auto_page_name#</code> #edit-this-page.lt_parameter_the_page_name#
 </tr><tr>
 <td valign="top">
 <b>#edit-this-page.Page_title#</b>
 <td valign="top">
 <input name="title">
-<td valign="top" width="50%">
+<td valign="top" style="width:50%;">
 #edit-this-page.lt_You_may_change_the_ti#
 </tr>
 <tr>
 <td colspan="3" align="center">
 <input type="submit" value="#acs-kernel.common_Submit#">
 </tr>
 </table>
+</form>
 <p>
 
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 -r1.9 -r1.10
--- openacs-4/packages/edit-this-page/www/etp-master.adp	3 Jul 2015 11:19:02 -0000	1.9
+++ openacs-4/packages/edit-this-page/www/etp-master.adp	29 Jul 2015 02:06:21 -0000	1.10
@@ -1,11 +1,8 @@
 <master>
 <property name="doc(title)">@title;literal@</property>
-<if @context_bar@ not nil>
-<property name="context_bar">@context_bar;literal@</property>
-</if>
-<else>
-<property name="context">@context;literal@</property>
-</else>
+<if @context_bar@ not nil><property name="context_bar">@context_bar;literal@</property></if>
+<else><property name="context">@context;literal@</property></else>
+<if @head@ not nil><property name="head">@head;literal@</property></if>
 
 <slave>
 
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 -r1.9 -r1.10
--- openacs-4/packages/edit-this-page/www/etp.adp	3 Jul 2015 11:19:02 -0000	1.9
+++ openacs-4/packages/edit-this-page/www/etp.adp	29 Jul 2015 02:06:21 -0000	1.10
@@ -1,6 +1,11 @@
 <master src="etp-master">
 <property name="doc(title)">@page_title;literal@</property>
 <property name="context">@context;literal@</property>
+<property name="head">
+<style type="text/css">
+tr.grey {background-color: #ececec;}
+</style>
+</property>
 
 <table width="100%"><tr>
 <td valign="top">
@@ -22,12 +27,12 @@
 <table width="100%" cellspacing="0" cellpadding="4">
 <multiple name="page_attributes">
 <if @page_attributes.rownum@ odd>
-<tr bgcolor="#ececec">
+<tr class="grey">
 </if>
 <else>
 <tr>
 </else>
-<td valign="top" width="12%"><b>@page_attributes.pretty_name@</b>
+<td valign="top" style="width:12%"><b>@page_attributes.pretty_name@</b>
 </td>
 <if @page_attributes.name@ eq content>
 <td valign="top">@page_attributes.value;noquote@
@@ -36,7 +41,7 @@
 <td valign="top">@page_attributes.value@
 </else>
 </td>
-<td align="right" width="12%"><a href="etp-edit?name=@pa.name@&attribute=@page_attributes.name@">#edit-this-page.edit#</a>
+<td align="right" style="width:12%"><a href="etp-edit?name=@pa.name@&amp;attribute=@page_attributes.name@">#edit-this-page.edit#</a>
 </td>
 </tr>
 </multiple>
@@ -66,6 +71,7 @@
 <!-- <li><a href="/admin/site-map/parameter-set?package_id=@package_id@">#edit-this-page.Set_parameters#</a> -->
 <li><a href="/permissions/one?object_id=@package_id@">#edit-this-page.Set_permissions#</a>
 <li><a href="/admin/site-map/">#edit-this-page.Site_map#</a>
+</ul>
 </if>
 </td>
 
@@ -77,7 +83,7 @@
 <if @pa.name@ eq "index">
 <h3>#edit-this-page.lt_Content_items_in_this#</h3>
 <table width="100%" cellspacing="0" cellpadding="4">
-<tr bgcolor="#ececec">
+<tr class="grey">
 <td colspan="3">
 #edit-this-page.Create_a_new# 
 <a href="etp-create">@application_params.content_object_name@</a>