Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -N -r1.83.2.1 -r1.83.2.2
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	20 May 2005 13:23:41 -0000	1.83.2.1
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	27 Jun 2005 15:28:05 -0000	1.83.2.2
@@ -823,7 +823,7 @@
 	set export_string [join $export_list "&"]
     } else {
 	for { set i 0 } { $i < $export_size } { incr i } {
-	    append export_string "<input type=\"hidden\" name=\"[ad_quotehtml [ns_set key $export_set $i]]\" value=\"[ad_quotehtml "[ns_set value $export_set $i]"]\" />\n"
+	    append export_string "<input type=\"hidden\" name=\"[ad_quotehtml [ns_set key $export_set $i]]\" value=\"[ad_quotehtml "[ns_set value $export_set $i]"]\">\n"
 	}
     }
 
Index: openacs-4/packages/acs-templating/www/resources/lists.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/lists.css,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-templating/www/resources/lists.css	13 May 2005 18:47:14 -0000	1.6
+++ openacs-4/packages/acs-templating/www/resources/lists.css	27 Jun 2005 15:28:06 -0000	1.6.2.1
@@ -137,6 +137,6 @@
 
 td.list-list-pane {
   background-color: white;
-  valign: center;
+  vertical-align: middle;
   padding-left: 10px;
 }
Index: openacs-4/packages/general-comments/tcl/general-comments-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/tcl/general-comments-procs.tcl,v
diff -u -N -r1.18 -r1.18.2.1
--- openacs-4/packages/general-comments/tcl/general-comments-procs.tcl	9 Mar 2005 17:07:09 -0000	1.18
+++ openacs-4/packages/general-comments/tcl/general-comments-procs.tcl	27 Jun 2005 15:28:06 -0000	1.18.2.1
@@ -194,25 +194,25 @@
 
                 append attachments_html "<li>$title "
                 if { $mime_type == "image_gif" || $mime_type == "image/jpeg" } {
-                    append attachments_html "(<a href=\"${package_url}view-image?image_id=$item_id&return_url=$return_url\">$name</a>)\n"
+                    append attachments_html "(<a href=\"[ad_quotehtml ${package_url}view-image?image_id=$item_id&return_url=$return_url]\">$name</a>)\n"
                 } else {
-                    append attachments_html "(<a href=\"${package_url}file-download?item_id=$item_id\">$name</a>)\n"
+                    append attachments_html "(<a href=\"[ad_quotehtml ${package_url}file-download?item_id=$item_id]\">$name</a>)\n"
                 }
             }
 
             db_foreach get_links "
 	              select i.item_id, e.label, e.url
 	                from cr_items i, cr_extlinks e
 	               where i.parent_id = :comment_id and e.extlink_id = i.item_id" {
-                append attachments_html "<li><a href=\"$url\">$label</a>\n"
+                append attachments_html "<li><a href=\"[ad_quotehtml $url]\">$label</a>\n"
             }
             if { ![empty_string_p $attachments_html] } {
                 append html "<h5>[_ general-comments.Attachments]</h5>\n<ul>\n$attachments_html</ul>\n"
             }
         }
-        append html "<p>-- <a href=\"/shared/community-member?user_id=$creation_user\">$author</a> [_ general-comments.on] $pretty_date2 (<a href=\"${package_url}view-comment?[export_url_vars comment_id return_url]\">[_ general-comments.view_details]</a>)</p>\n"
+        append html "<p>-- <a href=\"[ad_quotehtml /shared/community-member?user_id=$creation_user]\">$author</a> [_ general-comments.on] $pretty_date2 (<a href=\"[ad_quotehtml ${package_url}view-comment?[export_url_vars comment_id return_url]]\">[_ general-comments.view_details]</a>)</p>\n"
     } else {
-        append html "<li><a href=\"${package_url}view-comment?[export_url_vars comment_id return_url]\">$title</a> [_ general-comments.by] <a href=\"/shared/community-member?user_id=$creation_user\">$author</a> [_ general-comments.on] $pretty_date<br>\n"
+        append html "<li><a href=\"[ad_quotehtml ${package_url}view-comment?[export_url_vars comment_id return_url]]\">$title</a> [_ general-comments.by] <a href=\"[ad_quotehtml /shared/community-member?user_id=$creation_user]\">$author</a> [_ general-comments.on] $pretty_date<br>\n"
     }
 
     return $html
@@ -250,7 +250,7 @@
     if { ![info exists object_name] } { set object_name [acs_object_name $object_id] }
     if { ![info exists context_id] } { set context_id $object_id }
 
-    set html "<a href=\"${package_url}comment-add?[export_url_vars object_id object_name return_url context_id category]\" $link_attributes>$link_text</a>"
+    set html "<a href=\"[ad_quotehtml ${package_url}comment-add?[export_url_vars object_id object_name return_url context_id category]]\" $link_attributes>$link_text</a>"
 
     return $html
 }
@@ -297,7 +297,7 @@
                     o.object_id = g.comment_id and
                     p.person_id = o.creation_user
               order by creation_date" {
-        append html "<li><a href=\"${package_url}view-comment?[export_url_vars comment_id return_url]\">$title</a> by $author, $creation_date<br>\n"
+        append html "<li><a href=\"[ad_quotehtml ${package_url}view-comment?[export_url_vars comment_id return_url]]\">$title</a> by $author, $creation_date<br>\n"
     }
     return "$html"
 }
