Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/lib/task-date-portlet.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/lib/task-date-portlet.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/project-manager/lib/task-dates-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-dates-portlet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/lib/task-dates-portlet.adp	26 Aug 2005 20:59:12 -0000	1.2
+++ openacs-4/packages/project-manager/lib/task-dates-portlet.adp	17 Sep 2005 10:23:36 -0000	1.3
@@ -1,38 +1,63 @@
 <master src="@default_layout_url;noquote@" />
 <property name="portlet_title">#project-manager.Dates#</property>
-<table>
+<table width="100%">
   <tr>
-    <td colspan="2" class="list-bottom-bg">
-      <table border="0" class="list" width="100%">
-	<tr>
-	  <td class="highlight">#project-manager.Earliest_start#</td>
-	  <td>@task_info.earliest_start@&nbsp;</td>
-	</tr>
+    <td colspan="2">
+      <table border="0" width="100%">
+        <if @task_info.earliest_start@ not nil>
+	  <tr>
+	    <td class="highlight">#project-manager.Earliest_start#</td>
+	    <td>@task_info.earliest_start@&nbsp;</td>
+	  </tr>
+        </if>
 	
-	<tr>
-	  <td class="highlight">#project-manager.Earliest_finish#</td>
-	  <td>@task_info.earliest_finish@</td>
-	</tr>
+        <if @task_info.earliest_finish@ not nil>
+	  <tr>
+	    <td class="highlight">#project-manager.Earliest_finish#</td>
+	    <td>@task_info.earliest_finish@</td>
+	  </tr>
+        </if>
 	
-	<tr>
-	  <td class="highlight">#project-manager.Latest_start#</td>
-	  <td>@task_info.latest_start@</td>
-	</tr>
+        <if @task_info.latest_start@ not nil>
+	  <tr>
+	    <td class="highlight">#project-manager.Latest_start#</td>
+	    <td>@task_info.latest_start@</td>
+	  </tr>
+        </if>
 	
-	<tr>
-	  <td class="highlight">#project-manager.Latest_finish#</td>
-	  <td><b>@task_info.latest_finish@</b></td>
-	</tr>
+        <if @task_info.latest_finish@ not nil>
+	  <tr>
+	    <td class="highlight">#project-manager.Latest_finish#</td>
+	    <td><b>@task_info.latest_finish@</b></td>
+	  </tr>
+        </if>
 
-	<if @task_info.latest_finish@ ne @task_info.end_date@>
+        <if @task_info.end_date@ not nil and @task_info.latest_finish@ ne @task_info.end_date@>
 	  <tr>
 	    <td class="highlight">#project-manager.Deadline_1#</td>
 	    <td><b>@task_info.end_date@</b></td>
 	  </tr>
 	</if>
-	
+
+        <if @task_info.slack_time@ not nil>
+        <tr>
+          <td class="subheader" width="40%">#project-manager.Slack_time#</td>
+          <td>@task_info.slack_time@</td>
+        </tr>
+       </if>
+        <if @task_info.percent_complete@ not nil>
+        <tr>
+          <td class="subheader" width="40%">#project-manager.Percent_complete#</td>
+          <td>@task_info.percent_complete@%</td>
+        </tr>
+	</if>
+        <if @task_info.estimate_hours_work@ not nil>
+        <tr>
+          <td class="subheader" width="40%">#project-manager.Estimated_hours_work#</td>
+          <td>@task_info.estimated_hours_work@</td>
+        </tr>
+	</if>
       </table>
     </td>
-    <td class="list-right-bg">&nbsp;</td>
   </tr>
 </table>
