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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/project-manager/lib/forums-portlet.adp	26 May 2005 12:24:11 -0000	1.1
@@ -0,0 +1,10 @@
+<master src="/packages/project-manager/lib/portlet" />
+<property name="portlet_title">#forums.Forums#</property>
+<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>
+  <td class="fill-list-right2">&nbsp;</td>
+</tr>
+
+  
\ No newline at end of file
Index: openacs-4/packages/project-manager/lib/forums-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/forums-portlet.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/project-manager/lib/forums-portlet.tcl	26 May 2005 12:24:11 -0000	1.1
@@ -0,0 +1,37 @@
+# packages/project-manager/lib/forums-portlet.tcl
+#
+# 
+#
+# @author Malte Sussdorff (sussdorff@sussdorff.de)
+# @creation-date 2005-05-26
+# @arch-tag: 2e370b1e-543b-41ee-9517-f4445927a286
+# @cvs-id $Id: forums-portlet.tcl,v 1.1 2005/05/26 12:24:11 maltes Exp $
+
+foreach required_param {forum_id} {
+    if {![info exists $required_param]} {
+	return -code error "$required_param is a required parameter."
+    }
+}
+
+# Integrate with Forums
+
+if {$forum_id > 1} {
+    # Get forum data
+    if {[catch {forum::get -forum_id $forum_id -array forum} errMsg]} {
+	if {[string equal $::errorCode NOT_FOUND]} {
+	    ns_returnnotfound
+	    ad_script_abort
+	}
+	error $errMsg $::errorInfo $::errorCode
+    }
+    forum::security::require_read_forum -forum_id $forum_id
+    forum::security::permissions -forum_id $forum_id permissions
+    set package_id [acs_object::get_element -object_id $forum_id -element package_id]
+    set base_url [apm_package_url_from_id $package_id]
+}
+
+foreach optional_param {} {
+    if {![info exists $optional_param]} {
+	set $optional_param {}
+    }
+}
Index: openacs-4/packages/project-manager/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/one.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/project-manager/www/one.adp	26 May 2005 09:34:29 -0000	1.3
+++ openacs-4/packages/project-manager/www/one.adp	26 May 2005 12:24:11 -0000	1.4
@@ -1,62 +1,82 @@
 <master src="lib/master" />
-
-  <if @project.status_type@ eq c>
-    <property name="title">@my_title;noquote@ -- #project-manager.Closed#</property>
-  </if>
-  <else>
-    <property name="title">@my_title;noquote@</property>
-  </else>
-  <property name="context">@context;noquote@</property>
-  <property name="project_item_id">@project_item_id@</property>
-  
-  <if @project.live_revision@ ne @project.project_id@>
+<if @project.status_type@ eq c>
+  <property name="title">@my_title;noquote@ -- #project-manager.Closed#</property>
+</if>
+<else>
+  <property name="title">@my_title;noquote@</property>
+</else>
+<property name="context">@context;noquote@</property>
+<property name="project_item_id">@project_item_id@</property>
+<if @project.live_revision@ ne @project.project_id@>
   <h4>#project-manager.lt_not_current_set_live#</h4>
-  </if>
-  
-
-
-	<include src=/packages/project-manager/lib/project-portlet project_id="@project_id@" project_item_id="@project_item_id@">
-      
-      <p />
-      
-	<include src=/packages/project-manager/lib/date-portlet project_id="@project_id@" project_item_id="@project_item_id@">
-      
-      <p />
-
-	<include src=/packages/project-manager/lib/assignee-portlet
-	project_id="@project_id@" project_item_id="@project_item_id@" return_url="@return_url@">
-
+</if>
+<include
+  src="/packages/project-manager/lib/project-portlet"
+  project_id="@project_id@"
+  project_item_id="@project_item_id@" />
 <p />
