Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl	27 Oct 2014 16:38:51 -0000	1.19
+++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl	15 Jun 2015 11:10:10 -0000	1.20
@@ -133,24 +133,24 @@
                 <td align='center'><input type='checkbox' name='package_key' value='$package_key' "
             }
             
-            append widget "></td>
-            <td>$package(package-name) $package(name)</td>
-            <td>$package_key</td>
-            <td><font color='green'>Dependencies satisfied.</font></td>
-            </tr> "
+            append widget [subst {></td>
+                <td>$package(package-name) $package(name)</td>
+                <td>$package_key</td>
+                <td><span style='color:green'>Dependencies satisfied.</span></td>
+                </tr> }]
         } elseif { [pkg_info_dependency_p $pkg_info] == "f" } {
             #Dependency failed.
-            append widget "
-            <td align=center><input type='checkbox' name='package_key' value='$package_key' ></td>
-            <td>$package(package-name) $package(name)</td>
-            <td>$package_key</td>
-            <td><font color='red'>
-            "
+            append widget [subst {
+                <td align=center><input type='checkbox' name='package_key' value='$package_key' ></td>
+                <td>$package(package-name) $package(name)</td>
+                <td>$package_key</td>
+                <td><span style='color:red'>
+            }]
             foreach comment [pkg_info_comment $pkg_info] {
                 append widget "$comment<br>"
             }
             append widget "
-            </font></td>
+            </span></td>
             </tr>
             "
         } else {
Index: openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	27 Oct 2014 16:38:52 -0000	1.13
+++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	15 Jun 2015 11:10:10 -0000	1.14
@@ -128,7 +128,7 @@
 
         append body [apm_package_selection_widget $pkg_info_list $result(install)]
         append body [subst {
-            <input type=submit value="Select Data Model Scripts">
+            <div><input type="submit" value="Select Data Model Scripts"></div>
             </form>
         }]
         
Index: openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	27 Oct 2014 16:38:52 -0000	1.15
+++ openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	15 Jun 2015 11:10:10 -0000	1.16
@@ -78,7 +78,7 @@
             set mount_html ""
         }
         append body [subst {
-            Select what data files to load for $version(package-name) $final_version_name
+            <p>Select what data files to load for $version(package-name) $final_version_name
             <blockquote>
             <table cellpadding='3' cellspacing='3' class='list-table'>
             <tr>
Index: openacs-4/packages/acs-admin/www/apm/packages-install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/acs-admin/www/apm/packages-install.tcl	27 Oct 2014 16:38:52 -0000	1.23
+++ openacs-4/packages/acs-admin/www/apm/packages-install.tcl	15 Jun 2015 11:10:10 -0000	1.24
@@ -145,7 +145,7 @@
 
     append body $widget
     append body [subst {
-        <input type="submit" value="Next -->">
+        <div><input type="submit" value="Next -->"></div>
         </form>
     }]
     
Index: openacs-4/packages/acs-admin/www/users/bouncing-users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/bouncing-users.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/users/bouncing-users.adp	27 Oct 2014 16:38:56 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/bouncing-users.adp	15 Jun 2015 11:10:10 -0000	1.3
@@ -1,6 +1,7 @@
 <master>
 <property name="doc(title)">#acs-mail-lite.Bouncing_users#</property>
 <property name="context">@context;noquote@</property>
+
 <h2>#acs-mail-lite.Bouncing_users#</h2>
 <listtemplate name="bouncing_users"></listtemplate>
-</center>
+
Index: openacs-4/packages/acs-admin/www/users/complex-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-admin/www/users/complex-search.adp	27 Oct 2014 16:38:56 -0000	1.8
+++ openacs-4/packages/acs-admin/www/users/complex-search.adp	15 Jun 2015 11:10:10 -0000	1.9
@@ -24,14 +24,6 @@
 
 <hr>
 
-<ul>
-  <multiple name="user_search">
-    <li><a href="@target@?user_id=@user_search.user_id@&@user_search.export_vars@&@passthrough_parameters@">@user_search.first_names@ @user_search.last_name@ (@user_search.email@)</a>
-    <if @user_search.member_state@ ne "approved">
-       <font color="red">@user_search.member_state@</font> @user_search.user_finite_state_links;noquote@
-    </if>
-  </multiple>
-</ul>
 
 <if @user_search:rowcount@ eq 0>
   <ul>
@@ -40,16 +32,25 @@
 </if>
 <else>
 
+<ul>
+  <multiple name="user_search">
+    <li><a href="@target@?user_id=@user_search.user_id@&amp;@user_search.export_vars@&amp;@passthrough_parameters@">@user_search.first_names@ @user_search.last_name@ (@user_search.email@)</a>
+    <if @user_search.member_state@ ne "approved">
+       <span style="color:red">@user_search.member_state@</span> @user_search.user_finite_state_links;noquote@
+    </if>
+  </multiple>
+</ul>
+
   <if @user_search:rowcount@ gt 30>
 
     <if @only_authorized_p@ eq 0>
       <p>
-        We're showing all users, authorized or not (<a href="complex-search?@export_authorize@&only_authorized_p=1">
+        We're showing all users, authorized or not (<a href="complex-search?@export_authorize@&amp;only_authorized_p=1">
         show only authorized</a>).
       <p>
     </if><else>
       <p>
-        We're only showing authorized users (<a href="complex-search?@export_authorize@&only_authorized_p=0">show all</a>).
+        We're only showing authorized users (<a href="complex-search?@export_authorize@&amp;only_authorized_p=0">show all</a>).
       <p>
     </else>
 
Index: openacs-4/packages/acs-admin/www/users/complex-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-admin/www/users/complex-search.tcl	13 Jun 2015 23:55:33 -0000	1.13
+++ openacs-4/packages/acs-admin/www/users/complex-search.tcl	15 Jun 2015 11:10:10 -0000	1.14
@@ -36,7 +36,7 @@
     keyword:optional
     target
     {passthrough ""}
-    {limit_to_users_in_group_id:naturalnum ""}
+    {limit_to_users_in_group_id:integer ""}
     {only_authorized_p:boolean 1}
     {only_needs_approval_p:boolean 0}
     {registration_before_days:integer -1}
@@ -233,7 +233,12 @@
     set user_search:[set rowcount](member_state) $member_state
     
     if { $member_state ne "approved" } {
-	set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search "complex-search?[export_vars -url {email last_name keyword target passthrough limit_to_users_in_group_id only_authorized_p}]"] " | "]
+	set user_search:[set rowcount](user_finite_state_links) \
+	    [join [ad_registration_finite_state_machine_admin_links \
+		       $member_state $email_verified_p $user_id_from_search \
+		       [export_vars -base -url {
+			   email last_name keyword target passthrough limit_to_users_in_group_id only_authorized_p
+		       }]] " | "]
     } else {
 	set user_search:[set rowcount](user_finite_state_links) ""
     }
