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.7 -r1.7.2.1
--- openacs-4/packages/dotlrn-homework/www/folder-chunk.adp	15 May 2007 20:14:30 -0000	1.7
+++ openacs-4/packages/dotlrn-homework/www/folder-chunk.adp	29 Mar 2008 19:57:40 -0000	1.7.2.1
@@ -48,11 +48,11 @@
           <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" alt="#file-storage.Folder#"></td>
+          <td align="left">@folders.spaces;noquote@<img style="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>
-          <td align="left">@folders.spaces;noquote@<a href="@folders.download_url@"><img border="0" src="@file_storage_url@/graphics/file.gif"></a></td>
+          <td align="left">@folders.spaces;noquote@<a href="@folders.download_url@"><img style="border:0" src="@file_storage_url@/graphics/file.gif"></a></td>
           <td><a href="@folders.download_url@">@folders.name@</a><br><if @folders.name@ ne @folders.title@><span style="color: \#999;">@folders.title@</span></if></td>
           <td>
             <if @show_users_p@ true>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl,v
diff -u -r1.14 -r1.14.2.1
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl	15 May 2007 20:14:31 -0000	1.14
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl	29 Mar 2008 19:57:40 -0000	1.14.2.1
@@ -56,7 +56,7 @@
         bio {
             display_template {
       <if @users.portrait_p@ true or @users.bio_p@ true>
-        <a href="@users.community_member_url@"  title="#acs-subsite.lt_User_has_portrait_title#"><img src="/resources/acs-subsite/profile-16.png" height="16" width="16" alt="#acs-subsite.Profile#" title="#acs-subsite.lt_User_has_portrait_title#" border="0"></a>
+        <a href="@users.community_member_url@"  title="#acs-subsite.lt_User_has_portrait_title#"><img src="/resources/acs-subsite/profile-16.png" height="16" width="16" alt="#acs-subsite.Profile#" title="#acs-subsite.lt_User_has_portrait_title#" style="border:0"></a>
       </if>
             }
             label {}
Index: openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.en_US.ISO-8859-1.xml,v
diff -u -r1.15 -r1.15.2.1
--- openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.en_US.ISO-8859-1.xml	10 Dec 2007 09:12:32 -0000	1.15
+++ openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.en_US.ISO-8859-1.xml	29 Mar 2008 19:57:40 -0000	1.15.2.1
@@ -6,8 +6,10 @@
   <msg key="Edit">Edit</msg>
   <msg key="Go_to">Go to</msg>
   <msg key="Go_to_the_Syllabus">Go to the Syllabus</msg>
+  <msg key="Link_to_a_syllabus">Add a link to a syllabus</msg>
   <msg key="lt_a_hrefupload_urlUploa">&lt;a href=&quot;%upload_url%&quot;&gt;Upload&lt;/a&gt; or &lt;a href=&quot;%link_to_url%&quot;&gt;link&lt;/a&gt; to a Syllabus</msg>
   <msg key="No_Syllabus_Found">No Syllabus Found</msg>
   <msg key="or">or</msg>
   <msg key="pretty_name">Syllabus</msg>
+  <msg key="Upload_new_syllabus">Upload a new syllabus</msg>
 </message_catalog>
Index: openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.adp,v
diff -u -r1.6 -r1.6.4.1
--- openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.adp	15 Dec 2006 22:45:29 -0000	1.6
+++ openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.adp	29 Mar 2008 19:57:40 -0000	1.6.4.1
@@ -18,24 +18,30 @@
 
 %>
 
-<ul>
-  
   <if @community_id@ eq "">
     <small>No community specified</small>
   </if>
   <else>
     <if @syllabus_id@ not eq "">
+      <ul>
       <if @type@ eq url>
         <li><a href="file-storage/url-goto?url_id=@syllabus_id@" title="#dotlrn-syllabus.Go_to# #dotlrn-syllabus.pretty_name#">#dotlrn-syllabus.Go_to#</a> #dotlrn-syllabus.or#
         <a href="file-storage/simple-edit?object_id=@syllabus_id@" title="#dotlrn-syllabus.Edit# #dotlrn-syllabus.pretty_name#">#dotlrn-syllabus.Edit#</a> #dotlrn-syllabus.pretty_name#
-	</li>
+	    </li>
       </if>
       <else>
         <li><a href="file-storage/file?file_id=@syllabus_id@" title="#dotlrn-syllabus.Go_to_the_Syllabus#">#dotlrn-syllabus.Go_to_the_Syllabus#</a></li>
       </else>
+      </ul>
     </if>
     <else>
-    <li>#dotlrn-syllabus.lt_a_hrefupload_urlUploa#</li>
+      <ul>
+        <li>
+          <a href="@upload_url@" title="#dotlrn-syllabus.Upload_new_syllabus#">#dotlrn-syllabus.Upload_new_syllabus#</a>
+        </li>
+        <li>
+          <a href="@link_to_url@" title="#dotlrn-syllabus.Link_to_a_syllabus#">#dotlrn-syllabus.Link_to_a_syllabus#</a>
+        </li>
+      </ul>
     </else>
   </else>
-</ul>
Index: openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.tcl,v
diff -u -r1.4 -r1.4.14.1
--- openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.tcl	29 May 2003 18:05:05 -0000	1.4
+++ openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.tcl	29 Mar 2008 19:57:40 -0000	1.4.14.1
@@ -36,8 +36,8 @@
 set community_id [dotlrn_community::get_community_id]
 
 set title [_ dotlrn-syllabus.pretty_name]
-set upload_url "file-storage/file-add?folder_id=$public_folder_id&lock_title_p=1&title=[ad_urlencode $title]"
-set link_to_url "file-storage/simple-add?folder_id=$public_folder_id&lock_title_p=1&title=[ad_urlencode $title]"
+set upload_url [export_vars -base "file-storage/file-add" {{folder_id $public_folder_id} {lock_title_p 1} {title $title}}]
+set link_to_url [export_vars -base "file-storage/simple-add" {{folder_id $public_folder_id} {lock_title_p 1} {title $title}}]
 # DRB: community_id will be blank if we're called by the portal package portal preview
 # code for the generic class portlet template.
 
Index: openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp,v
diff -u -r1.6 -r1.6.4.1
--- openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp	15 Dec 2006 22:45:31 -0000	1.6
+++ openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp	29 Mar 2008 19:57:41 -0000	1.6.4.1
@@ -8,9 +8,9 @@
       <li>#evaluation-portlet.lt_There_are_no_tasks_fo#</li>
     </if><else>
        <multiple name="grades">
-	 <li><strong>@grades.grade_plural_name@</strong> <br />
+	 <li><strong>@grades.grade_plural_name@</strong> <br>
 	 <include src="../lib/tasks-chunk" grade_id=@grades.grade_id@ grade_item_id=@grades.grade_item_id@ assignments_orderby=@assignments_orderby@ page_num=@page_num@>
-         <br /><br />
+         <br><br>
 	 </li>
        </multiple>
     </else>
Index: openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp	15 May 2007 20:14:34 -0000	1.8
+++ openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp	29 Mar 2008 19:57:41 -0000	1.8.2.1
@@ -33,7 +33,7 @@
         <li><strong>@grades.grade_plural_name;noquote@</strong>
        </if> 
        <include src="../lib/evaluations-chunk" grade_id=@grades.grade_id@ grade_item_id=@grades.grade_item_id@ evaluations_orderby=@evaluations_orderby@ page_num=@page_num@>
-       <br/><br/>
+       <br><br>
        <if @simple_p@ eq 0></li></if> 
       </multiple>
      </ul>
Index: openacs-4/packages/file-storage/www/folder-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.adp,v
diff -u -r1.29 -r1.29.2.1
--- openacs-4/packages/file-storage/www/folder-chunk.adp	11 Jan 2008 17:07:15 -0000	1.29
+++ openacs-4/packages/file-storage/www/folder-chunk.adp	29 Mar 2008 19:57:41 -0000	1.29.2.1
@@ -1,6 +1,6 @@
 <if @categories_p@><if @category_links@><p>#file-storage.Categories#: @category_links;noquote@</p></if></if>
 
-<listtemplate name="contents"></listtemplate>
+<listtemplate name="contents_@folder_id@"></listtemplate>
 
   <if @content_size_total@ gt 0>
     <p>
Index: openacs-4/packages/file-storage/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v
diff -u -r1.43 -r1.43.2.1
--- openacs-4/packages/file-storage/www/folder-chunk.tcl	11 Jan 2008 17:07:15 -0000	1.43
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl	29 Mar 2008 19:57:41 -0000	1.43.2.1
@@ -180,7 +180,7 @@
 } 
 
 template::list::create \
