Index: openacs-4/packages/acs-api-browser/acs-api-browser.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/acs-api-browser.info,v
diff -u -r1.35 -r1.36
--- openacs-4/packages/acs-api-browser/acs-api-browser.info	27 Oct 2014 16:38:59 -0000	1.35
+++ openacs-4/packages/acs-api-browser/acs-api-browser.info	15 Jun 2015 11:15:55 -0000	1.36
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.9.0d1" url="http://openacs.org/repository/download/apm/acs-api-browser-5.9.0d1.apm">
+    <version name="5.9.0d2" url="http://openacs.org/repository/download/apm/acs-api-browser-5.9.0d2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Interactive documentation for the Tcl and SQL APIs.</summary>
         <release-date>2013-09-08</release-date>
@@ -17,7 +17,7 @@
 	<maturity>3</maturity>
         <description format="text/html">On line interactive documentation for the locally installed Tcl and SQL APIs.  Links to the Tcl core and AOLServer online documentation as well.</description>
 
-        <provides url="acs-api-browser" version="5.9.0d1"/>
+        <provides url="acs-api-browser" version="5.9.0d2"/>
         <requires url="acs-kernel" version="5.9.0d1"/>
 
         <callbacks>
Index: openacs-4/packages/acs-api-browser/lib/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/lib/search.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-api-browser/lib/search.adp	29 Jul 2008 22:04:14 -0000	1.5
+++ openacs-4/packages/acs-api-browser/lib/search.adp	15 Jun 2015 11:15:55 -0000	1.6
@@ -1,15 +1,16 @@
 <table border="0" cellspacing="12" cellpadding="4"> 
- <tr bgcolor="#DDDDDD">
+ <tr style="background:#DDDDDD">
   <td>
-   <table>
-
     <form action="@openacs_search_url@" method="get">
+     <table>
      <tr>
       <td valign="top">
        <h4>OpenACS Tcl API Search</h4>
+       <div>
        <input type="text" name="query_string" value="@query_string@"><br>
        <input type="submit" value="All matches" name="search_type">
        <input type="submit" value="Only best match" name="search_type">
+       </div>
        <p><a href="@openacs_browse_url@">Browse OpenACS Tcl API</a></p>
       </td>
       <td>       
@@ -33,64 +34,69 @@
        </table>
       </td>
      </tr>
-    </form>
-   </table>
+    </table>
+   </form>
   </td>
  </tr>
  
- <tr bgcolor="#DDDDDD">
+ <tr style="background:#DDDDDD">
   <td colspan="2">
    <h4>OpenACS PL/SQL API Search</h4>
    <p><a href="@openacs_plsql_browse_url@">Browse OpenACS PL/SQL API</a></p>
   </td>
  </tr>
 
- <form action="@aolserver_search_url@" method="get">
-  <tr bgcolor="#DDDDDD">
+  <tr style="background:#DDDDDD">
    <td colspan="2">
+    <form action="@aolserver_search_url@" method="get">
     <h4>AOLserver Tcl API Search</h4>
+    <div>
     <input type="text" name="tcl_proc">
     <input type="submit" value="Go"><br>
     (enter <em>exact</em> procedure name)<br>
     <a href="@aolserver_tcl_api_root@">Browse AOLserver Tcl API</a>
+    </div>
+     </form>
    </td>
   </tr>
- </form>
 
- <form action="@tcl_search_url@" method="get">
-  <tr bgcolor="#DDDDDD">
+  <tr style="background:#DDDDDD">
    <td colspan="2">
+    <form action="@tcl_search_url@" method="get">
     <h4>Tcl Documentation Search</h4>
+    <div>
     <input type="text" name="tcl_proc">
     <input type="submit" value="Go"><br>
     (enter <em>exact</em> procedure name)<br>
     <a href="@tcl_docs_root@">Browse the Tcl documentation</a>
+    </div>
+     </form>
    </td>
   </tr>
- </form>
 
- <if @db_doc_search_url@ not nil>
-  <form action="@db_doc_search_url@" method="get">
-   @db_doc_search_export;noquote@
- </if>
-   <tr bgcolor="#DDDDDD">
+
+   <tr style="background:#DDDDDD">
     <td colspan="2">
      <if @db_doc_search_url@ not nil>
+     <form action="@db_doc_search_url@" method="get">
+   	@db_doc_search_export;noquote@
        <h4>@db_pretty@ Search</h4>
+       <div>
        <input type="text" name="@db_doc_search_query_name@">
        <input type="submit" value="Go"><br>
+       </div>
      </if>
      <else>
        <h4>@db_pretty@ Documentation</h4>
      </else>
-     <a href="@db_doc_url@">Browse the @db_pretty@ documentation</a>
+     <p><a href="@db_doc_url@">Browse the @db_pretty@ documentation</a>
+      <if @db_doc_search_url@ not nil>
+      </form>
     </td>
    </tr>
- <if @db_doc_search_url@ not nil>
-  </form>
  </if>
 
-  <tr bgcolor="#DDDDDD">
+  <tr style="background:#DDDDDD">
    <td colspan="2">
     <h4>OpenACS and Package Documentation</h4>
     <a href="/doc">Browse OpenACS documentation</a>
