Index: openacs-4/packages/project-manager/lib/task-assignee-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-assignee-portlet.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/project-manager/lib/task-assignee-portlet.adp	26 Aug 2005 20:59:12 -0000	1.2
+++ openacs-4/packages/project-manager/lib/task-assignee-portlet.adp	15 Sep 2005 19:00:00 -0000	1.3
@@ -2,13 +2,13 @@
 <property name="portlet_title">#project-manager.Assignees#</property>
 <table width="100%">
   <tr>
-    <td colspan="2" class="fill-list-middle">
+    <td colspan="2">
       <listtemplate name="people">
       </listtemplate>
     </td>
   </tr>
   <tr>
-    <td colspan="2" class="fill-list-bottom">
+    <td colspan="2">
       <ul>
 	<li>@assignee_add_self_widget;noquote@</li>
 	<if @assigned_p@>
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 -N -r1.3 -r1.4
--- openacs-4/packages/project-manager/lib/task-info-portlet.adp	13 Sep 2005 18:01:27 -0000	1.3
+++ openacs-4/packages/project-manager/lib/task-info-portlet.adp	15 Sep 2005 19:00:00 -0000	1.4
@@ -1,76 +1,135 @@
 <master src="@default_layout_url;noquote@" />
 <property name="portlet_title">
-  <table width="100%">
+  <table border="0" width="100%">
     <tr>
-      <if @task_info.percent_complete@ ge 100>
-	<th class="shaded">
-      </if>
-      <else>
-	<th>
-      </else>
-      <if @task_info.write_p@ eq t>
-	<a href="@task_edit_url;noquote@"><img border="0" src="/shared/images/Edit16.gif" alt="Edit" /></a>
-      </if>
-      <a href="@print_link@"><img border="0" src="resources/print-16.png" alt="Print" /></a>
-      <if @task_info.create_p@ eq t>
-	<a href="@permissions_url@"><img border="0" src="resources/padlock.gif" alt="Set permissions" /></a>
-      </if>
-      <if @task_info.priority@ ge @urgency_threshold@>
-	<font color="red">
-      </if>
-      <else>
-	<font>
-      </else>
-      @task_term@ #@task_id@: @task_info.task_title@
-    </font>
-    </th>
-      <th align="left">
+      <td>
+        <if @task_info.write_p@ eq t>
+          <a href="@task_edit_url;noquote@"><img border="0" src="/shared/images/Edit16.gif" alt="Edit" /></a>
+        </if>
+        <a href="@print_link@"><img border="0" src="resources/print-16.png" alt="Print" /></a>
+        <if @task_info.create_p@ eq t>
+          <a href="@permissions_url@"><img border="0" src="resources/padlock.gif" alt="Set permissions" /></a>
+        </if>
+        <if @task_info.priority@ ge @urgency_threshold@>
+          <font color="red">
+        </if>
+        <else>
+          <font>
+        </else>
+        @task_term@ #@task_id@: @task_info.task_title@
+      </font>
+      </td>
+      <td align"right">
 	<a href="task-delete?task_item_id=@task_id@">
-	  <img border="0" src="/shared/images/Delete16.gif" />
-	</a>
-      </th>
+	  <img border="0" src="/shared/images/Delete16.gif"
+            alt="Delete" /></a>
+      </td>
     </tr>
   </table>
 </property>
 <table border="0" cellpadding="3" cellspacing="1" width="100%">
   <tr>
-    <td class="subheader">#project-manager.Description#</td>
+    <td width="70%" valign="top">
+      <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>
+            <td>@process_html;noquote@</td>
+          </tr>
+        </if>
+        <tr>
+          <td class="subheader" width="40%">#project-manager.Priority#</td>
+          <td>@task_info.priority@</td>
+        </tr>
+        <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>
+      </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 class="list-bg">@task_info.description;noquote@</td>
+        <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">
     <tr>
-      <td class="subheader">@dynamic_attributes.name@</td>
+      <td class="subheader" colspan="2">@dynamic_attributes.name@</td>
     </tr>
     <tr>
