Index: openacs-4/packages/project-manager/lib/assignee-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/assignee-portlet.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/project-manager/lib/assignee-portlet.adp	4 Aug 2005 17:07:07 -0000	1.5
+++ openacs-4/packages/project-manager/lib/assignee-portlet.adp	22 Aug 2005 11:37:10 -0000	1.6
@@ -1,5 +1,6 @@
 <master src="/packages/project-manager/lib/portlet" />
 <property name="portlet_title">#project-manager.Assignees#</property>
+<!-- Assignee Portlet Start -->
 <table width="100%">
 <tr>
   <td colspan="2" class="fill-list-middle">
@@ -28,3 +29,4 @@
   </td>
 </tr>
 </table>
+<!-- Assignee Portlet Ends -->
Index: openacs-4/packages/project-manager/lib/forums-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/forums-portlet.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/project-manager/lib/forums-portlet.adp	28 Jul 2005 10:57:56 -0000	1.3
+++ openacs-4/packages/project-manager/lib/forums-portlet.adp	22 Aug 2005 11:37:10 -0000	1.4
@@ -1,10 +1,11 @@
 <master src="/packages/project-manager/lib/portlet" />
 <property name="portlet_title">#forums.Forums#</property>
+<!-- Forums Portlet Start -->
 <table width="100%">
 <tr>
   <td colspan="2" class="fill-list-middle">
     <include src="/packages/forums/lib/message/threads-chunk" forum_id="@forum_id@" moderate_p="@permissions.moderate_p@" admin_p="@permissions.admin_p@" orderby="last_child_post,desc" base_url="@base_url@">
   </td>
 </tr>
 </table>
-  
\ No newline at end of file
+  <!-- Forums Portlet Stop -->
Index: openacs-4/packages/project-manager/lib/fs-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/fs-portlet.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/project-manager/lib/fs-portlet.adp	28 Jul 2005 10:57:56 -0000	1.5
+++ openacs-4/packages/project-manager/lib/fs-portlet.adp	22 Aug 2005 11:37:10 -0000	1.6
@@ -1,10 +1,11 @@
 <master src="/packages/project-manager/lib/portlet" />
 <property name="portlet_title">#file-storage.Folder#</property>
+<!-- FS Portlet Start -->
 <table width="100%">
 <tr>
   <td colspan="2" class="fill-list-middle">
 <include src="/packages/file-storage/www/folder-chunk" folder_id="@folder_id@" allow_bulk_actions="1" fs_url="@base_url@">
   </td>
 </tr>
 </table>
-  
+ <!-- FS Portlet Stop -->
Index: openacs-4/packages/project-manager/lib/logger-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/logger-portlet.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/project-manager/lib/logger-portlet.adp	28 Jul 2005 10:57:56 -0000	1.3
+++ openacs-4/packages/project-manager/lib/logger-portlet.adp	22 Aug 2005 11:37:10 -0000	1.4
@@ -1,5 +1,6 @@
 <master src="@master;noquote@" />
 <property name="portlet_title">#project-manager.Logger#</property>
+<!-- Logger Portlet Start -->
 <table width="100%">
 <tr class="list-button-bar">
   <td class="fill-list-middle" valign="top" colspan="2">
@@ -28,4 +29,5 @@
       return_url="@return_url;noquote@" />
   </td>
 </tr>
-</table>
\ No newline at end of file
+</table>
+<!-- Logger Portlet Stops -->
Index: openacs-4/packages/project-manager/lib/portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/portlet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/lib/portlet.adp	28 Jul 2005 06:39:22 -0000	1.2
+++ openacs-4/packages/project-manager/lib/portlet.adp	22 Aug 2005 11:37:10 -0000	1.3
@@ -1,14 +1,19 @@
+
+<!-- Wrapper Portlet Starts -->
 <table class="list" cellpadding="0" cellspacing="0" width="100%" border="0">
   <tr>
     <th align="left" valign="top" width="10" class="project">
       <img src="resources/tl-9999cc" align="top" />
     </th>
-    <th class="project">@portlet_title;noquote@</th>
+    <th class="project" align="left">@portlet_title;noquote@</th>
     <th align="right" valign="top" width="10" class="project">
       <img src="resources/tr-9999cc" align="top" />
     </th>
   </tr>
   <tr>
+   <td>
   <slave>