Index: openacs-4/packages/acs-admin/www/users/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/index.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-admin/www/users/index.adp	27 Oct 2014 16:38:57 -0000	1.14
+++ openacs-4/packages/acs-admin/www/users/index.adp	15 Jun 2015 11:10:10 -0000	1.15
@@ -3,39 +3,37 @@
 <property name="context">@context;noquote@</property>
 
 <ul>
-  <li>total users: <a href="complex-search?target=one&only_authorized_p=0">@n_users@</a> (@n_deleted_users@ deleted).  Last registration on @last_registration@ (<a href="registration-history">history</a>).</li>
+  <li>total users: <a href="complex-search?target=one&amp;only_authorized_p=0">@n_users@</a> (@n_deleted_users@ deleted).  Last registration on @last_registration@ (<a href="registration-history">history</a>).
 
-
-  <p>
-  <FORM METHOD=get ACTION=search>
-    <input type="hidden" name="target" value="one">
+  <li><form method="get" action="search">
+    <div><input type="hidden" name="target" value="one">
     <input type="hidden" name="only_authorized_p" value="0">
-    <li>Quick search: <input type="text" size="15" name="keyword">
+    Quick search: <input type="text" size="15" name="keyword">
                   <input type="submit" value="Find User">
-  </FORM>
-        </p>
-  <li><a href="complex-search?target=one&only_authorized_p=0&only_needs_approval_p=1">Find all users needing approval</a></li>
+    </div>
+  </form><p></li>
+  <li><a href="complex-search?target=one&amp;only_authorized_p=0&amp;only_needs_approval_p=1">Find all users needing approval</a></li>
   <li><a href="bouncing-users">Find all bouncing users</a></li>
   <li><a href="user-add">Add a user</a></li>
   <li><a href="/members/user-batch-add">Add a batch of users</a></li>
