Index: openacs-4/packages/project-manager/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/index.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/project-manager/www/index.adp	14 Nov 2006 16:13:16 -0000	1.18
+++ openacs-4/packages/project-manager/www/index.adp	19 Feb 2007 15:54:15 -0000	1.19
@@ -1,32 +1,46 @@
-<master src="lib/master">
+<master>
+  <property name="context">@context;noquote@</property>
 
-  <link rel="stylesheet" href="/resources/project-manager/style.css" type="text/css" />
-    
-<property name="title">#project-manager.Projects#</property>
-<property name="context">@context;noquote@</property>
+<table>
+  <tr>
+    <td valign="top">
+      <div class="portlet">
+        <h2>Calendary</h2>
+        <div class="portlet-body">
+          <include src="/packages/project-manager/lib/task-calendar" format="print" date="@date@" julian_date="@julian_date@" hide_closed_p="@hide_closed_p@" display_p="d" hide_observer_p=t view="@view@" package_id="@package_id@">
+        </div>
+      </div>
+      <div class="portlet">
+        <h2>#project-manager.Tasks#</h2>
+        <div class="portlet-body">
+          <include src="/packages/project-manager/lib/tasks" display_mode=list page=@page@ page_size=30 status_id=1 orderby_p=1 tasks_orderby=@tasks_orderby@ elements=@elements@ is_observer_filter=f filter_party_id="@user_id@" instance_id="@package_id@">
+        </div>
+      </div>
+    </td>
+    <td valign="top">
+      <div class="portlet">
+        <h2>Projects</h2>
+        <div class="portlet-body">
+          <include src="/packages/project-manager/lib/projects" package_id="@package_id@" assignee_id=@user_id@ filter_p=0 page=@page@ page_size=30 status_id=1 orderby_p=1 projects_orderby=@projects_orderby@ elements=@pm_elements@ current_package_f="@package_id@">
+        </div>
+      </div>
+      <div class="portlet">
+        <h2>Logger</h2>
+        <div class="portlet-body">
+          <include 
+	    src="/packages/logger/lib/entries" 
+	    filters_p="f"
+      	    show_tasks_p="1"
+	    start_date="@then_ansi;noquote@"
+	    &="project_ids"
+	    user_id="@user_id@"
+            end_date="@today_ansi;noquote@"
+	    variable_id="@variable_id@"/>
+        </div>
+      </div>
+    </td>
+  </tr>
 
-<include src="@template_src@" 
-	orderby="@orderby;noquote@" 
-	pm_status_id="@pm_status_id@" 
-	searchterm="@searchterm@" 
-	assignee_id="@assignee_id@" 
-	category_id="@pass_cat@" 
-	elements="project_code customer_name category_id start_date planned_end_date status_id" 
-	package_id=@package_id@ 
-	actions_p="1" 
-	bulk_p="1" 
-	fmt="@fmt@" 
-	date_range="@date_range@" 
-	user_space_p="@user_space_p@" 
-	is_observer_p="@is_observer_p@" 
-	hidden_vars="@hidden_vars;noquote@" 
-	previous_status_f="@previous_status_f@"
-	current_package_f="@current_package_f@"
-	page_size="@page_size@" 
-	page="@page@"
-	page_num="@page_num@" 
-	subprojects_p="@subprojects_p@"
-	pm_etat_id="@pm_etat_id@"
-	pm_contact_id="@pm_contact_id@"
-	/>
+</table>
+