-	<include src=/packages/project-manager/lib/categories-portlet project_id="@project_id@" project_item_id="@project_item_id@">      
-        
-      <p />
-
-      <if @use_subprojects_p@>
-	<include src=/packages/project-manager/lib/subprojects project_id="@project_id@" project_item_id="@project_item_id@">
-        <p />
-      </if>
-        
-	<include src=/packages/project-manager/lib/comments-portlet project_id="@project_id@" project_item_id="@project_item_id@" return_url="@return_url@">
-
-    </td>
-    <td valign="top">
-      
-	<include src=/packages/project-manager/lib/tasks-portlet project_id="@project_id@" project_item_id="@project_item_id@" return_url="@return_url@" instance_id="@instance_id@">
-      
-      <p />
-
-	<include src=/packages/project-manager/lib/logger-portlet project_item_id="@project_item_id@" return_url="@return_url@" master="@portlet_master@" logger_project="@project.logger_project@" logger_days="@logger_days@" return_url="@return_url;noquote@" pm_url="@package_url;noquote@">
-
+<include
+  src="/packages/project-manager/lib/date-portlet"
+  project_id="@project_id@"
+  project_item_id="@project_item_id@" />
 <p />
-      <if @use_project_customizations_p@>
-        <p />
-
-	<include src=/packages/project-manager/lib/customization-portlet project_id="@project_id@" project_item_id="@project_item_id@">
-          
-
-      </if>
-      
-      </table>
-    </td>
-  </tr>
+<include
+  src=/packages/project-manager/lib/assignee-portlet
+  project_id="@project_id@"
+  project_item_id="@project_item_id@"
+  return_url="@return_url@" />
+  <p />
+  <include
+    src="/packages/project-manager/lib/categories-portlet"
+    project_id="@project_id@"
+    project_item_id="@project_item_id@" />
+  <p />
+  <if @use_subprojects_p@>
+    <include
+      src="/packages/project-manager/lib/subprojects"
+      project_id="@project_id@"
+      project_item_id="@project_item_id@" />
+    <p />
+  </if>
+  <include
+    src="/packages/project-manager/lib/comments-portlet"
+    project_id="@project_id@"
+    project_item_id="@project_item_id@"
+    return_url="@return_url@" />
+</td>
+  <td valign="top">
+    <include
+      src="/packages/project-manager/lib/tasks-portlet"
+      project_id="@project_id@"
+      project_item_id="@project_item_id@"
+      return_url="@return_url@"
+      instance_id="@instance_id@" />
+    <p />
+    <include
+      src="/packages/project-manager/lib/logger-portlet"
+      project_item_id="@project_item_id@"
+      return_url="@return_url@"
+      master="@portlet_master@"
+      logger_project="@project.logger_project@"
+      logger_days="@logger_days@"
+      return_url="@return_url;noquote@"
+      pm_url="@package_url;noquote@" />
+    <p />
+    <if @use_project_customizations_p@>
+      <p />
+      <include
+	src="/packages/project-manager/lib/customization-portlet"
+	project_id="@project_id@"
+	project_item_id="@project_item_id@" />
+    </if>
+    <p />
+    <if @forum_id@ ge 0>
+      <include
+	src="/packages/project-manager/lib/forums-portlet"
+	forum_id="@forum_id@" />
+    </if>
+    <p />
+  </table>
+  </td>
+</tr>
 </table>
Index: openacs-4/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/one.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/www/one.tcl	26 May 2005 09:34:29 -0000	1.4
+++ openacs-4/packages/project-manager/www/one.tcl	26 May 2005 12:24:11 -0000	1.5
@@ -113,7 +113,10 @@
 set project_root [pm::util::get_root_folder -package_id $package_id]
 set my_title "$project_term \#$project_item_id: $project(project_name)"
 
+set forum_id [application_data_link::get_linked -from_object_id $project(item_id) -to_object_type "forums_forum"]
+set folder_id [application_data_link::get_linked -from_object_id $project(item_id) -to_object_type "content_folder"]
 
+
 # set up context bar, needs project(parent_id)
 if {[string equal $project(parent_id) $project_root]} {
     set context [list "$project(project_name)"]