-    -name contents \
+    -name contents_${folder_id} \
     -multirow contents \
     -key object_id \
     -actions $actions \
@@ -207,7 +207,7 @@
     } \
     -elements $elements
 
-set orderby [template::list::orderby_clause -orderby -name contents]
+set orderby [template::list::orderby_clause -orderby -name contents_${folder_id}]
 
 if {[string equal $orderby ""]} {
     set orderby " order by fs_objects.sort_key, fs_objects.name asc"
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.186.2.1 -r1.186.2.2
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	29 Mar 2008 18:26:38 -0000	1.186.2.1
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	29 Mar 2008 19:57:41 -0000	1.186.2.2
@@ -425,15 +425,15 @@
         set name [ns_set get $theme name]
         set description [ns_set get $theme description]
 
-        append theme_chunk "<label><input type=radio name=theme_id value=$theme_id"
+        append theme_chunk "<div><label><input type=radio name=theme_id value=$theme_id"
         set one_theme_chunk "&nbsp;$name - $description"
 
         if {$current_theme_id == $theme_id } {
             append theme_chunk " checked><b>$one_theme_chunk</b>"
         } else {
             append theme_chunk ">$one_theme_chunk"
         }
-        append theme_chunk "</label><br>\n"
+        append theme_chunk "</label></div>"
     }
 
     append theme_chunk "<div><input type=submit name=\"op_change_theme\" value=\"[_ new-portal.Change_Theme_1]\"></div></form>"
