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.31.2.10 -r1.31.2.11
--- openacs-4/contrib/packages/project-manager/www/one.adp	4 Nov 2004 01:19:29 -0000	1.31.2.10
+++ openacs-4/contrib/packages/project-manager/www/one.adp	4 Nov 2004 21:58:11 -0000	1.31.2.11
@@ -42,36 +42,37 @@
         </tr>
         
         <tr>
-          <td bgcolor="#eeeeee" colspan="3">
+          <td bgcolor="#eeeeee" colspan="2" class="fill-list-bottom">
             
-            <table border="0" width="100%" bgcolor="#ffffff" cellspacing="1">
+            <table border="0" width="100%" bgcolor="#ffffff" cellspacing="0">
               
               <tr>
-                <td class="highlight" valign="top">Name</td>
-                <td>@project.project_name@</td>
+                <td class="highlight" valign="top">Name:</td>
+                <td class="fill-list-bg">@project.project_name@</td>
               </tr>
               
               <if @use_project_code_p@ eq 1>
                 <tr>
-                  <td class="highlight">Code</td>
-                  <td>@project.project_code@</td>
+                  <td class="highlight">Code:</td>
+                  <td class="fill-list-bg">@project.project_code@</td>
                 </tr>
               </if>
               
               <if @use_goal_p@ eq 1>
                 <tr>
-                  <td class="highlight">Goal</td>
-                  <td>@project.goal@</td>
+                  <td class="highlight">Goal:</td>
+                  <td class="fill-list-bg">@project.goal@</td>
                 </tr>   
               </if>
               
               <tr>
-                <td class="highlight" valign="top">Description</td>
-                <td>@project.description;noquote@</td>
+                <td class="highlight" valign="top">Description:</td>
+                <td class="fill-list-bg">@project.description;noquote@</td>
               </tr>
               
             </table>
-          </td>
+            </td>
+            <td class="fill-list-right">&nbsp;</td>
         </tr>
       </table>
       
@@ -84,45 +85,46 @@
           </th>
           <th class="project">Dates</th>
           <th align="right" valign="top" width="10" class="project">
-            <img src="resources/tr-9999cc" />
+            <img src="resources/tr-9999cc" align="top" />
           </th>
         </tr>
         
         <tr>
-          <td colspan="3">
+          <td colspan="2" class="fill-list-bottom">
             <table border="0" cellpadding="1" cellspacing="1" width="100%">
               <tr>
                 <td class="highlight">Start</td>
-                <td>@project.planned_start_date@</td>
+                <td class="fill-list-bg">@project.planned_start_date@</td>
               </tr>
               
               <tr>
                 <td class="highlight">Earliest finish</td>
                 <if @project.ongoing_p@ eq f>
-                  <td>@project.earliest_finish_date@</td>
+                  <td class="fill-list-bg">@project.earliest_finish_date@</td>
                 </if>
                 <else>
-                  <td>Ongoing</td>
+                  <td class="fill-list-bg">Ongoing</td>
                 </else>
               </tr>
               
               <tr>
                 <td class="highlight">Latest finish</td>
                 <if @project.ongoing_p@ eq f>
-                  <td><b>@project.latest_finish_date@</b></td>
+                  <td class="fill-list-bg"><b>@project.latest_finish_date@</b></td>
                 </if>
                 <else>
-                  <td>Ongoing</td>
+                  <td class="fill-list-bg">Ongoing</td>
                 </else>
               </tr>
               
               <tr>
                 <td class="highlight">Task hours completed</td>
-                <td>@project.actual_hours_completed@ of @project.estimated_hours_total@</td>
+                <td class="fill-list-bg">@project.actual_hours_completed@ of @project.estimated_hours_total@</td>
               </tr>
               
             </table>
           </td>
+          <td class="fill-list-right">
         </tr>
       </table>
       
@@ -135,22 +137,24 @@
           </th>
           <th class="project">Assignees</th>
           <th align="right" valign="top" width="10" class="project">
-            <img src="resources/tr-9999cc" />
+            <img src="resources/tr-9999cc" align="top" />
           </th>
         </tr>
         <tr>
-          <td colspan="3">
+          <td colspan="2" class="fill-list-middle">
             <listtemplate name="people"></listtemplate>
           </td>
+          <td class="fill-list-right">&nbsp;</td>
         </tr>
         <tr>
-          <td colspan="3">
+          <td colspan="2" class="fill-list-bottom">
             <ul>
               <li>@assignee_add_self_widget;noquote@</li>
               <li><a href="@assignee_remove_self_url;noquote@">Remove myself</a></li>
               <li><a href="@assignee_edit_url;noquote@">Edit assignees</a></li>
             </ul>
           </td>
+          <td class="fill-list-right">&nbsp</td>
         </tr>
       </table>
 
@@ -163,21 +167,22 @@
           <th align="left" valign="top" width="10" class="project">
             <img src="resources/tl-9999cc" align="top" />
           </th>
-          <th class="project" colspan="2">Project information</th>
+          <th class="project">Project information</th>
           <th align="right" valign="top" width="10" class="project">
-            <img src="resources/tr-9999cc" />
+            <img src="resources/tr-9999cc" align="top" />
           </th>
           </tr>
           
           <tr>
-            <td colspan="3">
-              <table border="0" cellpadding="1" cellspacing="1" width="100%">
+            <td colspan="2" class="fill-list-bottom">
+              <table border="0" cellpadding="0" cellspacing="0" width="100%">
                 <tr>
                   <td class="highlight">Customer</td>