@@ -315,7 +315,7 @@
     # get the package url
     set package_url [general_comments_package_url]
 
-    set html "<a href=\"${package_url}comment-add?[export_url_vars object_id object_name return_url context_id category]\">$link_text</a>"
+    set html "<a href=\"[ad_quotehtml ${package_url}comment-add?[export_url_vars object_id object_name return_url context_id category]]\">$link_text</a>"
     return $html
 }
 
Index: openacs-4/packages/ratings/tcl/rating-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ratings/tcl/rating-procs.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/ratings/tcl/rating-procs.tcl	14 Jun 2004 14:17:54 -0000	1.4
+++ openacs-4/packages/ratings/tcl/rating-procs.tcl	27 Jun 2005 15:28:06 -0000	1.4.2.1
@@ -130,7 +130,7 @@
         set return_url [ad_return_url]
     }
 
-    set out "<form style=\"display: inline\" action=\"/ratings/rate\">\n[export_vars -form {object_id dimension_key return_url}]<select name=\"rating\">\n"
+    set out "<form style=\"display: inline\" action=\"/ratings/rate\">\n<div>[export_vars -form {object_id dimension_key return_url}]<select name=\"rating\">\n"
     for {set i $dim(range_low)} {$i <= $dim(range_high) && $dim(range_high) != $dim(range_low)} {incr i [expr {2*($dim(range_high) - $dim(range_low) > 0)-1}]} {
         if {$rating eq $i} {
             append out "<option value=\"$i\" selected=\"selected\">"
@@ -147,9 +147,9 @@
         append out "</option>\n"
     }
     if {![empty_string_p $rating]} { 
-        append out "\n</select>\n<input type=\"submit\" value=\"Change\"></form>\n"
+        append out "\n</select>\n<input type=\"submit\" value=\"Change\"></div></form>\n"
     } else {
-        append out "\n</select>\n<input type=\"submit\" value=\"Rate\"></form>\n"
+        append out "\n</select>\n<input type=\"submit\" value=\"Rate\"></div></form>\n"
     }
 }
 
Index: openacs-4/www/blank-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.adp,v
diff -u -N -r1.18 -r1.18.2.1
--- openacs-4/www/blank-master.adp	18 Mar 2005 18:10:39 -0000	1.18
+++ openacs-4/www/blank-master.adp	27 Jun 2005 15:28:06 -0000	1.18.2.1
@@ -7,19 +7,19 @@
       <link rel="stylesheet" type="text/css" href="/resources/acs-developer-support/acs-developer-support.css" media="all">
     </if>
     <multiple name="header_links">
-      <link rel="@header_links.rel@" type="@header_links.type@" href="@header_links.href@" media="@header_links.media@" />
+      <link rel="@header_links.rel@" type="@header_links.type@" href="@header_links.href@" media="@header_links.media@">
     </multiple>
 
-    <if @acs_blank_master__htmlareas@ not nil><script language="JavaScript" type="text/javascript" src="/resources/acs-templating/rte/richtext.js"></script></if>
+    <if @acs_blank_master__htmlareas@ not nil><script type="text/javascript" src="/resources/acs-templating/rte/richtext.js"></script></if>
 
-    <script type="text/javascript" src="/resources/acs-subsite/core.js" language="javascript"></script>
+    <script type="text/javascript" src="/resources/acs-subsite/core.js"></script>
 
     @header_stuff;noquote@
   </head>
   <body<multiple name="attribute"> @attribute.key@="@attribute.value@"</multiple>>
-  <textarea id="holdtext" style="display: none;" rows="1" cols="1"></textarea>
+  <div><textarea id="holdtext" style="display: none;" rows="1" cols="1"></textarea></div>
   <if @acs_blank_master__htmlareas@ not nil>
-    <script language="JavaScript" type="text/javascript"><!--
+    <script type="text/javascript"><!--
       //Usage: initRTE(imagesPath, includesPath, cssFile)
       initRTE("/resources/acs-templating/rte/images/", "/resources/acs-templating/rte/", "/resources/acs-templating/rte/rte.css");
       // --></script></if>
Index: openacs-4/www/site-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.adp,v
diff -u -N -r1.23 -r1.23.2.1
--- openacs-4/www/site-master.adp	24 Feb 2005 13:33:31 -0000	1.23
+++ openacs-4/www/site-master.adp	27 Jun 2005 15:28:06 -0000	1.23.2.1
@@ -9,7 +9,7 @@
     <property name="focus">@focus;noquote@</property>
   </if>
   <property name="header_stuff">
-    <link rel="stylesheet" type="text/css" href="@css_url@" media="all" />
+    <link rel="stylesheet" type="text/css" href="@css_url@" media="all">
     @header_stuff;noquote@
   </property>
 
@@ -94,16 +94,18 @@
 
 <div id="site-footer">
   <div class="action-list">
-    <ul>
       <if @num_of_locales@ gt 1>
+    <ul>
         <li><a href="@change_locale_url@">#acs-subsite.Change_locale_label#</a></li>
+    </ul>
       </if>
       <else>
         <if @locale_admin_url@ not nil>
+    <ul>
           <li><a href="@locale_admin_url@">Install locales</a></li>
+    </ul>
         </if>
       </else>
-    </ul>
   </div>
 </div>