Index: openacs-4/contrib/packages/project-manager/www/task-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.adp,v
diff -u -r1.30 -r1.31
--- openacs-4/contrib/packages/project-manager/www/task-one.adp	19 May 2004 21:05:51 -0000	1.30
+++ openacs-4/contrib/packages/project-manager/www/task-one.adp	3 Jun 2004 21:32:13 -0000	1.31
@@ -4,7 +4,11 @@
     @task_info.task_title;noquote@ @closed_message@</property>
   <property name="context">@context;noquote@</property>
   
-  <table border="0" cellpadding="0" cellspacing="0" width="100%">
+  <if @task_info.live_revision@ ne @task_info.revision_id@>
+  <h4>(not current, select live version from the <a href="task-revisions?task_id=@task_info.item_id@">task change</a> page)</h4>
+  </if>
+
+  <table border="0" cellpadding="3" cellspacing="0" width="100%">
     <tr>
       <td valign="top">
       
@@ -65,30 +69,6 @@
                 </tr>
                 
                 <tr>
-                  <th colspan="2">Dates</th>
-                </tr>
-
-                <tr>
-                  <td>Earliest start</td>
-                  <td>@task_info.earliest_start@</td>
-                </tr>
-                
-                <tr>
-                  <td>Earliest finish</td>
-                  <td>@task_info.earliest_finish@</td>
-                </tr>
-                
-                <tr>
-                  <td>Latest start</td>
-                  <td>@task_info.latest_start@</td>
-                </tr>
-                
-                <tr>
-                  <td>Latest finish</td>
-                  <td><b>@task_info.latest_start@</b></td>
-                </tr>
-                
-                <tr>
                   <th colspan="2">Actions</th>
                 </tr>
                 
@@ -118,6 +98,39 @@
       </td>
       <td valign="top">
 
+        <table border="1" cellpadding="0" cellspacing="0" width="100%"
+          class="list">
+          <tr>
+            <th colspan="2">Dates</th>
+          </tr>
+          <tr>
+            <td>
+              <table border="0" class="list" width="100%">
+                <tr class="list-even">
+                  <td>Earliest start</td>
+                  <td>@task_info.earliest_start@</td>
+                </tr>
+                
+                <tr class="list-odd">
+                  <td>Earliest finish</td>
+                  <td>@task_info.earliest_finish@</td>
+                </tr>
+                
+                <tr class="list-even">
+                  <td>Latest start</td>
+                  <td>@task_info.latest_start@</td>
+                </tr>
+                
+                <tr class="list-odd">
+                  <td>Latest finish</td>
+                  <td><b>@task_info.latest_start@</b></td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+        <p />
+        
         <table border="1" class="list" width="100%">
           <tr>
             <th>Assignees</th>
@@ -128,7 +141,73 @@
             </td>
           </tr>
         </table>
+    
+        <p />
         
+        <table border="1" cellpadding="3" cellspacing="1"
+          id="rightcontent" class="list" width="100%">
+          <tr>
+            <th colspan="2">Logger</th>
+          </tr>
+          
+          <tr class="list-filter-header">
+            <td class="list-button-bar" align="center">
+              Projected: 
+              <if @use_uncertain_completion_times_p@ eq 1>
+                @task_info.estimated_hours_work_min@ -
+                @task_info.estimated_hours_work_max@ hrs 
+              </if>
+              <else>
+                @task_info.estimated_hours_work@ hrs 
+              </else>
+
+              (@task_info.percent_complete@% complete)<br />
+              <if @task_info.slack_time@ nil>
+                Slack: n/a
+              </if>
+              <elseif @task_info.slack_time@ lt 1>
+                Slack: <font color="red">@task_info.slack_time@</font><br />
+              </elseif>
+              <else>
+                Slack: @task_info.slack_time@<br />
+              </else>
+            </td>
+            
+          </tr>
+          
+          <tr class="list-filter-header">
+
+            <td class="list-button-bar" valign="top">
+              <form action="task-one" method="post">
+                @variable_widget;noquote@
+                @variable_exports;noquote@
+                @day_widget;noquote@
+                <input type="submit" name="submit" value="View" />
+              </form>
+            </td>
+            
+          </tr>
+          
+          
+          <tr>
+            <td colspan="2">
+              <include src="/packages/logger/lib/entries"
+                project_id="@logger_project@"
+                variable_id="@logger_variable_id@"
+                filters_p="f"
+                pm_project_id="@project_item_id@" 
+                pm_task_id="@task_id@" 
+                start_date="@then_ansi@"
+                end_date="@today_ansi@" 
+                url="@logger_url;noquote@" 
+                add_link="@log_url;noquote@" 
+                show_orderby_p="f"
+                project_manager_url="@package_url;noquote@" 
+                return_url="@return_url;noquote@" />
+            </td>
+          </tr>
+        </table>
+
         <P />
         
         <table border="1" class="list" width="100%">
@@ -168,62 +247,6 @@
           </tr>
         </table>
         
-        <p />
-        
-        <table border="1" cellpadding="3" cellspacing="1" id="rightcontent" class="list">
-          <tr>
-            <th colspan="3">Logged hours</th>
-          </tr>
-          
-          <tr class="list-filter-header">
-            <td class="list-button-bar" align="center" colspan="2">
-              Total work: 
-              <if @use_uncertain_completion_times_p@ eq 1>
-                @task_info.estimated_hours_work_min@ -
-                @task_info.estimated_hours_work_max@ hrs estimated
-              </if>
-              <else>
-                @task_info.estimated_hours_work@ hrs estimated
-              </else>
-            </td>
-            
-            <td rowspan="2" class="list-button-bar" align="right"> 
-              @task_info.percent_complete@% complete<br />
-              <if @task_info.slack_time@ not nil>
-                Slack: @task_info.slack_time@<br />
-              </if>
-              <else>
-                Slack: n/a
-              </else>
-            </td>
-            
-          </tr>
-          
-          <tr class="list-filter-header">
-            <td class="list-button-bar">
-              <span>
-                <a href="@log_url@" class="list-button" title="Log hours for this project">Log hours</a>
-              </span>
-            </td>
-            
-            <td class="list-button-bar" align="center">
-              @log_note@
-            </td>
-            
-          </tr>
-          
-          
-          <tr>
-            <td colspan="3">
-              <include src="lib/entries-table"
-                selected_project_id="@logger_project@"
-                selected_variable_id="@logger_variable_id@"
-                pm_project_id="@project_item_id@" 
-                pm_task_id="@task_id@" /> 
-            </td>
-          </tr>
-        </table>
-        
       </td>
     </tr>
   </table>