Index: openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl	27 Oct 2014 16:38:59 -0000	1.28
+++ openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl	15 Jun 2015 11:15:55 -0000	1.29
@@ -441,7 +441,7 @@
     append out [util_wrap_list $command_line] "\n<blockquote>\n"
     
     if { $script_p } {
-        append out [subst {Defined in 
+        append out [subst {<p>Defined in 
             <a href="/api-doc/procs-file-view?path=[ns_urlencode $doc_elements(script)]">$doc_elements(script)</a>
             <p>}]
     }
@@ -544,12 +544,12 @@
                  -default 1]} {
             append out [subst {<dt><b>Source code:</b></dt><dd>
                 <pre class="code">[::apidoc::tcl_to_html $proc_name]</pre>
-                </dd><p>
+                </dd>
             }]
         } else {
             append out [subst {<dt><b>Source code:</b></dt><dd>
                 <pre class="code">[ns_quotehtml [api_get_body $proc_name]]</pre>
-                </dd><p>
+                </dd>
             }]
         }
     }
@@ -563,11 +563,12 @@
         if { [file exists $::acs::rootdir/$xql_fn] } {
             set content [apidoc::get_xql_snippet -proc_name $proc_name -xql_file $xql_fn]
             if {$content ne ""} {set content "<pre class='code'>$content</pre>"}
-            append there [subst {<dt><b>Generic XQL file:</b> <dt>
-                <blockquote>$content
-                <a href="content-page-view?[export_vars {{source_p 1} {path $xql_fn}}]">$xql_fn</a>
-                </blockquote>
+            append there [subst {<dt><b>Generic XQL file:</b> </dt>
+                <dd>$content
+                <a href="[ns_quotehtml [export_vars -base content-page-view {{source_p 1} {path $xql_fn}}]]">$xql_fn</a>
                 <p>
+                </dd>
+
             }]
         } else {
             lappend missing Generic
@@ -577,10 +578,10 @@
             set content [apidoc::get_xql_snippet -proc_name $proc_name -xql_file $xql_fn]
             if {$content ne ""} {set content "<pre class='code'>$content</pre>"}
             append there [subst {<dt><b>PostgreSQL XQL file:</b></dt>
-                <blockquote>$content
-                <a href="content-page-view?[export_vars {{source_p 1} {path $xql_fn}}]">$xql_fn</a>
-                </blockquote>
+                <dd>$content
+                <a href="[ns_quotehtml [export_vars -base content-page-view {{source_p 1} {path $xql_fn}}]]">$xql_fn</a>
                 <p>
+                </dd>
             }]
         } else {
             lappend missing PostgreSQL
@@ -591,10 +592,10 @@
             set content [apidoc::get_xql_snippet -proc_name $proc_name -xql_file $xql_fn]
             if {$content ne ""} {set content "<pre class='code'>$content</pre>"}
             append there [subst {<dt><b>Oracle XQL file:</b></dt>
-                <blockquote>$content
-                <a href="content-page-view?[export_vars {{source_p 1} {path $xql_fn}}]">$xql_fn</a>
-                </blockquote>
+                <dd>$content
+                <a href="[ns_quotehtml [export_vars -base content-page-view {{source_p 1} {path $xql_fn}}]]">$xql_fn</a>
                 <p>
+                </dd>
             }]
         } else {
             lappend missing Oracle
@@ -625,7 +626,7 @@
         set label $proc
     }
     if { $link_p } {
-        append out "<a href=\"[api_proc_url $proc]\">$label</a>"
+        append out "<a href=\"[ns_quotehtml [api_proc_url $proc]]\">$label</a>"
     } else {    
         append out "$label"
     }
@@ -744,14 +745,14 @@
         regsub -all {proc *} $see {} see
         set see [string trim $see]
         if {[nsv_exists api_proc_doc $see]} {
-            return "<a href=\"proc-view?proc=[ns_urlencode ${see}]\">$see</a>"
+            return "<a href=\"[ns_quotehtml proc-view?proc=[ns_urlencode ${see}]]\">$see</a>"
         }
         if {[string match "/doc/*.html" $see]
             || [util_url_valid_p $see]} { 
-            return "<a href=\"${see}]\">$see</a>"
+            return "<a href=\"[ns_quotehtml $see]\">$see</a>"
         }
         if {[file exists "$::acs::rootdir${see}"]} {
-            return "<a href=\"content-page-view?source_p=1&path=[ns_urlencode $see]\">$see</a>"
+            return "<a href=\"[ns_quotehtml content-page-view?source_p=1&path=[ns_urlencode $see]]\">$see</a>"
         }
         return ${see}
     }
@@ -1212,7 +1213,7 @@
                              && $had_colons in $::apidoc::KEYWORDS)} {
 
                             set url "/api-doc/proc-view?proc=$proc_name"
-                            append html "<a href='$url' title='Tcl command'>" \
+                            append html "<a href='[ns_quotehtml $url]' title='Tcl command'>" \
                                 [pretty_token keyword $proc_name] </a>
 
                             #append html [pretty_token keyword $proc_name]
@@ -1224,12 +1225,12 @@
                             set url [::xotcl::api object_url \
                                          -show_source 1 -show_methods 2 \
                                          $scope $proc_name]
-                            append html "<a href='$url' title='XOTcl object'>" \
+                            append html "<a href='[ns_quotehtml $url]' title='XOTcl object'>" \
                                 [pretty_token object $proc_name] </a>
 
                         } elseif {[string match "ns*" $proc_name]} {
                             set url "/api-doc/tcl-proc-view?tcl_proc=$proc_name"
-                            append html "<a href='$url' title='[ns_info name] command'>" \
+                            append html "<a href='[ns_quotehtml $url]' title='[ns_info name] command'>" \
                                 [pretty_token proc $proc_name] </a>
 
                         } elseif {[string match "*__arg_parser" $proc_name]} {
@@ -1238,12 +1239,12 @@
                         } elseif {$proc_namespace ne "" 
                                   && [info commands ::${proc_namespace}::${proc_name}] ne ""}  {
                             set url [api_proc_url ${proc_namespace}::${proc_name}]
-                            append html "<a href='$url' title='API command'>" \
+                            append html "<a href='[ns_quotehtml $url]' title='API command'>" \
                                 [pretty_token proc $proc_name] </a>
 
                         } elseif {[info commands ::$proc_name] ne ""}  {
                             set url [api_proc_url $proc_name]
-                            append html "<a href='$url' title='API command'>" \
+                            append html "<a href='[ns_quotehtml $url]' title='API command'>" \
                                 [pretty_token proc $proc_name] </a>
 
                         } else {
@@ -1374,7 +1375,7 @@
     @author Lars Pind (lars@pinds.com)
     @creation-date 14 July 2000
 } {
-    return "<a href=\"[api_proc_url $proc]\">$proc</a>"
+    return "<a href=\"[ns_htmlencode [api_proc_url $proc]]\">$proc</a>"
 }
 
 