-  <li><a href="/admin/manage-email-privacy">#acs-subsite.manage_users_email#</a></li>
-
+  <li><a href="/admin/manage-email-privacy">#acs-subsite.manage_users_email#</a><p></li>
+  <li>
   <form method='get' action='complex-search'>
+  <div>
     <input type='hidden' name='target' value="one">
     <input type='hidden' name='only_authorized_p' value="0">
-    <li>Complex search:
+    Complex search:
     <table cellspacing=1 border=0>
-
-      <tr bgcolor='#ffffff'>
+      <tr>
         <td align='right'>Group:</td>
         <td>
           <select name='limit_to_users_in_group_id'>
-            <option></option>
-            @groups@
+            @groups;noquote@
+	  </select>
         </td>
       </tr>
 
-      <tr bgcolor='#ffffff'>
+      <tr>
         <td align='right'>Registration date:</td>
         <td>
           <table border=0 cellpadding=2 cellspacing=0>
@@ -57,7 +55,7 @@
         </td>
       </tr>
 
-      <tr bgcolor='#ffffff'>
+      <tr>
         <td align='right'>Last login:</td>
         <td>
           <table border=0 cellpadding=2 cellspacing=0>
@@ -79,7 +77,7 @@
         </td>
       </tr>
 
-      <tr bgcolor='#ffffff'>
+      <tr>
         <td align='right'>Number of visits:</td>
         <td>
           <table border=0 cellpadding=2 cellspacing=0>
@@ -95,26 +93,26 @@
         </td>
       </tr>
 
-      <tr bgcolor='#ffffff'>
+      <tr>
         <td align='right'>Last name starts with:</td>
         <td> <input type='text' name='last_name_starts_with'> </td>
       </tr>
     
-      <tr bgcolor='#ffffff'>
+      <tr>
         <td align='right'>First names contain:</td>
         <td> <input type='text' name='first_names'> </td>
       </tr>
     
-      <tr bgcolor='#ffffff'>
+      <tr>
         <td align='right'>Email contains:</td>
         <td> <input type='text' name='email'> </td>
       </tr>
-      <tr bgcolor='#ffffff'>
+      <tr>
         <td align='right'>IP Address:</td>
         <td> <input type='text' name='ip'> </td>
       </tr>
 
-      <tr bgcolor='#ffffff'>
+      <tr>
         <td>&nbsp;</td>
         <td>
           Join the above criteria by
@@ -123,17 +121,13 @@
         </td>
       </tr>
 
-      <tr bgcolor='#ffffff'>
+      <tr>
         <td colspan=2 align='center'>
           <input type=submit name='Submit' value=Submit>
         </td>
       </tr>
     </table>
-
-  </FORM>
-
-
-  <p>
-
+  </div>
+  </form>
 </ul>
 
Index: openacs-4/packages/acs-admin/www/users/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/users/search.adp	27 Oct 2014 16:38:58 -0000	1.7
+++ openacs-4/packages/acs-admin/www/users/search.adp	15 Jun 2015 11:10:10 -0000	1.8
@@ -14,21 +14,21 @@
 
 <if @only_authorized_p@ false>
   <p>
-    <b>Show</b> | <a href="search?@export_authorize@&only_authorized_p=1">Hide</a> unapproved users.
+    <b>Show</b> | <a href="search?@export_authorize@&amp;only_authorized_p=1">Hide</a> unapproved users.
   </p>
 </if>
 <else>
   <p>