+   </td>
  </tr>
 </table>
+<!-- Wrapper portlet stops -->
\ No newline at end of file
Index: openacs-4/packages/project-manager/lib/project-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/project-portlet.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/project-manager/lib/project-portlet.adp	15 Aug 2005 10:00:20 -0000	1.11
+++ openacs-4/packages/project-manager/lib/project-portlet.adp	22 Aug 2005 11:37:10 -0000	1.12
@@ -2,6 +2,7 @@
 <property name="portlet_title">
   @write_html;noquote@&nbsp;&nbsp;@project_term@ @project.project_name@
   </property>
+<!-- Project Portlet Start -->
 <table width="100%">
   <tr>
     <td bgcolor="#eeeeee" colspan="2" class="fill-list-bottom">
@@ -25,12 +26,6 @@
 	      <td class="fill-list-bg">@project.customer_id@</td>
             </else>
 	  </tr>
-       	<if @use_goal_p@ eq 1>
-	  <tr>
-	    <td class="highlight">#project-manager.Goal_1#</td>
-	    <td class="fill-list-bg">@project.goal@</td>
-	  </tr>
-	</if>
 	<tr>
 	  <td class="highlight" valign="top">#project-manager.Status#</td>
 	  <td class="fill-list-bg">
@@ -53,33 +48,6 @@
 	  </tr>
 	</multiple>
 	<tr>
-	  <th colspan="2" align="center">Dates</th>
-	</tr>
-	<tr>
-	  <td class="highlight">#project-manager.Start#</td>
-	  <td class="fill-list-bg">@project.planned_start_date@</td>
-	</tr>
-	<tr>
-	  <td class="highlight">#project-manager.Earliest_finish#</td>
-	  <if @project.ongoing_p@ eq f>
-	    <td class="fill-list-bg">@project.earliest_finish_date@</td>
-	  </if>
-	  <else>
-	    <td class="fill-list-bg">#project-manager.Ongoing#</td>
-	  </else>
-	</tr>
-	<tr>
-	  <td class="highlight">#project-manager.Latest_finish#</td>
-	  <if @project.ongoing_p@ eq f>
-	    <td class="fill-list-bg">
-	      <b>@project.latest_finish_date@</b>
-	    </td>
-	  </if>
-	  <else>
-	    <td class="fill-list-bg">#project-manager.Ongoing#</td>
-	  </else>
-	</tr>
-	<tr>
 	  <td class="highlight">#project-manager.Deadline#</td>
 	  <if @project.ongoing_p@ eq f>
 	    <td class="fill-list-bg">
@@ -117,4 +85,5 @@
       </ul>
     </td>
   </tr>
-</table>
\ No newline at end of file
+</table>
+<!-- Project Portlet Ends -->
\ No newline at end of file
Index: openacs-4/packages/project-manager/lib/subprojects.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/subprojects.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/project-manager/lib/subprojects.adp	28 Jul 2005 10:57:56 -0000	1.3
+++ openacs-4/packages/project-manager/lib/subprojects.adp	22 Aug 2005 11:37:10 -0000	1.4
@@ -1,5 +1,6 @@
 <master src="/packages/project-manager/lib/portlet" />
 <property name="portlet_title">#project-manager.Subprojects#</property>
+<!-- Subproject Portlet Start -->
 <table width="100%">
 <tr>
   <td colspan="2" class="fill-list-middle">
@@ -17,4 +18,5 @@
     </ul>
   </td>
 </tr>
-</table>
\ No newline at end of file
+</table>
+<!-- Subproject Portlet Ends -->
Index: openacs-4/packages/project-manager/lib/tasks-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks-portlet.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/lib/tasks-portlet.adp	30 Jul 2005 00:26:33 -0000	1.4
+++ openacs-4/packages/project-manager/lib/tasks-portlet.adp	22 Aug 2005 11:37:10 -0000	1.5
@@ -1,5 +1,6 @@
 <master src="/packages/project-manager/lib/portlet" />
 <property name="portlet_title">@task_term@</property>
+<!-- Tasks Portlet Start -->
 <table width="100%">
 <if @instance_html@ not nil>
   <tr>
@@ -42,4 +43,5 @@
     </ul>
   </td>
 </tr>
-</table>
\ No newline at end of file
+</table>
+<!-- Tasks Portlet Ends -->