Index: openacs-4/packages/acs-api-browser/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/index.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-api-browser/www/index.adp	27 Oct 2014 16:38:59 -0000	1.19
+++ openacs-4/packages/acs-api-browser/www/index.adp	15 Jun 2015 11:15:55 -0000	1.20
@@ -21,7 +21,7 @@
   <h3>Disabled Packages</h3>
   <ul>
    <multiple name="disabled_packages">
-   <li>@disabled_packages.pretty_name@ @disabled_packages.version_name@</a></li>
+   <li>@disabled_packages.pretty_name@ @disabled_packages.version_name@</li>
    </multiple>
   </ul>
 </if>
@@ -31,10 +31,10 @@
   <h3>Uninstalled Packages</h3>
   <ul>
    <multiple name="uninstalled_packages">
-   <li>@uninstalled_packages.pretty_name@ @uninstalled_packages.version_name@</a></li>
+   <li>@uninstalled_packages.pretty_name@ @uninstalled_packages.version_name@</li>
    </multiple>
   </ul>
 </if>
 
-<br clear="both">
+<br style="clear:both">
 </div>
Index: openacs-4/packages/acs-api-browser/www/proc-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-search.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-api-browser/www/proc-search.adp	27 Oct 2014 16:39:00 -0000	1.12
+++ openacs-4/packages/acs-api-browser/www/proc-search.adp	15 Jun 2015 11:15:55 -0000	1.13
@@ -10,7 +10,7 @@
 <h3>Procedure Matches</h3>
 <ul>
   <multiple name="results">
-  <li> <if @results.score@ lt 10>&nbsp;&nbsp;</if>@results.score@: <a href=@results.url@>@results.proc@</a>
+  <li> <if @results.score@ lt 10>&nbsp;&nbsp;</if>@results.score@: <a href="@results.url@">@results.proc@</a>
    <i>@results.args;noquote@</i>
    </multiple>
 </ul>
@@ -27,7 +27,7 @@
     </p>
     <ul>
       <multiple name="private_results">
-        <li><if @private_results.score@ lt 10>&nbsp;&nbsp;</if>@private_results.score@: <a href=@private_results.url@>@private_results.proc@</a>
+        <li><if @private_results.score@ lt 10>&nbsp;&nbsp;</if>@private_results.score@: <a href="@private_results.url@">@private_results.proc@</a>
          <i>@private_results.args;noquote@</i>
        </multiple>
     </ul>
@@ -47,7 +47,7 @@
     </p>
     <ul>
       <multiple name="deprecated_results">
-        <li><if @deprecated_results.score@ lt 10>&nbsp;&nbsp;</if>@deprecated_results.score@: <a href=@deprecated_results.url@>@deprecated_results.proc@</a>
+        <li><if @deprecated_results.score@ lt 10>&nbsp;&nbsp;</if>@deprecated_results.score@: <a href="@deprecated_results.url@">@deprecated_results.proc@</a>
          <i>@deprecated_results.args;noquote@</i>
        </multiple>
     </ul>
@@ -58,7 +58,7 @@
     </p>
   </else>
 </if>
-<br clear="both">
+<br style="clear:both">
 </div>
 
 