Index: openacs-4/packages/project-manager/lib/task-dates-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-dates-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/task-dates-portlet.tcl	26 Aug 2005 20:59:54 -0000	1.1
+++ openacs-4/packages/project-manager/lib/task-dates-portlet.tcl	17 Sep 2005 10:23:36 -0000	1.2
@@ -1 +1,43 @@
-set default_layout_url [parameter::get -parameter DefaultPortletLayoutP]
\ No newline at end of file
+set default_layout_url [parameter::get -parameter DefaultPortletLayoutP]
+# packages/project-manager/lib/task-dates-portlet.tcl
+#
+# Portlet for tasks timing information
+#
+# @author Malte Sussdorff (sussdorff@sussdorff.de)
+# @creation-date 2005-05-01
+# @arch-tag: c502a3ed-d1c0-4217-832a-6ccd86256024
+# @cvs-id $Id$
+
+set user_id [auth::require_login]
+
+# terminology and other parameters
+set project_term       [_ project-manager.Project]
+set use_goal_p         [parameter::get -parameter "UseGoalP" -default "1"]
+set use_project_code_p [parameter::get -parameter "UseUserProjectCodesP" -default "1"]
+set default_layout_url [parameter::get -parameter DefaultPortletLayoutP]
+
+
+
+# format the hours remaining section
+
+set task_info(hours_remaining) \
+    [pm::task::hours_remaining \
+         -estimated_hours_work $task_info(estimated_hours_work) \
+         -estimated_hours_work_min $task_info(estimated_hours_work_min) \
+         -estimated_hours_work_max $task_info(estimated_hours_work_max) \
+         -percent_complete $task_info(percent_complete)]
+
+set task_info(days_remaining) \
+    [pm::task::days_remaining \
+         -estimated_hours_work $task_info(estimated_hours_work) \
+         -estimated_hours_work_min $task_info(estimated_hours_work_min) \
+         -estimated_hours_work_max $task_info(estimated_hours_work_max) \
+         -percent_complete $task_info(percent_complete)]
+
+# format the dates according to the local settings
+#set task_info(earliest_start)  [lc_time_fmt $task_info(earliest_start) "%x"]
+#set task_info(earliest_finish) [lc_time_fmt $task_info(earliest_finish) "%x"]
+#set task_info(latest_start)    [lc_time_fmt $task_info(latest_start) "%x"]
+#set task_info(latest_finish)   [lc_time_fmt $task_info(latest_finish) "%x"]
+#set task_info(end_date)        [lc_time_fmt $task_info(end_date) "%x"]
+
Index: openacs-4/packages/project-manager/lib/task-info-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-info-portlet.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/lib/task-info-portlet.adp	15 Sep 2005 19:00:00 -0000	1.4
+++ openacs-4/packages/project-manager/lib/task-info-portlet.adp	17 Sep 2005 10:23:36 -0000	1.5
@@ -27,28 +27,16 @@
     </tr>
   </table>
 </property>
-<table border="0" cellpadding="3" cellspacing="1" width="100%">
+<table border="0" cellpadding="1" cellspacing="1" width="100%">
   <tr>
-    <td width="70%" valign="top">
+    <td class="list-bg" colspan="2">@task_info.description;noquote@</td>
+  </tr>
+  <tr>
+    <td class="list-bg" align="right" colspan="2">- @task_info.creation_user@</td>
+  </tr>
+</table>
+<p>
       <table border="0" width="100%">
-        <if @task_info.end_date@ not nil and @task_info.latest_finish@ ne @task_info.end_date@>
-          <tr>
-            <td class="subheader" width="40%">#project-manager.Deadline_1#</td>
-            <td><b>@task_info.end_date@</b></td>
-          </tr>
-        </if>
-        <tr>
-          <td class="subheader" width="40%">#project-manager.Slack_time#</td>
-          <td>@task_info.slack_time@</td>
-        </tr>
-        <tr>
-          <td class="subheader" width="40%">#project-manager.Percent_complete#</td>
-          <td>@task_info.percent_complete@%</td>
-        </tr>
-        <tr>
-          <td class="subheader" width="40%">#project-manager.Estimated_hours_work#</td>
-          <td>@task_info.estimated_hours_work@</td>
-        </tr>
         <if @process_html@ not nil>
           <tr>
             <td class="subheader" width="40%">#project-manager.Process_status#</td>