-    <a href="search?@export_authorize@&only_authorized_p=0">Show</a> | <b>Hide</b> unapproved users.
+    <a href="search?@export_authorize@&amp;only_authorized_p=0">Show</a> | <b>Hide</b> unapproved users.
   </p>
 </else>
 
 <ul>
 
 <multiple name="user_search">
-  <li><a href="@target@?user_id=@user_search.user_id@&@user_search.export_vars@&@passthrough_parameters@">@user_search.first_names@ @user_search.last_name@ (@user_search.email@)</a>
+  <li><a href="@target@?user_id=@user_search.user_id@&amp;@user_search.export_vars@&amp;@passthrough_parameters@">@user_search.first_names@ @user_search.last_name@ (@user_search.email@)</a>
   <if @user_search.member_state@ ne "approved">
-     <font color=red>@user_search.member_state@</font> @user_search.user_finite_state_links;noquote@
+     <span style="color:red">@user_search.member_state@</span> @user_search.user_finite_state_links;noquote@
   </if></li>
 </multiple>
 
Index: openacs-4/packages/acs-admin/www/users/user-batch-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-batch-add.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-admin/www/users/user-batch-add.adp	27 Oct 2014 16:38:58 -0000	1.9
+++ openacs-4/packages/acs-admin/www/users/user-batch-add.adp	15 Jun 2015 11:10:10 -0000	1.10
@@ -3,15 +3,17 @@
 <property name="context">@context;noquote@</property>
 
 <form method="post" action="user-batch-add-2">
-<p>Add these users to @system_name@, one user per line.</p>
-<br><textarea name=userlist rows=15 cols=50>
+<p>Add these users to @system_name@, one user per line.
+<div>
+<textarea name=userlist rows="15" cols="50">
 email, first name, last name
 </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>
+<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@
Index: openacs-4/packages/acs-admin/www/users/user-batch-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-batch-add.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/users/user-batch-add.tcl	27 Oct 2014 16:38:58 -0000	1.5
+++ openacs-4/packages/acs-admin/www/users/user-batch-add.tcl	15 Jun 2015 11:10:10 -0000	1.6
@@ -10,10 +10,8 @@
 }
 
 set admin_user_id [ad_conn user_id]