-      <td class="list-bg">@dynamic_attributes.value@</td>
+      <td class="list-bg" colspan="2">@dynamic_attributes.value@</td>
     </tr>
   </multiple>
   <tr>
-    <td class="list-bg" align="right">-- @task_info.creation_user@</td>
+    <td class="list-bg" align="left" colspan="2">- @task_info.creation_user@</td>
   </tr>
   <tr>
+      <td>&nbsp;</td>
+  </tr>
+  <tr>
     <tr>
-      <td class="subheader">#project-manager.Comments#</th>
+      <td class="subheader" colspan="2">#project-manager.Comments#</th>
     </tr>
     <tr>
-      <td class="list-bg">@comments;noquote@
+      <td class="list-bg" colspan="2">@comments;noquote@
 	<P />
 	@comments_link;noquote@
       </td>
     </tr>
-    <tr>
-      <td class="subheader">#project-manager.Actions#</td>
-    </tr>
-    <tr>
-      <td class="list-bottom-bg">
-	<ul>
-	  <li>
-	    <a href="task-revisions?task_id=@task_id@">#project-manager.View_task_changes#</a>
-	  </li>
-	</ul>
-      </td>
-    </tr>
 </table>
    
Index: openacs-4/packages/project-manager/lib/task-logger-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-logger-portlet.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/task-logger-portlet.adp	28 Jul 2005 10:57:56 -0000	1.1
+++ openacs-4/packages/project-manager/lib/task-logger-portlet.adp	15 Sep 2005 19:00:00 -0000	1.2
@@ -1,42 +1,18 @@
-<master src="@master;noquote@" />
+<master src="@default_layout_url;noquote@" />
 <property name="portlet_title">#project-manager.Logger#</property>
-  <table width="100%">
-    <tr>
-      <td align="center" colspan="3">
-	#project-manager.lt_Priority_task_infopri#<br />
-	<if @use_days_p@ true>
-	  #project-manager.lt_Days_remaining_task_i#<br />
-	</if>
-	<else>
-	  #project-manager.lt_Hours_remaining_task_#<br />
-	</else>
-	<if @task_info.slack_time@ nil>
-	  #project-manager.Slack_na#
-	</if>
-	<elseif @task_info.slack_time@ lt 1>
-	  #project-manager.Slack# <font color="red">@task_info.slack_time@</font>
-	  <br />
-	</elseif>
-	<else>
-	  #project-manager.lt_Slack_task_infoslack_#<br />
-	</else>
-	#project-manager.lt_Complete_task_infoper#
-      </td>
-      <td>&nbsp;</td>
-    </tr>
+  <table width="100%" border="0">
     <tr> 
-      <td valign="top" colspan="3">
+      <td valign="top">
 	<form action="task-one" method="post">
 	  @variable_widget;noquote@
 	  @variable_exports;noquote@
 	  @day_widget;noquote@
 	  <input type="submit" name="submit" value="#project-manager.View#" />
 	</form>
       </td>
-      <td>&nbsp;</td>
-    </tr>
+  </tr>
     <tr>
-      <td colspan="3">
+      <td>
 	<include
 	  src="/packages/logger/lib/entries"
 	  project_id="@logger_project@"
@@ -52,6 +28,5 @@
 	  project_manager_url="@package_url;noquote@"
 	  return_url="@return_url;noquote@" />
       </td>
-      <td>&nbsp;</td>
-    </tr>
+  </tr>
   </table>
Index: openacs-4/packages/project-manager/lib/task-logger-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-logger-portlet.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/project-manager/lib/task-logger-portlet.tcl	26 Aug 2005 20:59:12 -0000	1.2
+++ openacs-4/packages/project-manager/lib/task-logger-portlet.tcl	15 Sep 2005 19:00:00 -0000	1.3
@@ -46,4 +46,6 @@
 #set task_info(priority) $task_info_priority
 #set task_info(hours_remaining) $task_info_hours_remaining
 #set task_info(hours_remaining) $task_info_percent
