Index: openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl	19 Jul 2006 10:07:39 -0000	1.7
+++ openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl	22 Mar 2007 18:01:07 -0000	1.7.2.1
@@ -64,7 +64,7 @@
     }
     switch $priv_level {
         "4" {
-            return "<a href=mailto:$email title=\"Send email to this user\">$email</a>"
+            return "<a href="mailto:$email" title=\"#acs-subsite.Send_email_to_this_user#\">$email</a>"
         }
         "3" {
             set email_image_id [email_image::get_related_item_id -user_id $user_id]
Index: openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.adp,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.adp	3 Mar 2007 19:17:31 -0000	1.7.2.1
+++ openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.adp	22 Mar 2007 18:01:08 -0000	1.7.2.2
@@ -22,7 +22,7 @@
 <ul>
 <li> <a href="@url@cal-item-new?calendar_id=@calendar_id@" title="#calendar-portlet.Create_a_new_Event#">#calendar-portlet.Create_a_new_Event#</a></li>
 <li> <a href="@url@calendar-item-types?calendar_id=@calendar_id@" title="#calendar-portlet.lt_Manage_Calendar_Event#">#calendar-portlet.lt_Manage_Calendar_Event#</a></li>
-<li> <form name="PeriodDays">
+<li> <form name="PeriodDays" action="">
      <p>
      #calendar-portlet.Parameter_Period_Days#
      <input name="period_days" type="text" size="3" maxlength="3" id="period_days" value="@period_days@">
Index: openacs-4/packages/dotlrn-homework/www/folder-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-chunk.adp,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/dotlrn-homework/www/folder-chunk.adp	15 Dec 2006 22:45:27 -0000	1.6
+++ openacs-4/packages/dotlrn-homework/www/folder-chunk.adp	22 Mar 2007 18:01:08 -0000	1.6.2.1
@@ -50,7 +50,7 @@
           <tr class="z_light">
         </else>
       <if @folders.content_type@ eq "content_folder">
-          <td align="left">@folders.spaces;noquote@<img border="0" src="@file_storage_url@/graphics/folder.gif"></td>
+          <td align="left">@folders.spaces;noquote@<img border="0" src="@file_storage_url@/graphics/folder.gif" alt="#file-storage.Folder#"></td>
           <td colspan="3"><a href="@folders.contents_url@">@folders.name@</a></td>
       </if>
       <else>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp,v
diff -u -r1.35.2.1 -r1.35.2.2
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	3 Mar 2007 17:22:08 -0000	1.35.2.1
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	22 Mar 2007 18:01:08 -0000	1.35.2.2
@@ -85,13 +85,13 @@
   <if @club_p@ eq 0>
     <if @create_limited_user_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
       <li>
-        <a href="user-add?type=student&can_browse_p=0&read_private_data_p=t" title="#dotlrn-protlet.lt_Create_a_new_Limited_#">#dotlrn-portlet.lt_Create_a_new_Limited_#</a> - #dotlrn-portlet.lt_Only_use_this_to_crea# </li>
+        <a href="@limited_user_add_url@" title="#dotlrn-protlet.lt_Create_a_new_Limited_#">#dotlrn-portlet.lt_Create_a_new_Limited_#</a> - #dotlrn-portlet.lt_Only_use_this_to_crea# </li>
       </if>
    </if>
 
 
    <if @create_guest_user_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
-      <li><a href="user-add?type=student&can_browse_p=0&read_private_data_p=f" title="#dotlrn-portlet.lt_Create_a_new_Limited__1#">#dotlrn-portlet.lt_Create_a_new_Limited__1#</a>
+      <li><a href="@club_limited_user_add_url@" title="#dotlrn-portlet.lt_Create_a_new_Limited__1#">#dotlrn-portlet.lt_Create_a_new_Limited__1#</a>
         - #dotlrn-portlet.lt_Only_use_this_to_crea_1#
      </li>
    </if>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl,v
diff -u -r1.17 -r1.17.2.1
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl	8 Aug 2006 21:26:37 -0000	1.17
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl	22 Mar 2007 18:01:08 -0000	1.17.2.1
@@ -96,3 +96,6 @@
 }
 
 set referer [ns_conn url]
+
+set limited_user_add_url [export_vars -base user-add {{type student} {can_browse_p 0} {read_private_data_p t}}]
+set club_limited_user_add_url [export_vars -base user-add {{type student} {can_browse_p 0} {read_private_data_p f}}]
Index: openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp	15 Dec 2006 22:45:32 -0000	1.8
+++ openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp	22 Mar 2007 18:01:08 -0000	1.8.2.1
@@ -19,6 +19,7 @@
 %>
 
 
+<if @faqs:rowcount@ gt 0>
 <ul>
 <multiple name="faqs">
   <li>
@@ -32,6 +33,8 @@
   </li>
 </multiple>
 </ul>
+</if>
+
 <ul>
   <li><a href="@url@admin/faq-new" title="#faq-portlet.create_new_faq#">#faq-portlet.new_faq#</a></li>
 </ul>
Index: openacs-4/packages/static-portlet/www/static-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/static-admin-portlet.adp,v
diff -u -r1.16 -r1.16.2.1
--- openacs-4/packages/static-portlet/www/static-admin-portlet.adp	15 Dec 2006 22:45:43 -0000	1.16
+++ openacs-4/packages/static-portlet/www/static-admin-portlet.adp	22 Mar 2007 18:01:08 -0000	1.16.2.1
@@ -25,13 +25,13 @@
 <ul>
 <multiple name="content">
   <li>
-    <a href="@applet_url@/element?portal_id=@template_portal_id@&content_id=@content.content_id@&referer=@referer@" title="#static-portlet.edit_content_pretty_name#">@content.pretty_name@</a>
+    <a href="@content.edit_url@" title="#static-portlet.edit_content_pretty_name#">@content.pretty_name@</a>
   </li>
 </multiple>
 </ul>
 <ul>
   <li>
-    <a href="@applet_url@/element?package_id=@package_id@&portal_id=@template_portal_id@&referer=@referer@" title="#static-portlet.create_new_element_pretty_name#">#static-portlet.new_static_admin_portlet#</a>
+    <a href="@create_url@" title="#static-portlet.create_new_element_pretty_name#">#static-portlet.new_static_admin_portlet#</a>
   </li>
 </ul>
 </else>
Index: openacs-4/packages/static-portlet/www/static-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/static-admin-portlet.tcl,v
diff -u -r1.19 -r1.19.6.1
--- openacs-4/packages/static-portlet/www/static-admin-portlet.tcl	20 Apr 2004 21:13:56 -0000	1.19
+++ openacs-4/packages/static-portlet/www/static-admin-portlet.tcl	22 Mar 2007 18:01:08 -0000	1.19.6.1
@@ -52,16 +52,20 @@
                                  -parameter static_admin_portlet_element_pretty_name \
                                  -default [_ static-portlet.admin_portlet_element_pretty_name]]
 