@@ -59,76 +47,28 @@
           <td class="subheader" width="40%">#project-manager.Priority#</td>
           <td>@task_info.priority@</td>
         </tr>
+	  <multiple name="dynamic_attributes">
+	      <tr>  
+	        <td class="subheader" colspan="2">@dynamic_attributes.name@</td>
+                <td class="list-bg" colspan="2">@dynamic_attributes.value@</td>
+             </tr>
+	  </multiple>
         <tr>
           <td class="subheader" width="40%">#project-manager.Actions#</td>
-          <td><a href="task-revisions?task_id=@task_id@">#project-manager.View_task_changes#</a></td>
+	  </tr>
+	  <tr>
+          <td><ul><li><a href="task-revisions?task_id=@task_id@">#project-manager.View_task_changes#</a></li></ul></td>
         </tr>
       </table>
-    </td>
-    <td width="30%" valign="top">
-      <table border="0" width="100%">
-        <if @task_info.earliest_start@ not nil>
-          <tr>
-            <td class="subheader" width="60%">#project-manager.Earliest_start#</td>
-            <td>@task_info.earliest_start@&nbsp;</td>
-          </tr>
-        </if>
-        
-        <if @task_info.earliest_finish@ not nil>
-          <tr>
-            <td class="subheader" width="60%">#project-manager.Earliest_finish#</td>
-            <td>@task_info.earliest_finish@</td>
-          </tr>
-        </if>
-	
-        <if @task_info.latest_start@ not nil>
-          <tr>
-            <td class="subheader" width="60%">#project-manager.Latest_start#</td>
-            <td>@task_info.latest_start@</td>
-          </tr>
-        </if>
-        
-        <if @task_info.latest_finish@ not nil>
-          <tr>
-            <td class="subheader" width="40%">#project-manager.Latest_finish#</td>
-            <td><b>@task_info.latest_finish@</b></td>
-          </tr>
-        </if>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-  <tr>
-        <td>&nbsp;</td>
-  </tr>
-    <td class="subheader" colspan="2">#project-manager.Description#</td>
-  </tr>
-  <tr>
-    <td class="list-bg" colspan="2">@task_info.description;noquote@</td>
-  </tr>
-  <multiple name="dynamic_attributes">
+<p>
+<table>
     <tr>
-      <td class="subheader" colspan="2">@dynamic_attributes.name@</td>
-    </tr>
-    <tr>
-      <td class="list-bg" colspan="2">@dynamic_attributes.value@</td>
-    </tr>
-  </multiple>
-  <tr>
-    <td class="list-bg" align="left" colspan="2">- @task_info.creation_user@</td>
-  </tr>
-  <tr>
-      <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <tr>
       <td class="subheader" colspan="2">#project-manager.Comments#</th>
     </tr>
     <tr>
       <td class="list-bg" colspan="2">@comments;noquote@
 	<P />
-	@comments_link;noquote@
+	<ul><li>@comments_link;noquote@</li></ul>
       </td>
     </tr>
 </table>
Index: openacs-4/packages/project-manager/lib/task-info-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-info-portlet.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/lib/task-info-portlet.tcl	26 Aug 2005 20:59:12 -0000	1.2
+++ openacs-4/packages/project-manager/lib/task-info-portlet.tcl	17 Sep 2005 10:23:36 -0000	1.3
@@ -6,7 +6,16 @@
 # @creation-date 2005-05-01
 # @arch-tag: c502a3ed-d1c0-4217-832a-6ccd86256024
 # @cvs-id $Id$
+#
 
+# Initialize Variables that might not exist
+
+foreach optional_param {slack_time} {
+    if {![info exists task_info($optional_param)]} {
+	set task_info($optional_param) {}
+    }
+}
+
 set user_id [auth::require_login]
 set urgency_threshold 8
 set task_term       [_ project-manager.Task]