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.27.2.7 -r1.27.2.8
--- openacs-4/contrib/packages/project-manager/www/one.adp	27 Feb 2004 22:46:13 -0000	1.27.2.7
+++ openacs-4/contrib/packages/project-manager/www/one.adp	6 Mar 2004 00:29:24 -0000	1.27.2.8
@@ -1,57 +1,56 @@
-<master />
+<master src="lib/master" />
+ 
+  <link rel="stylesheet" href="style.css" type="text/css" />
 
-<link rel="stylesheet" href="style.css" type="text/css" />
-
-<property name="title">@project_term@ #@project_item_id@: @project.project_name;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-
-<if @project.live_revision@ ne @project.project_id@>
+  <property name="title">@project_term@ #@project_item_id@: @project.project_name;noquote@</property>
+  <property name="context">@context@</property>
+  
+  <if @project.live_revision@ ne @project.project_id@>
   <h4>(not current, select live version below)</h4>
-</if>
-
-<div id="topcontent">
+  </if>
   
+  <div id="topcontent">
+  
   <div id="leftcontent">
     
-    <table border="1" cellpadding="0" cellspacing="0" width="100%">
+    <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
       <tr>
         <th>
-          <a href="add-edit?project_item_id=@project.item_id@">
+          <a href="@edit_url@">
             <img border="0" src="/shared/images/Edit16.gif"
-  alt="Edit">
+              alt="Edit" />
           </a>
-        </th>
+          
+          &nbsp;&nbsp;@project_term@
 
-        <th>@project_term@</th>
-
-        <th align="right"><img border="0" src="/shared/images/Delete16.gif"></th>
-
+        </th>
+        
       </tr>
-
+      
       <tr>
         <td bgcolor="#eeeeee" colspan="3">
-
+          
           <table border="0" width="100%" bgcolor="#ffffff" cellspacing="1">
-
+            
             <tr>
               <td class="highlight" valign="top">Name</td>
               <td>@project.project_name@</td>
             </tr>
-
+            
             <if @use_project_code_p@ eq 1>
               <tr>
                 <td class="highlight">Code</td>
                 <td>@project.project_code@</td>
               </tr>
             </if>
-
+            
             <if @use_goal_p@ eq 1>
               <tr>
                 <td class="highlight">Goal</td>
                 <td>@project.goal@</td>
               </tr>   
             </if>
-
+            
             <tr>
               <td class="highlight" valign="top">Description</td>
               <td>@project.description@</td>
@@ -61,22 +60,22 @@
         </td>
       </tr>
     </table>
-
+    
     <p />
-
-    <table border="1" cellpadding="0" cellspacing="0" width="100%">
+    
+    <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
       <tr>
         <th colspan="2">Dates</th>
       </tr>
-
+      
       <tr>
         <td>
           <table border="0" cellpadding="1" cellspacing="1" width="100%">
             <tr>
               <td class="highlight">Start</td>
               <td>@project.planned_start_date@</td>
             </tr>
-
+            
             <tr>
               <td class="highlight">Earliest finish</td>
               <if @project.ongoing_p@ eq f>
@@ -86,7 +85,7 @@
                 <td>Ongoing</td>
               </else>
             </tr>
-
+            
             <tr>
               <td class="highlight">Deadline</td>
               <if @project.ongoing_p@ eq f>
@@ -96,7 +95,7 @@
                 <td>Ongoing</td>
               </else>
             </tr>
-
+            
             <tr>
               <td class="highlight">Latest finish</td>
               <if @project.ongoing_p@ eq f>
@@ -106,22 +105,22 @@
                 <td>Ongoing</td>
               </else>
             </tr>
-
+            
             <tr>
-              <td class="highlight">Hours completed</td>
+              <td class="highlight">Task hours completed</td>
               <td>@project.actual_hours_completed@ of @project.estimated_hours_total@</td>
             </tr>
-
+            
           </table>
         </td>
       </tr>
     </table>
-
+    
     <p />
     
     <if @use_project_customizations_p@>
       <p />
-      <table border="1" cellpadding="0" cellspacing="0" width="100%">
+      <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
         <tr>
           <th colspan="2">Project information</th>
         </tr>
@@ -133,7 +132,6 @@
                 <td class="highlight">Customer</td>
                 <td><a href="/organization/one?organization_id=@custom.customer_id@">@custom.customer_name@</a></td>
               </tr>
-              
             </table>
           </td>
         </tr>
@@ -142,7 +140,7 @@
     
     <p />
     
-    <table border="1" cellpadding="0" cellspacing="0" width="100%">
+    <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
       <tr>
         <th colspan="2">Categories</th>
       </tr>
@@ -169,30 +167,45 @@
     </table>
 
     <p />
-    <a class="button" href="add-edit?parent_id=@project_item_id@">Add subproject</a>
     
-    Subprojects:
-    <listtemplate name="subproject"></listtemplate>
-    
+    <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>
+
     <!--People:
     <listtemplate name="people"></listtemplate>-->
     
   </div>
 
-
   <!--
   TASKS
   -->
 
-  <table border="1" cellpadding="0" cellspacing="1" width="100%" id="rightcontent">
+    <table border="1" cellpadding="0" cellspacing="1" width="100%"
+  id="rightcontent" class="list">
     <tr>
-      <th>Tasks</th>
+      <th>@task_term@</th>
     </tr>
     
     <tr>
       <td>
         <listtemplate name="tasks"></listtemplate>
-        
+      </td>
+    </tr>
+    <tr class="list-button-bar">
+      <td class="list-button-bar">  
         <ul>
           <li> 
             <form action="task-add-edit" method="post"> 
@@ -210,9 +223,36 @@
 
   </table>
 
+  <p />
+  
+  <table border="1" cellpadding="3" cellspacing="1" id="rightcontent" class="list">
+    <tr>
+      <th colspan="2">Logged hours</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>
+      <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>
+    </tr>
+  </table>
 </div>
 
-
 <div id="bottomcontent">
   <!-- REVISIONS -->
   
@@ -221,4 +261,3 @@
   <listtemplate name="versions"></listtemplate>
   
 </div>
-