Index: openacs-4/packages/acs-api-browser/www/proc-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-view.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-api-browser/www/proc-view.adp	27 Oct 2014 16:39:00 -0000	1.10
+++ openacs-4/packages/acs-api-browser/www/proc-view.adp	15 Jun 2015 11:15:55 -0000	1.11
@@ -7,7 +7,7 @@
 </if>
 <else>
 <table width="100%">
-  <tr><td bgcolor="#eeeeee">@documentation;noquote@</td></tr>
+  <tr><td style="background: #eeeeee">@documentation;noquote@</td></tr>
 </table>
 
 <if @source_p@ eq 0>
@@ -23,7 +23,7 @@
 </if>
 </else>
 
-<form action=proc-view method=get>
-Show another procedure: <input type="text" name="proc"> <input type="submit" value="Go">
+<form action="proc-view" method="get">
+<div>Show another procedure: <input type="text" name="proc"> <input type="submit" value="Go"></div>
 </form>
 
Index: openacs-4/packages/acs-subsite/www/admin/confirm-delete-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/confirm-delete-form.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/confirm-delete-form.adp	9 Jun 2015 07:57:52 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/confirm-delete-form.adp	15 Jun 2015 11:14:17 -0000	1.4
@@ -1,16 +1,9 @@
 <form method="get" action="@action@">
 @export_vars;noquote@
 
-<table>
- <tr>
-  <td>
+<div>
     <input type="submit" name="operation" value="@no_button@">
-  </td>
-  <td width="25">&nbsp;</td>
-  <td>
     <input type="submit" name="operation" value="@yes_button@">
-  </td>
- </tr>
-</table>
+</div>
 
 </form>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-rel-types-exist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete-rel-types-exist.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-rel-types-exist.adp	27 Oct 2014 16:39:49 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-rel-types-exist.adp	15 Jun 2015 11:14:17 -0000	1.5
@@ -11,7 +11,7 @@
 
 <ul>
   <multiple name="rel_types">
-    <li> @rel_types.pretty_name@ (<a href=../rel-types/delete?@rel_types.export_vars@>delete</a>)
+    <li> @rel_types.pretty_name@ (<a href="../rel-types/delete?@rel_types.export_vars@">delete</a>)
   </multiple>
 </ul>
 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp	15 Apr 2011 11:43:48 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp	15 Jun 2015 11:14:17 -0000	1.6
@@ -6,7 +6,7 @@
 <h1>#acs-subsite.Add_relationship_for_group__group_type#</h1>
 
 <if @primary_rels:rowcount@ eq "0">
-  <p>There are no other relationship types that you can add. You can <a href=../rel-types/new?return_url=@return_url_enc@>create a new relationship type</a> if you like.</p>
+  <p>There are no other relationship types that you can add. You can <a href="../rel-types/new?return_url=@return_url_enc@">create a new relationship type</a> if you like.</p>
 </if>
 <else>
 <form method="get" action="rel-type-add-2">
Index: openacs-4/packages/acs-subsite/www/admin/groups/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/groups/delete.adp	27 Oct 2014 16:39:50 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/delete.adp	15 Jun 2015 11:14:17 -0000	1.5
@@ -20,6 +20,6 @@
 
 <p>
 
-<center>
+<div>
 <include src="../confirm-delete-form" action="delete-2" export_vars="@export_form_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this group">