-                  <td><a href="@customer_link@">@custom.customer_name@</a></td>
+                  <td class="fill-list-bg"><a href="@customer_link@">@custom.customer_name@</a></td>
                 </tr>
               </table>
             </td>
+            <td class="fill-list-right">&nbsp</td> 
           </tr>
         </table>
       </if>
@@ -189,17 +194,17 @@
           <th align="left" valign="top" width="10" class="project">
             <img src="resources/tl-9999cc" align="top" />
           </th>
-          <th class="project" colspan="2">Categories</th>
+          <th class="project">Categories</th>
           <th align="right" valign="top" width="10" class="project">
-            <img src="resources/tr-9999cc" />
+            <img src="resources/tr-9999cc" align="top" />
           </th>
         </tr>
         
         <tr>
-          <td colspan="3">
+          <td colspan="2" class="fill-list-bottom">
             <table border="0" cellpadding="1" cellspacing="1" width="100%">
               <tr>
-                <td class="highlight">
+                <td class="fill-list-bg">
                   
                   <ul>
                     <list name="categories">
@@ -210,9 +215,9 @@
                   </ul>
                   
                 </td>
-                
             </table>
           </td>
+          <td class="fill-list-right">&nbsp;</td> 
         </tr>
       </table>
       
@@ -226,7 +231,7 @@
           </th>
             <th colspan="2">Subprojects</th>
           <th align="right" valign="top" width="10" class="project">
-            <img src="resources/tr-9999cc" />
+            <img src="resources/tr-9999cc" align="top" />
           </th>
           </tr>
           
@@ -251,17 +256,18 @@
           </th>
           <th class="project" colspan="2">Comments</th>
           <th align="right" valign="top" width="10" class="project">
-            <img src="resources/tr-9999cc" />
+            <img src="resources/tr-9999cc" align="top" />
           </th>
         </tr>
         
         <tr class="list-button-bar">
-          <td colspan="4">
+          <td colspan="3" class="fill-list-bottom">
             @comments;noquote@
             <ul>
               <li> @comments_link;noquote@
             </ul>
           </td>
+          <td class="fill-list-right">&nbsp;</td>
           </tr>
       </table>
 
@@ -273,16 +279,17 @@
           </th>
           <th class="project" colspan="2">Actions</th>
           <th align="right" valign="top" width="10" class="project">
-            <img src="resources/tr-9999cc" />
+            <img src="resources/tr-9999cc" align="top" />
           </th>
         </tr>
         
         <tr>
-          <td colspan="4">
+          <td colspan="3" class="fill-list-bottom">
             <ul> 
               <li> <a href="project-revisions?project_item_id=@project_item_id@">View project changes</a></li>
             </ul>
           </td>
+          <td class="fill-list-right">&nbsp;</td>
         </tr>
         
       </table>
@@ -302,21 +309,25 @@
           </th>
           <th class="project">@task_term@</th>
           <th align="right" valign="top" width="10" class="project">
-            <img src="resources/tr-9999cc" />
+            <img src="resources/tr-9999cc" align="top" />
           </th>
         </tr>
 
-        <tr>
-          <td colspan="3">@instance_html;noquote@</td>
-        </tr>
+        <if @instance_html@ not nil>
+          <tr>
+            <td colspan="2" class="fill-list-middle">@instance_html;noquote@</td>
+            <td class="fill-list-right2">&nbsp;</td>
+          </tr>
+        </if>
 
         <tr>
-          <td colspan="3">
+          <td colspan="2" class="fill-list-middle">
             <listtemplate name="tasks"></listtemplate>
           </td>
+          <td class="fill-list-right2">&nbsp;</td>
         </tr>
         <tr class="list-button-bar">
-          <td class="list-button-bar" colspan="3">  
+          <td class="fill-list-bottom" colspan="2">  
             <ul>
               <li> 
                 <form action="task-add-edit" method="post"> 
@@ -343,37 +354,39 @@
             </ul>
             
           </td>
+          <td class="fill-list-right">&nbsp;</td>
         </tr>
         
       </table>
       
       <p />
       
       <table border="0" cellpadding="0" cellspacing="0"
-    id="rightcontent" class="list">
+        id="rightcontent" class="list" width="100%">
         <tr>
           <th align="left" valign="top" width="10" class="project">
             <img src="resources/tl-9999cc" align="top" />
           </th>
           <th class="project">Logger</th>
           <th align="right" valign="top" width="10" class="project">
-            <img src="resources/tr-9999cc" />
+            <img src="resources/tr-9999cc" align="top" />
           </th>
         </tr>
         
         <tr class="list-button-bar">
-          <td class="list-button-bar" valign="top" colspan="3">
+          <td class="fill-list-middle" valign="top" colspan="2">
             <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="fill-list-right2">&nbsp;</td>
         </tr>
         
         <tr>
-          <td colspan="3">
+          <td colspan="2" class="fill-list-bottom">
             <include src="/packages/logger/lib/entries"
               project_id="@project.logger_project;noquote@"
               variable_id="@logger_variable_id;noquote@"
@@ -387,6 +400,7 @@
               project_manager_url="@package_url;noquote@" 
               return_url="@return_url;noquote@" /> 
           </td>
+          <td class="fill-list-right">&nbsp;</td>
         </tr>
       </table>
     </td>