-    db_multirow content select_content {
+    set applet_url "[dotlrn_applet::get_url]/[static_portlet::my_package_key]"
+
+    set create_url [export_vars -base $applet_url/element {{portal_id $template_portal_id} package_id referer}]
+
+    db_multirow -extend edit_url content select_content {
         select content_id,
                pretty_name
         from static_portal_content
         where package_id = :package_id
     } {
         set class_instances_pretty_name [_ dotlrn.class_instances_pretty_name]
         set pretty_name [lang::util::localize $pretty_name]
+
+        set edit_url [export_vars -base $applet_url/element {{portal_id $template_portal_id} {content_id $content_id} referer}]
     }
 
-    set applet_url "[dotlrn_applet::get_url]/[static_portlet::my_package_key]"
-
 }
Index: openacs-4/packages/survey-portlet/www/survey-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey-portlet/www/survey-admin-portlet.adp,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/survey-portlet/www/survey-admin-portlet.adp	15 Dec 2006 22:45:44 -0000	1.2
+++ openacs-4/packages/survey-portlet/www/survey-admin-portlet.adp	22 Mar 2007 18:01:08 -0000	1.2.2.1
@@ -18,6 +18,7 @@
 
 %>
 
+<if @surveys:rowcount@ gt 0>
 <ul>
 <multiple name="surveys">
   <li>
@@ -26,6 +27,8 @@
   </li>
 </multiple>
 </ul>
+</if>
+
 <ul>
   <li>
     <a href="@url@admin/survey-create" title="#survey.New_Survey#">#survey.New_Survey#</a>