-</center>
+</div>
Index: openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl	27 Oct 2014 16:39:50 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl	15 Jun 2015 11:14:17 -0000	1.4
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 
 } {
-    group_id:naturalnum,notnull
+    group_id:integer,notnull
 } -properties {
     context:onevalue
     group_name:onevalue
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp	18 Apr 2011 17:24:30 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp	15 Jun 2015 11:14:17 -0000	1.4
@@ -7,15 +7,15 @@
 
 <ul>  
 <multiple name="group_types">
- <li><a href="../group-types/one?group_type=@group_types.group_type_enc@">@group_types.type_pretty_name@</a> </li>
+ <li><a href="../group-types/one?group_type=@group_types.group_type_enc@">@group_types.type_pretty_name@</a>
  <ul>
  <if @group_types.number_groups@ lt 25>
    <include src="../group-types/groups-list" group_type=@group_types.group_type;noquote@>
  </if>
  <else>
-   <li> <a href="../group-types/groups-display?group_type=@group_types.group_type_enc@">View all @group_types.number_groups@ groups</a> </li>
- </else>
+   <li> <a href="../group-types/groups-display?group_type=@group_types.group_type_enc@">View all @group_types.number_groups@ groups</a></li> </else>
  </ul>
+ </li>  
 </multiple>
 
 </ul>
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp	9 Jun 2015 08:40:42 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp	15 Jun 2015 11:14:17 -0000	1.7
@@ -36,7 +36,7 @@
             </if>
             <li>Relational segment: 
               <if @rels.segment_id@ nil>
-                <em>#acs-subsite.none#</em> (<a href="../rel-segments/new?group_id=@group_id@&rel_type=@rels.rel_type@&return_url=@return_url_enc@">create segment</a>)
+                <em>#acs-subsite.none#</em> (<a href="../rel-segments/new?group_id=@group_id@&amp;rel_type=@rels.rel_type@&amp;return_url=@return_url_enc@">create segment</a>)
               </if>
               <else>
                 <a href="../rel-segments/one?segment_id=@rels.segment_id@">@rels.segment_name@</a>
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.adp	9 Jun 2015 08:40:42 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.adp	15 Jun 2015 11:14:17 -0000	1.3
@@ -24,9 +24,9 @@
 <else>
 <ol>
  <multiple name="rels">
-  <li> <a href=../relations/one?rel_id=@rels.rel_id@>@rels.element_name@</a>
+  <li> <a href="../relations/one?rel_id=@rels.rel_id@">@rels.element_name@</a>
   <if @delete_p@ eq 1>
-    (<a href="../relations/remove?rel_id=@rels.rel_id@&return_url=@return_url_enc@">remove</a>)
+    (<a href="../relations/remove?rel_id=@rels.rel_id@&amp;return_url=@return_url_enc@">remove</a>)
   </if>
   </li>
  </multiple>
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl	27 Oct 2014 16:39:51 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl	15 Jun 2015 11:14:18 -0000	1.4
@@ -1,14 +1,14 @@
 # /packages/acs-subsite/www/admin/groups/elements-display.tcl
 
-if { (![info exists group_id] || $group_id eq "") } {
+if { ![info exists group_id] || $group_id eq "" } {
     error "Group must be specified"
 }
 
-if { (![info exists rel_type] || $rel_type eq "") } {
+if { ![info exists rel_type] || $rel_type eq "" } {
     error "Rel type must be specified"
 }
 
-if { (![info exists return_url_enc] || $return_url_enc eq "") } {
+if { ![info exists return_url_enc] || $return_url_enc eq "" } {
     # Default return url to the current page
     set return_url_enc [ad_urlencode "[ad_conn url]?[ad_conn query]"]
 }
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp	27 Oct 2014 16:39:51 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp	15 Jun 2015 11:14:18 -0000	1.6
@@ -7,7 +7,7 @@
 <if @member_state@ eq approved or @member_state@ eq "">
     <if @create_p@ eq 1>
       <ul>
-        <li> <a href=../relations/add?group_id=@group_id@&rel_type=@rel_type_enc@&return_url=@return_url_enc@>
+        <li> <a href="../relations/add?group_id=@group_id@"&amp;rel_type=@rel_type_enc@&amp;return_url=@return_url_enc@">
         Add a @role_pretty_name@</a>
         </li>
       </ul>
Index: openacs-4/packages/acs-subsite/www/admin/groups/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/groups/one.adp	9 Jun 2015 08:40:42 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/admin/groups/one.adp	15 Jun 2015 11:14:18 -0000	1.9
@@ -22,13 +22,11 @@
    </li>
   </multiple>
  </else>
- <p>
  <li> Join Policy: @join_policy@
      <if @admin_p@ eq "1">
-         (<a href="change-join-policy?return_url=@return_url_enc@&group_id=@group_id@">edit</a>)
+         (<a href="change-join-policy?return_url=@return_url_enc@&amp;group_id=@group_id@">edit</a>)
      </if>
  <if @category_url@ not nil>
-  <p>
   <li>Category trees: @category_trees@
       (<a href="@category_url@cadmin/object-map?object_id=@group_id@">edit</a>)
   </li>
Index: openacs-4/packages/acs-subsite/www/admin/groups/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/groups/one.tcl	27 Oct 2014 16:39:51 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/groups/one.tcl	15 Jun 2015 11:14:18 -0000	1.8
@@ -8,7 +8,7 @@
     @creation-date 2000-12-05
     @cvs-id $Id$
 } {
-    group_id:naturalnum,notnull
+    group_id:integer,notnull
 } -properties {
     context:onevalue
     group_id:onevalue
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp	27 Oct 2014 16:39:51 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp	15 Jun 2015 11:14:18 -0000	1.5
@@ -13,8 +13,6 @@
 
 </ul>
 
-<p>
-
-<center>
+<div>
 <include src="../confirm-delete-form" action="rel-type-remove-2" export_vars="@export_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this relationship type">
-</center>
+</div>
Index: openacs-4/packages/acs-subsite/www/admin/object-types/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/one.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/object-types/one.adp	27 Oct 2014 16:39:51 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/object-types/one.adp	15 Jun 2015 11:14:18 -0000	1.4
@@ -5,6 +5,6 @@
 <ul class="action-links">
  <li><a href="index">View Hierarchical Index</a> | <a href="alphabetical-index">View Alphabetical Index</a></li>
 </ul>
-<p/>
+<p>
 
 @page;noquote@
Index: openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl	9 Jun 2015 07:57:52 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl	15 Jun 2015 11:14:18 -0000	1.10
@@ -92,9 +92,8 @@
 	append page "
 <p>
 <b>Attributes</b>:
- <ul>
 $body
- </ul>"
+"
     }
 
 if { ([info exists table_name] && $table_name ne "") } {
@@ -137,9 +136,8 @@
 	append page "
 <p>
 <b>Table Attributes</b>:
- <ul>
 $body
- </ul>"
+"
     }
 }
 
@@ -160,15 +158,10 @@
     append page "
 <p>
 <b>Methods</b>:
- <ul>
   <pre>
    <code>
-$body
+[ns_quotehtml $body]
    </code>
   </pre>
- </ul>"
-}
+"}
 
-append page "
-</ul>
-"
Index: openacs-4/packages/acs-subsite/www/admin/parties/add-select-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/add-select-type.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/parties/add-select-type.adp	27 Oct 2014 16:39:52 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/parties/add-select-type.adp	15 Jun 2015 11:14:18 -0000	1.7
@@ -4,7 +4,8 @@
 
 <blockquote>
 
-What type of @object_type_pretty_name@ do you want to create?
+<p>
+What type of <strong>@object_type_pretty_name@</strong> do you want to create?
 
 <p>
 
@@ -13,7 +14,7 @@
   @object_types.indent;noquote@ 
 
   <if @object_types.valid_p@ eq 1>
-  <a href="@this_url@?@export_url_vars@&@object_type_variable@=@object_types.object_type_enc@">@object_types.pretty_name@</a>
+  <a href="@this_url@?@export_url_vars@&amp;@object_type_variable@=@object_types.object_type_enc@">@object_types.pretty_name@</a>
   </if>
   <else>
   @object_types.pretty_name@
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.adp	9 Jun 2015 08:40:42 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.adp	15 Jun 2015 11:14:18 -0000	1.6
@@ -5,22 +5,22 @@
 
 You are creating a segment to represent all @role_pretty_plural@ of 
 <if @subsite_group_id@ eq @group_id@>
-    <a href=../groups/index?view_by=rel_type>@group_name@</a>
+    <a href="../groups/index?view_by=rel_type">@group_name@</a>
 </if>
 <else>
-    <a href=../groups/one?group_id=@group_id@>@group_name@</a>
+    <a href="../groups/one?group_id=@group_id@">@group_name@</a>
 </else>
 
 <p>
 
 <form name="segment_new" method="get" action="new-3">
 @export_vars;noquote@
-
+<div>
 Segment Name:
   <input type="text" name="segment_name" maxlength="230">
-
-<p><center><input type="submit" value="Create"></center>
-
+</div>
+<div>
+<input type="submit" value="Create">
+</div>
 </form>
 
-</else>
\ No newline at end of file
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl	27 Oct 2014 16:39:53 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl	15 Jun 2015 11:14:18 -0000	1.6
@@ -10,7 +10,7 @@
     @cvs-id $Id$
 
 } {
-    group_id:naturalnum,notnull
+    group_id:integer,notnull
     rel_type:notnull
     { return_url "" }
 } -properties {
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl	27 Oct 2014 16:39:53 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl	15 Jun 2015 11:14:18 -0000	1.6
@@ -10,7 +10,7 @@
     @cvs-id $Id$
 
 } {
-    group_id:naturalnum,notnull
+    group_id:integer,notnull
     segment_name:notnull
     rel_type:notnull
     { return_url "" }
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl	27 Oct 2014 16:39:53 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl	15 Jun 2015 11:14:18 -0000	1.5
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 
 } {
-    group_id:naturalnum,notnull
+    group_id:integer,notnull
     { rel_type:trim "" }
     { return_url "" }
 } -properties {
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp	9 Jun 2015 08:40:42 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp	15 Jun 2015 11:14:18 -0000	1.7
@@ -22,7 +22,7 @@
     </li>
    </multiple>
   </else>
-  <p><li> <a href="constraints/new?rel_segment=@segment_id@">Add a constraint</a> </li>
+  <li> <a href="constraints/new?rel_segment=@segment_id@">Add a constraint</a> </li>
 </ul>
 
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp	27 Oct 2014 16:39:53 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp	15 Jun 2015 11:14:18 -0000	1.5
@@ -17,4 +17,4 @@
 
 </ul>
 
-Note: Relational constraints are created from the <a href=../>relational segment administration pages</a>
+Note: Relational constraints are created from the <a href="../">relational segment administration pages</a>
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.adp	27 Oct 2014 16:39:53 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.adp	15 Jun 2015 11:14:18 -0000	1.5
@@ -3,9 +3,9 @@
 <property name="doc(title)">@props.constraint_name;noquote@</property>
 
 All elements in side @props.rel_side@ of the segment 
-  <a href=../one?segment_id=@props.segment_id@>@props.segment_name@</a> 
+  <a href="../one?segment_id=@props.segment_id@">@props.segment_name@</a> 
 must be in the segment 
-  <a href=../one?segment_id=@props.req_segment_id@>@props.req_segment_name@</a>
+  <a href="../one?segment_id=@props.req_segment_id@">@props.req_segment_name@</a>
 
 <p>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/violations.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/violations.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/violations.adp	27 Oct 2014 16:39:53 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/violations.adp	15 Jun 2015 11:14:18 -0000	1.5
@@ -8,6 +8,6 @@
 
 <ul>
 <multiple name="violations">
-  <li> @violations.name@ (<a href=../../relations/remove?rel_id=@violations.rel_id@&return_url=@return_url_enc@>remove</a>) </li>
+  <li> @violations.name@ (<a href="../../relations/remove?rel_id=@violations.rel_id@&amp;return_url=@return_url_enc@">remove</a>) </li>
 </multiple>
 </ul>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl	9 Jun 2015 07:57:52 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl	15 Jun 2015 11:14:18 -0000	1.8
@@ -116,7 +116,7 @@
 set role_return_url_enc [ad_urlencode "[ad_conn url]?[ad_conn query]"]
 
 template::element create rel_type role_one \
-	-label "Role one<br><font size='-1'>(<a href=\"roles/new?return_url=$role_return_url_enc\">create new role</a>)</font>" \
+	-label "Role one<br><small>(<a href=\"roles/new?return_url=$role_return_url_enc\">create new role</a>)</small>" \
 	-datatype text \
 	-widget select \
 	-options $roles_list_i18n
@@ -141,7 +141,7 @@
 
 
 template::element create rel_type role_two \
-	-label "Role two<br><font size='-1'>(<a href=\"roles/new?return_url=$role_return_url_enc\") >create new role</a>)</font>" \
+	-label "Role two<br><small>(<a href=\"roles/new?return_url=$role_return_url_enc\">create new role</a>)</small>" \
 	-datatype text \
 	-widget select \
 	-options $roles_list_i18n
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp	9 Jun 2015 08:40:42 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp	15 Jun 2015 11:14:18 -0000	1.6
@@ -34,9 +34,9 @@
    </multiple>
   </else>
   <if @dynamic_p@ eq "t"> 
-    <p><li> <a href="../attributes/add?object_type=@rel_type_enc@&return_url=@return_url_enc@">Add an attribute</a>
+    <li> <a href="../attributes/add?object_type=@rel_type_enc@&return_url=@return_url_enc@">Add an attribute</a></li>
   </if><else>
-    <p><li> Attributes can only be added by programmers since this object type is not dynamically created
+    <li> Attributes can only be added by programmers since this object type is not dynamically created</li>
   </else>
 </ul>
 
@@ -46,7 +46,7 @@
 <ul>
   <li> <b>Side One:</b>
   <ul>
-    <li> Object Type: <a href=../object-types/one?object_type=@properties.object_type_one@>@properties.object_type_one_pretty_name@</a>
+    <li> Object Type: <a href="../object-types/one?object_type=@properties.object_type_one@">@properties.object_type_one_pretty_name@</a>
     <li> Role: <a href="roles/one?role=<%=[ad_urlencode $properties(role_one)]%>">@properties.role_one_pretty_name@</a>
 
 <if @properties.min_n_rels_one@ nil>
@@ -64,7 +64,7 @@
 
   <p><li> <b>Side Two:</b>
   <ul>
-    <li> Object Type: <a href=../object-types/one?object_type=@properties.object_type_two@>@properties.object_type_two_pretty_name@</a>
+    <li> Object Type: <a href="../object-types/one?object_type=@properties.object_type_two@">@properties.object_type_two_pretty_name@</a>
     <li> Role: <a href="roles/one?role=<%=[ad_urlencode $properties(role_two)]%>">@properties.role_two_pretty_name@</a>
 
 <if @properties.min_n_rels_one@ nil>
Index: openacs-4/packages/acs-subsite/www/admin/relations/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	13 Jun 2015 23:59:10 -0000	1.13
+++ openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	15 Jun 2015 11:14:18 -0000	1.14
@@ -9,9 +9,9 @@
     @creation-date 2000-12-11
     @cvs-id $Id$
 } {
-    group_id:naturalnum,notnull
+    group_id:integer,notnull
     rel_type:notnull
-    {party_id:naturalnum ""}
+    { party_id:naturalnum "" }
     { exact_p:boolean "f" }
     { return_url "" }
     { allow_out_of_scope_p:boolean "f" }
Index: openacs-4/packages/acs-subsite/www/admin/relations/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/one.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/relations/one.adp	9 Jun 2015 08:40:42 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/relations/one.adp	15 Jun 2015 11:14:18 -0000	1.6
@@ -44,8 +44,9 @@
 <p><h3>Administration</h3>
  <ul>
   <if @admin_p@ eq "1" and @member_state@ ne "">
+        <li> Member State:
       <form method="post" action="change-member-state">
-      <li> Member State:
+    	<div>
       <input type="hidden" name="return_url" value="@QQreturn_url@">
       <input type="hidden" name="rel_id" value="@rel_id@">
       <select name="member_state">
@@ -59,8 +60,9 @@
       </list>
       </select>
       <input type="submit" value="Change Status">
-      </li>
+      </div>
       </form>
+      </li>
   </if>
   <li> <a href="remove?rel_id=@rel_id@">Remove this relation</a> </li>
  </ul>
Index: openacs-4/packages/acs-subsite/www/admin/relations/remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/relations/remove.adp	27 Oct 2014 16:39:55 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove.adp	15 Jun 2015 11:14:18 -0000	1.5
@@ -7,7 +7,7 @@
 
 <p>
 
-<center>
+<div>
 <include src="../confirm-delete-form" action="remove-2" export_vars="@export_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to remove this relation">
-</center>
+</div>
 
Index: openacs-4/packages/acs-subsite/www/doc/index.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/doc/index.html,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/doc/index.html	13 Jan 2005 13:55:49 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/doc/index.html	15 Jun 2015 11:14:18 -0000	1.3
@@ -12,30 +12,30 @@
 
 <h3>Document overview</h3>
 
-<table cellpadding=0 cellspacing=0>
+<table cellpadding="0" cellspacing="0">
  <tr>
-  <td colspan=2><a href="/doc/subsites-requirements.html">Overall requirements</a></td>
+  <td colspan="2"><a href="/doc/subsites-requirements.html">Overall requirements</a></td>
   <td>Overview of the requirements that motivated the design of subsites.</td>
  </tr>
 
  <tr>
-  <td colspan=2><a href="/doc/subsites-design.html">Design</a></td>
+  <td colspan="2"><a href="/doc/subsites-design.html">Design</a></td>
   <td>Overview of the API provided by ACS subsites including the package manger, 
         site nodes, and request processor hooks.</td>
  </tr>
 
  <tr>
-  <td colspan=2><a href = "group-admin-pages-requirements.html">Group admin pages requirements</a></td>
+  <td colspan="2"><a href="group-admin-pages-requirements.html">Group admin pages requirements</a></td>
   <td>Overview of the requirements for web-based group administration tools</td>
  </tr>
 
  <tr>
-  <td colspan=2><a href = "group-admin-pages-design.html">Group admin pages design</a></td>
+  <td colspan="2"><a href="group-admin-pages-design.html">Group admin pages design</a></td>
   <td>Overview of the API and design of the web-based group administration</td>
  </tr>
 
  <tr>
-  <td colspan=2><a href = "images.html">Subsite images</a></td>
+  <td colspan="2"><a href="images.html">Subsite images</a></td>
   <td>Shows all (hopefully) images available from the subsite package</td>
  </tr>
 
Index: openacs-4/packages/acs-subsite/www/members/user-batch-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-batch-add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/members/user-batch-add.adp	27 Oct 2014 16:39:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/members/user-batch-add.adp	15 Jun 2015 11:14:19 -0000	1.6
@@ -12,14 +12,14 @@
   user2@example.net, Emily, Dickinson
   </code>
 </p>
-
-<textarea name=userlist rows=15 cols=50></textarea>
-
+<div>
+<textarea name="userlist" rows="15" cols="50"></textarea>
+</div>
 <p>Each user will get this email:
 <br>From: <input name="from" value="@admin_email@">
-<br>Subject: <input name=subject value="You have been added as a user to @system_name@ at @system_url@" size=50>
+<br>Subject: <input name=subject value="You have been added as a user to @system_name@ at @system_url@" size="50">
 <p>Message:
-<br><textarea name="message" rows=10 cols=70 wrap=hard>
+<br><textarea name="message" rows="10" cols="70">
 Dear &lt;first_names&gt; &lt;last_name&gt;,
 
 You have been added as a user to @system_name@
@@ -34,9 +34,8 @@
 @administration_name@
 </textarea>
 </p>
-<center>
+<div>
 <input type="submit" value="Import List and Send Emails">
-</center>
+</div>
 
 </form>
-</p>
Index: openacs-4/packages/acs-subsite/www/permissions/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/permissions/index.adp	27 Oct 2014 16:39:59 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/permissions/index.adp	15 Jun 2015 11:14:19 -0000	1.6
@@ -16,12 +16,12 @@
     <else>
       <em>#acs-subsite.You_do_not_have_admin_on#<em>
     </else>
-
     <form method="get" action="one">
+      <div>
       #acs-subsite.Select_an_Object_by_Id#
       <input name="object_id" type="text"> <input value="Continue" type="submit">
+      </div>
     </form>
-
 <if @admin_p@><p>
 #acs-subsite.You_can_also_browse_from# <a href="./?root=@default_context@">#acs-subsite.default_context#</a>
 #acs-subsite.or_the# <a href="./?root=@security_context_root@">#acs-subsite.Security_context_root#</a>#acs-subsite._or# <a href="./?root=@subsite@">#acs-subsite.this_subsite#</a>.
Index: openacs-4/packages/acs-subsite/www/permissions/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/www/permissions/one.tcl	13 Jun 2015 23:59:10 -0000	1.16
+++ openacs-4/packages/acs-subsite/www/permissions/one.tcl	15 Jun 2015 11:14:19 -0000	1.17
@@ -41,6 +41,7 @@
 lappend controls "<a href=\"[ns_quotehtml $controlsUrl]\">[ns_quotehtml [_ acs-subsite.Grant_Permission]]</a>"
 
 db_1row context { *SQL* }
+set context_name [lang::util::localize $context_name]
 
 set toggleUrl [export_vars -base toggle-inherit {application_url object_id}]
 if { $security_inherit_p == "t" && $context_id ne "" } {
@@ -53,8 +54,8 @@
 
 set export_form_vars [export_vars -form {object_id application_url}]
 
-set show_children_url "one?[export_vars {object_id application_url {children_p t}}]"
-set hide_children_url "one?[export_vars {object_id application_url {children_p f}}]"
+set show_children_url [export_vars -base one {object_id application_url {children_p t}}]
+set hide_children_url [export_vars -base one {object_id application_url {children_p f}}]
 
 if {$children_p == "t"} {
     db_multirow children children { *SQL* } {