-set day_widget "[_ project-manager.lt_Last_input_typetext_n]"
\ No newline at end of file
+set day_widget "[_ project-manager.lt_Last_input_typetext_n]"
+
+set default_layout_url [parameter::get -parameter DefaultPortletLayoutP]
Index: openacs-4/packages/project-manager/templates/task-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-one.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/project-manager/templates/task-one.adp	4 Sep 2005 12:25:26 -0000	1.2
+++ openacs-4/packages/project-manager/templates/task-one.adp	15 Sep 2005 19:00:01 -0000	1.3
@@ -13,34 +13,27 @@
     
     <tr>
       <td valign="top">
-      
-      <if @process_html@ not nil>
-        <table border="0" cellpadding="0" cellspacing="0" width="100%" class="list">
-          <tr>
-            <th align="left" valign="top" width="10">
-              <img src="resources/tl-e6e6fa" align="top" />
-            </th>
-            <th>#project-manager.Process_status#</th>
-            <th align="right" valign="top" width="10">
-              <img src="resources/tr-e6e6fa" align="top" />
-            </th>
-          </tr>
 
-          <tr>
-            <td class="list-bottom-bg" colspan="3">@process_html;noquote@</td>
-          </tr>
-        </table>
-        <p />
-      </if>
-
   <include
     src="/packages/project-manager/lib/task-info-portlet"
 	  &task_info=task_info
+          process_html=@process_html;noquote@
 	  task_edit_url=@task_edit_url@
-	  task_revision_id=@task_revision_id@/>
+	  task_revision_id=@task_revision_id@ />
         
         <P />
         
+<include src="/packages/project-manager/lib/task-logger-portlet"
+	  project_item_id="@project_item_id@"
+	  master="@portlet_master@"
+	  logger_project="@logger_project@"
+	  logger_days="@logger_days@"
+	  return_url="@return_url;noquote@"
+	  pm_url="@package_url;noquote@"
+	  &task_info=task_info
+	  use_days_p="@use_days_p@"
+	  pm_task_id="@task_id@" />
+
   <include
     src="/packages/project-manager/lib/categories-portlet"
     item_id="@task_revision_id@" />
@@ -55,32 +48,23 @@
       <td>
         &nbsp;
       </td>
-      <td valign="top">
-
+      <td width="20%" valign="top">
+       
+      <if 0 eq 1>
       <include src="/packages/project-manager/lib/task-date-portlet"
 	  &task_info=task_info
 	  />
 
         <p />
-
+       </if>
 	<include
 	  src="/packages/project-manager/lib/task-assignee-portlet"
 	  task_id="@task_id@"
 	  return_url="@return_url@" />
 
         <p />
 
-        <include src="/packages/project-manager/lib/task-logger-portlet"
-	  project_item_id="@project_item_id@"
-	  master="@portlet_master@"
-	  logger_project="@logger_project@"
-	  logger_days="@logger_days@"
-	  return_url="@return_url;noquote@"
-	  pm_url="@package_url;noquote@"
-	  &task_info=task_info
-	  use_days_p="@use_days_p@"
-	  pm_task_id="@task_id@" />
-
+        
       </td>
     </tr>
   </table>
Index: openacs-4/packages/project-manager/www/task-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-add-edit.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/project-manager/www/task-add-edit.adp	26 May 2005 09:34:29 -0000	1.2
+++ openacs-4/packages/project-manager/www/task-add-edit.adp	15 Sep 2005 19:00:01 -0000	1.3
@@ -30,7 +30,7 @@
             
             <td colspan="2">
               <if @edit_p@ true>
-                @task_term_lower;noquote@ &nbsp;@tasks.task_item_id@
+                @task_term_lower;noquote@ &nbsp;@tasks.task_item_id@:@tasks.one_line@
               </if>
               <else>
                 @task_term_lower;noquote@ &nbsp;@tasks.rownum@
@@ -157,7 +157,7 @@
             
             <p />
           
-            <div class="shaded">
+            
 
               #project-manager.lt_Deadline_tasksend_dat#</p>