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.8 -r1.9
--- openacs-4/packages/project-manager/lib/project-portlet.adp	29 Jul 2005 23:27:57 -0000	1.8
+++ openacs-4/packages/project-manager/lib/project-portlet.adp	12 Aug 2005 06:02:54 -0000	1.9
@@ -1,21 +1,21 @@
   <master src="/packages/project-manager/lib/portlet" />
-  <property name="portlet_title">
-	<if @project.write_p@ eq t>
-	  <a href="@edit_url@">
-	    <img border="0" src="/shared/images/Edit16.gif"
-	      alt="#acs-kernel.common_Edit#" />
-	  </a>
-	</if>
-	<if @project.create_p@ eq t>
-	  <a href="@permissions_url@">
-	    <img border="0" src="resources/padlock.gif" alt="#project-manager.Set_permissions#" />
-	  </img>
-	  </a>
-	</if>
-	&nbsp;&nbsp;@project_term@ @project.project_name@
+<property name="portlet_title">
+  <if @project.write_p@ eq t>
+    <a href="@edit_url@">
+      <img border="0" src="/shared/images/Edit16.gif"
+	alt="#acs-kernel.common_Edit#" />
+    </a>
+  </if>
+  <if @project.create_p@ eq t>
+    <a href="@permissions_url@">
+      <img border="0" src="resources/padlock.gif" alt="#project-manager.Set_permissions#" />
+    </img>
+    </a>
+  </if>
+  &nbsp;&nbsp;@project_term@ @project.project_name@
   </property>
 <table width="100%">
-   <tr>
+  <tr>
     <td bgcolor="#eeeeee" colspan="2" class="fill-list-bottom">
       <table border="0" width="100%" bgcolor="#ffffff" cellspacing="0">
 	<tr>
@@ -55,16 +55,68 @@
 	    <td class="fill-list-bg">@dynamic_attributes.value@</td>
 	  </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">
+	      <b>@project.planned_end_date@</b>
+	    </td>
+	  </if>
+	  <else>
+	    <td class="fill-list-bg">#project-manager.Ongoing#</td>
+	  </else>
+	</tr>
+	<tr>
+	  <td class="highlight">#categories.Categories#</td>
+	  <td class="fill-list-bg">
+	    <ul>
+	      <multiple name="categories">
+		<li>@categories.tree_name@:
+		  <group column="tree_id" delimiter=", ">
+		    @categories.category_name@
+		  </group>
+		</li>
+	      </multiple>
+	    </ul>
+	  </td>
+	</tr>
       </table>
     </td>
   </tr>
   <tr>
     <td colspan="2" class="fill-list-bottom">
       <ul>
+	@project_links;noquote@
 	<li>
 	  <a href="project-revisions?project_item_id=@project_item_id@">#project-manager.View_project_changes#</a>
 	</li>
-	@project_links;noquote@
       </ul>
     </td>
   </tr>
Index: openacs-4/packages/project-manager/lib/project-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/project-portlet.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/project-manager/lib/project-portlet.tcl	30 Jul 2005 00:26:33 -0000	1.9
+++ openacs-4/packages/project-manager/lib/project-portlet.tcl	12 Aug 2005 06:02:54 -0000	1.10
@@ -30,6 +30,10 @@
 set project(description) [template::util::richtext::get_property html_value $richtext_list]
 set project_root [pm::util::get_root_folder]
 
+if {![exists_and_not_null fmt]} {
+    set fmt "%x"
+}
+
 set project(planned_start_date) [lc_time_fmt $project(planned_start_date) $fmt]
 set project(planned_end_date)   [lc_time_fmt $project(planned_end_date) $fmt]
 set project(estimated_finish_date) [lc_time_fmt $project(estimated_finish_date) $fmt]
@@ -58,5 +62,20 @@
     }
 }
 
+# categories
+
+set cat_trees [list]
+set cat_list [category::get_mapped_categories $project_id]
+foreach cat $cat_list {
+    set tree_id [category::get_tree $cat]
+    lappend cat_trees [list [category_tree::get_name $tree_id] [category::get_name $cat] $tree_id]
+}
+
+multirow create categories tree_id tree_name category_name
+foreach cat [lsort -dictionary -index 0 $cat_trees] {
+    util_unlist $cat tree_name cat_name tree_id
+    multirow append categories $tree_id $tree_name $cat_name
+}
+
 set project_links ""
 callback pm::project_links -project_id $project_item_id