-set admin_email [db_string unused "select email from 
-parties where party_id = :admin_user_id"]
-set administration_name [db_string admin_name "select
-first_names || ' ' || last_name from persons where person_id = :admin_user_id"]
+set admin_email [db_string unused "select email from parties where party_id = :admin_user_id"]
+set administration_name [db_string admin_name "select first_names || ' ' || last_name from persons where person_id = :admin_user_id"]
 
 set context [list [list "./" "Users"] "Notify added user"]
 set system_name [ad_system_name]
Index: openacs-4/packages/acs-lang/www/admin/locale-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-new.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-lang/www/admin/locale-new.tcl	27 Oct 2014 16:39:39 -0000	1.6
+++ openacs-4/packages/acs-lang/www/admin/locale-new.tcl	15 Jun 2015 11:11:01 -0000	1.7
@@ -23,8 +23,11 @@
 # information on this view can be found in the docs at http://tahiti.oracle.com/
 # look for the PDF file of Oracle 8i "national language support guide"
 
+### GN: this is apparently Oracle-only
 catch {
-    set nls_values_list [db_list_of_lists select_nls_values {select parameter, value from v$nls_valid_values order by parameter, value}]
+    set nls_values_list [db_list_of_lists select_nls_values {
+	select parameter, value from v$nls_valid_values order by parameter, value
+    }]
 
     foreach nls_value $nls_values_list {
         set value [lindex $nls_value 1]
Index: openacs-4/packages/acs-lang/www/admin/message-conflicts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflicts.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/www/admin/message-conflicts.adp	27 Oct 2014 16:39:39 -0000	1.4
+++ openacs-4/packages/acs-lang/www/admin/message-conflicts.adp	15 Jun 2015 11:11:01 -0000	1.5
@@ -11,7 +11,7 @@
 
   <tr>
 
-    <td class="list-filter-pane" valign="top" width="200">
+    <td style="width:200px" class="list-filter-pane" valign="top">
 
       <listfilters name="messages"></listfilters>
 
Index: openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl	27 Oct 2014 16:39:39 -0000	1.5
+++ openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl	15 Jun 2015 11:11:01 -0000	1.6
@@ -29,7 +29,7 @@
         edit {
             label ""
             display_template {
-                <img src="/shared/images/Edit16.gif" border="0" width="16" height="16">
+                <img src="/shared/images/Edit16.gif" alt="edit" width="16" height="16">
             }
             link_url_col edit_url
         }
Index: openacs-4/packages/acs-lang/www/admin/package-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-lang/www/admin/package-list.adp	27 Oct 2014 16:39:39 -0000	1.10
+++ openacs-4/packages/acs-lang/www/admin/package-list.adp	15 Jun 2015 11:11:01 -0000	1.11
@@ -3,7 +3,7 @@
  <property name="context">@context;noquote@</property>
 
 <formtemplate id="search">
-Search <formwidget id="search_locale"> for <formwidget id="q"> <input type="submit" value="Search">
+<p>Search <formwidget id="search_locale"> for <formwidget id="q"> <input type="submit" value="Search">
 </formtemplate>
 
 <include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale@" />
@@ -30,7 +30,7 @@
         <multiple name="packages">
           <tr style="background: #EEEEEE">
             <td>
-              <a href="@packages.batch_edit_url@" title="Batch edit all messages in this @packages.package_key@"><img src="/shared/images/Edit16.gif" border="0" width="16" height="16"></a>
+              <a href="@packages.batch_edit_url@" title="Batch edit all messages in this @packages.package_key@"><img src="/shared/images/Edit16.gif" alt="edit" width="16" height="16"></a>
             </td>
             <td>
               <a href="@packages.view_messages_url@" title="View all messages in package">@packages.package_key@</a>
Index: openacs-4/packages/acs-lang/www/admin/set-system-timezone.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/set-system-timezone.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-lang/www/admin/set-system-timezone.adp	27 Oct 2014 16:39:40 -0000	1.6
+++ openacs-4/packages/acs-lang/www/admin/set-system-timezone.adp	15 Jun 2015 11:11:02 -0000	1.7
@@ -34,7 +34,7 @@
     </td>
   </tr>
 
-  <tr bgcolor="yellow">
+  <tr style="background: yellow">
     <td>
       UTC time returned from time server  <a
         href="http://www.timeanddate.com/worldclock/">timeanddate.com</a>:
@@ -44,7 +44,7 @@
     </td>
   </tr>
 
-  <tr bgcolor="yellow">
+  <tr style="background: yellow">
     <td>
       UTC time according to database and the OpenACS timezone setting above:
     </td>
@@ -54,7 +54,7 @@
   </tr>
 
   <if @utc_ansi@ not nil>
-    <tr bgcolor="yellow">
+    <tr style="background: yellow">
       <td>
         Actual UTC time according to <a
         href="http://www.timeanddate.com/worldclock/">timeanddate.com</a>:
@@ -66,21 +66,21 @@
   </if>
 
   <if @correct_p@ not nil>
-    <tr bgcolor=<if @correct_p@ true>"#00bb00"</if><else>"red"</else>>
+    <tr style=<if @correct_p@ true>"background: #00bb00"</if><else>"background: red"</else>>
       <td>
-        <font color="white">
+        <span style="color: white">
           Does it look like the OpenACS timezone setting above is correct:
-        </font>
+        </span>
       </td>
       <td>
-        <font color="white">
+        <span style="color: white">
           <if @correct_p@ true>
             <b>YES!</b> (Congratulations)
           </if>
           <else>
             <b>NO</b>. Set below.
           </else>
-        </font>
+        </span>
       </td>
     </tr>
   </if>