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 -r1.31.2.1
--- openacs-4/contrib/packages/project-manager/www/one.adp	12 Mar 2004 13:44:45 -0000	1.31
+++ openacs-4/contrib/packages/project-manager/www/one.adp	20 May 2004 17:30:05 -0000	1.31.2.1
@@ -1,265 +1,276 @@
 <master src="lib/master" />
  
-  <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">@context@</property>
+  <property name="title">@my_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   
   <if @project.live_revision@ ne @project.project_id@>
   <h4>(not current, select live version below)</h4>
   </if>
   
-  <div id="topcontent">
-  
-  <div id="leftcontent">
-    
-    <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
-      <tr>
-        <th>
-          <a href="@edit_url@">
-            <img border="0" src="/shared/images/Edit16.gif"
-              alt="Edit" />
-          </a>
-          
-          &nbsp;&nbsp;@project_term@
-
-        </th>
-        
-      </tr>
+  <table border="0" cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <td valign="top">
       
-      <tr>
-        <td bgcolor="#eeeeee" colspan="3">
-          
-          <table border="0" width="100%" bgcolor="#ffffff" cellspacing="1">
+      <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
+        <tr>
+          <th>
+            <a href="@edit_url@">
+              <img border="0" src="/shared/images/Edit16.gif"
+                alt="Edit" />
+            </a>
             
-            <tr>
-              <td class="highlight" valign="top">Name</td>
-              <td>@project.project_name@</td>
-            </tr>
+            &nbsp;&nbsp;@project_term@
             
-            <if @use_project_code_p@ eq 1>
-              <tr>
-                <td class="highlight">Code</td>
-                <td>@project.project_code@</td>
-              </tr>
-            </if>
+          </th>
+          
+        </tr>
+        
+        <tr>
+          <td bgcolor="#eeeeee" colspan="3">
             
-            <if @use_goal_p@ eq 1>
+            <table border="0" width="100%" bgcolor="#ffffff" cellspacing="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>
-            </tr>
-            
-          </table>
-        </td>
-      </tr>
-    </table>
-    
-    <p />
-    
-    <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>
-                <td>@project.earliest_finish_date@</td>
+                <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>
-              <else>
-                <td>Ongoing</td>
-              </else>
-            </tr>
-            
-            <tr>
-              <td class="highlight">Deadline</td>
-              <if @project.ongoing_p@ eq f>
-                <td><B>@project.planned_end_date@</B></td>
+              
+              <if @use_goal_p@ eq 1>
+                <tr>
+                  <td class="highlight">Goal</td>
+                  <td>@project.goal@</td>
+                </tr>   
               </if>
-              <else>
-                <td>Ongoing</td>
-              </else>
-            </tr>
-            
-            <tr>
-              <td class="highlight">Latest finish</td>
-              <if @project.ongoing_p@ eq f>
-                <td>@project.latest_finish_date@</td>
-              </if>
-              <else>
-                <td>Ongoing</td>
-              </else>
-            </tr>
-            
-            <tr>
-              <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@>
+              
+              <tr>
+                <td class="highlight" valign="top">Description</td>
+                <td>@project.description;noquote@</td>
+              </tr>
+              
+            </table>
+          </td>
+        </tr>
+      </table>
+      
       <p />
+      
       <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
         <tr>
-          <th colspan="2">Project information</th>
+          <th colspan="2">Dates</th>
         </tr>
-
+        
         <tr>
           <td>
             <table border="0" cellpadding="1" cellspacing="1" width="100%">
               <tr>
-                <td class="highlight">Customer</td>
-                <td><a href="/organization/one?organization_id=@custom.customer_id@">@custom.customer_name@</a></td>
+                <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>
+                  <td>@project.earliest_finish_date@</td>
+                </if>
+                <else>
+                  <td>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>
+                </if>
+                <else>
+                  <td>Ongoing</td>
+                </else>
+              </tr>
+              
+              <tr>
+                <td class="highlight">Task hours completed</td>
+                <td>@project.actual_hours_completed@ of @project.estimated_hours_total@</td>
+              </tr>
+              
             </table>
           </td>
         </tr>
       </table>
-    </if>
-    
-    <p />
-    
-    <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
-      <tr>
-        <th colspan="2">Categories</th>
-      </tr>
       