Index: openacs-4/packages/photo-album/www/album-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-chunk.adp,v
diff -u -r1.2 -r1.2.12.1
--- openacs-4/packages/photo-album/www/album-chunk.adp	18 Nov 2003 18:27:52 -0000	1.2
+++ openacs-4/packages/photo-album/www/album-chunk.adp	29 Mar 2008 19:57:41 -0000	1.2.12.1
@@ -1,7 +1,7 @@
 <table border="1" cellpadding="2" cellspacing="2">
  <tr>
-  <td bgcolor="#cccccc">#photo-album.Name#</td>
-  <td bgcolor="#cccccc">#photo-album.Description#</td>
+  <td style="background-color:#cccccc">#photo-album.Name#</td>
+  <td style="background-color:#cccccc">#photo-album.Description#</td>
  </tr>
 
 <multiple name="child">
Index: openacs-4/packages/photo-album-portlet/www/photo-album-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album-portlet/www/photo-album-portlet.adp,v
diff -u -r1.2 -r1.2.8.1
--- openacs-4/packages/photo-album-portlet/www/photo-album-portlet.adp	24 Feb 2005 13:33:24 -0000	1.2
+++ openacs-4/packages/photo-album-portlet/www/photo-album-portlet.adp	29 Mar 2008 19:57:41 -0000	1.2.8.1
@@ -2,7 +2,7 @@
   <if @num_packages@ eq 1>
     <include src="/packages/photo-album/www/album-chunk" package_id="@cfa.package_id@">
 
-    <a href="photo-album/">#photo-album-portlet.Add_photos#</a>
+    <p><a href="photo-album/">#photo-album-portlet.Add_photos#</a></p>
   </if>
 </if>
 
Index: openacs-4/packages/random-photo-portlet/www/random-photo-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/random-photo-portlet/www/random-photo-portlet.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/random-photo-portlet/www/random-photo-portlet.adp	15 May 2007 20:14:53 -0000	1.4
+++ openacs-4/packages/random-photo-portlet/www/random-photo-portlet.adp	29 Mar 2008 19:57:41 -0000	1.4.2.1
@@ -11,14 +11,13 @@
 <li class="liClosed">
 Click to find out.
 <ul>
-<b>#random-photo-portlet.Name#</b> <a href="/dotlrn/community-member?user_id=@user_id@">@full_name@</a> <br>
+<li><b>#random-photo-portlet.Name#</b> <a href="/dotlrn/community-member?user_id=@user_id@">@full_name@</a></li>
 <if @random_user_bio@ ne "">
-<b>About:</b> @random_user_bio;noquote@<br>
+<li><b>About:</b> @random_user_bio;noquote@</li>
 </if>
 <if @random_user_groups@ ne "">
-<b>Groups:</b> @random_user_groups;noquote@<br>
+<li><b>Groups:</b> @random_user_groups;noquote@</li>
 </if>
-</li>
 </ul>
 </li>
 </ul>
@@ -41,4 +40,3 @@
 <if @user_p@ eq 0>
 #random-photo-portlet.lt_There_are_no_photos_t#
 </if> 
-