Index: openacs-4/contrib/packages/project-manager/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.adp,v
diff -u -r1.34 -r1.35
--- openacs-4/contrib/packages/project-manager/www/one.adp	19 May 2004 21:05:51 -0000	1.34
+++ openacs-4/contrib/packages/project-manager/www/one.adp	3 Jun 2004 21:32:05 -0000	1.35
@@ -4,10 +4,10 @@
   <property name="context">@context;noquote@</property>
   
   <if @project.live_revision@ ne @project.project_id@>
-  <h4>(not current, select live version below)</h4>
+  <h4>(not current, select live version from the <a href="project-revisions?project_item_id=@project_item_id@">task change</a> page)</h4>
   </if>
   
-  <table border="0" cellpadding="0" cellspacing="0" width="100%">
+  <table border="0" cellpadding="3" cellspacing="0" width="100%">
   <tr>
     <td valign="top">
       
@@ -155,44 +155,61 @@
       </table>
       
       <p />
-      
+
+      <if @use_subprojects_p@>
+        <table class="list" cellpadding="3" cellspacing="1" width="100%" border="1">
+          <tr>
+            <th colspan="2">Subprojects</th>
+          </tr>
+          
+          <tr class="list-button-bar">
+            <td><span class="list-button-header"><a
+                  href="add-edit?parent_id=@project_item_id@" class="list-button"
+                  title="Add a subproject to this project">Add subproject</a></span>
+              
+              <listtemplate name="subproject"></listtemplate>
+              
+            </td>
+          </tr>
+        </table>
+
+        <p />
+      </if>
+
       <table class="list" cellpadding="3" cellspacing="1" width="100%" border="1">
         <tr>
-          <th colspan="2">Subprojects</th>
+          <th colspan="2">Comments</th>
         </tr>
         
         <tr class="list-button-bar">
-          <td><span class="list-button-header"><a
-                href="add-edit?parent_id=@project_item_id@" class="list-button"
-                title="Add a subproject to this project">Add subproject</a></span>
-            
-            <listtemplate name="subproject"></listtemplate>
-            
+          <td>
+            @comments;noquote@
+            <ul>
+              <li> @comments_link;noquote@
+            </ul>
           </td>
-        </tr>
+          </tr>
       </table>
 
       <p />
       <table class="list" cellpadding="3" cellspacing="1" width="100%" border="1">
         <tr>
-          <th colspan="2">Comments</th>
+          <th colspan="2">Actions</th>
         </tr>
         
-        <tr class="list-button-bar">
-          <td>
-            @comments;noquote@
-            <P />
-            @comments_link;noquote@
+        <tr>
+          <td colspan="2">
+            <ul> 
+              <li> <a href="project-revisions?project_item_id=@project_item_id@">View project changes</a></li>
+            </ul>
           </td>
-          </tr>
+        </tr>
+        
       </table>
+
+    </td>
+    <td valign="top">
       
-      </td>
-      <td>
-        &nbsp;
-      </td>
-      <td valign="top">
-      
       <if 0 eq 1>
         TASKS
       </if>
@@ -238,39 +255,39 @@
       
       <table border="1" cellpadding="3" cellspacing="1" id="rightcontent" class="list">
         <tr>
-          <th colspan="2">Logged hours</th>
+          <th>Logger</th>
         </tr>
         
         <tr class="list-button-bar">
-          <td class="list-button-bar">
-            <span class="list-button-header">
-              <a href="@log_url@" class="list-button" title="Log hours for this project">Log hours</a>
-            </span>
+          <td class="list-button-bar" valign="top">
+            <form action="one" method="post">
+              @variable_widget;noquote@
+              @variable_exports;noquote@
+              @day_widget;noquote@
+              <input type="submit" name="submit" value="View" />
+            </form>
+
           </td>
-          <td class="list-button-bar" align="right">
-            @log_note@
-          </td>
         </tr>
         
         <tr>
-          <td colspan="2">
-            <include src="lib/entries-table"
-              selected_project_id="@project.logger_project@"
-              selected_variable_id="@project.logger_variable_id@"
-              start_date_ansi="@then_ansi@"
-              pm_project_id="@project_item_id@" />
+          <td>
+            <include src="/packages/logger/lib/entries"
+              project_id="@project.logger_project;noquote@"
+              variable_id="@logger_variable_id;noquote@"
+              filters_p="f"
+              show_tasks_p="1"
+              pm_project_id="@project_item_id;noquote@" 
+              start_date="@then_ansi;noquote@" 
+              end_date="@today_ansi;noquote@" 
+              url="@logger_url;noquote@" 
+              add_link="@log_url;noquote@"
+              project_manager_url="@package_url;noquote@" 
+              return_url="@return_url;noquote@" /> 
           </td>
         </tr>
       </table>
     </td>
   </tr>
 </table>
 
-<div id="bottomcontent">
-  <h3>REVISIONS</h3>
-  
-  <p />
-  
-  <listtemplate name="versions"></listtemplate>
-  
-</div>