-      <tr>
-        <td>
-          <table border="0" cellpadding="1" cellspacing="1" width="100%">
-            <tr>
-              <td class="highlight">
-                
-                <ul>
-                  <list name="categories">
-                    <if @categories:rowcount@ gt 0>
-                      <li> @categories:item@
-                    </if>
-                  </list>
-                </ul>
-                
-              </td>
-              
-          </table>
-        </td>
-      </tr>
-    </table>
-
-    <p />
-    
-    <table class="list" cellpadding="3" cellspacing="1" width="100%" border="1">
-      <tr>
-        <th colspan="2">Subprojects</th>
-      </tr>
+      <p />
       
-      <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>
+      <if @use_project_customizations_p@>
+        <p />
+        <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
+          <tr>
+            <th colspan="2">Project information</th>
+          </tr>
           
-          <listtemplate name="subproject"></listtemplate>
-          
-        </td>
-      </tr>
-    </table>
+          <tr>
+            <td>
+              <table border="0" cellpadding="1" cellspacing="1" width="100%">
+                <tr>
+                  <td class="highlight">Customer</td>
+                  <td><a href="@customer_link@">@custom.customer_name@</a></td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+      </if>
+      
+      <p />
+      
+      <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
+        <tr>
+          <th colspan="2">Categories</th>
+        </tr>
+        
+        <tr>
+          <td>
+            <table border="0" cellpadding="1" cellspacing="1" width="100%">
+              <tr>
+                <td class="highlight">
+                  
+                  <ul>
+                    <list name="categories">
+                      <if @categories:rowcount@ gt 0>
+                        <li> @categories:item@
+                      </if>
+                    </list>
+                  </ul>
+                  
+                </td>
+                
+            </table>
+          </td>
+        </tr>
+      </table>
+      
+      <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>
 
-  </div>
-
-  <!--
-  TASKS
-  -->
-
-    <table border="1" cellpadding="0" cellspacing="1" width="100%"
-  id="rightcontent" class="list">
-    <tr>
-      <th>@task_term@</th>
-    </tr>
-    
-    <tr>
+      <p />
+      <table class="list" cellpadding="3" cellspacing="1" width="100%" border="1">
+        <tr>
+          <th colspan="2">Comments</th>
+        </tr>
+        
+        <tr class="list-button-bar">
+          <td>
+            @comments;noquote@
+            <P />
+            @comments_link;noquote@
+          </td>
+          </tr>
+      </table>
+      
+      </td>
       <td>
-        <listtemplate name="tasks"></listtemplate>
+        &nbsp;
       </td>
-    </tr>
-    <tr class="list-button-bar">
-      <td class="list-button-bar">  
-        <ul>
-          <li> 
-            <form action="task-add-edit" method="post"> 
-              Add 
-              <input type="hidden" name="project_item_id" value="@project_item_id@" />
-              <input type="hidden" name="project_id"      value="@project_id@" />
-              <input type="text"   name="number" size="3" value="1" />
-              Tasks
-              <input type="submit" name="submit" value="Go" />
-            </form>
-          </li>
-        </ul>
-      </td>
-    </tr>
+      <td valign="top">
+      
+      <if 0 eq 1>
+        TASKS
+      </if>
 
-  </table>
+      <table border="1" cellpadding="0" cellspacing="1" width="100%"
+        id="rightcontent" class="list">
+        <tr>
+          <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"> 
+                  Add 
+                  <input type="hidden" name="project_item_id" value="@project_item_id@" />
+                  <input type="hidden" name="project_id"
+                value="@project_id@" />
+                  <input type="hidden" name="return_url"
+                value="@return_url@" />
+                  <input type="text"   name="number" size="3" value="1" />
+                  Tasks
+                  <input type="submit" name="submit" value="Go" />
+                </form>
+              </li>
+            </ul>
+            
+            <listfilters name="tasks"></listfilters>
+            
+            
+          </td>
+        </tr>
+        
+      </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>
+    </td>
+  </tr>
+</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 -->
+  <h3>REVISIONS</h3>
   
   <p />
   
   <listtemplate name="versions"></listtemplate>
-  <p />
-  <h3>Comments</h3>
-    @comments;noquote@
-    <P />
-    @comments_link;noquote@
   
 </div>