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.12 -r1.13
--- openacs-4/contrib/packages/project-manager/www/one.adp	7 Aug 2003 23:08:45 -0000	1.12
+++ openacs-4/contrib/packages/project-manager/www/one.adp	13 Aug 2003 20:03:27 -0000	1.13
@@ -1,214 +1,214 @@
-<master>
+<master />
 
-<link rel="stylesheet" href="style.css" type="text/css">
+<link rel="stylesheet" href="style.css" type="text/css" />
 
 <property name="title">@project_term@ #@item_id@: @project_name@</property>
 <property name="context_bar">@context_bar@</property>
 
 <if @live_revision@ ne @project_id@>
-<h4>(not current, select live version below)</h4>
+  <h4>(not current, select live version below)</h4>
 </if>
 
-<div id="rightcontent">
+<div id="topcontent">
 
-<!-- TASKS ---------------------------------------------------->
+<div id="leftcontent">
 
-<table border=1 cellpadding=0 cellspacing=0 width="100%">
-<tr>
-<th>Tasks
-<tr>
-<td>
-<table border=0 width="100%">
+  <!-- PROJECT INFO-->
 
-<if @tasks:rowcount@ ne 0>
+  <table border="1" cellpadding="0" cellspacing="0">
   <tr>
-  <th>ID</th>
-  <th>Name</th>
-  <th>Status</th>
-  <th>Start</th>
-  <th>End</th>
-  <th>Constraints</th>
+    <th>@project_term@
+  </tr>
+  <tr>
+    <td bgcolor="#eeeeee">
 
-  <form action="task-add-edit">
-  <input type="hidden" name="project_item_id" value="@item_id@">
-  <input type="hidden" name="project_id" value="@project_id@">
-</if>
+    <table border="0" width="100%" bgcolor="#ffffff" cellspacing="1">
 
-<multiple name="tasks">
+      <tr>
+        <th valign="top">Name</td>
+        <td>@project_name@</td>
+      </tr>
 
-<tr>
-<td><input type="checkbox" name="task_id" value="@tasks.item_id@"> #@tasks.item_id@
-</td>
+      <tr>
+        <th>Code</th>
+        <td>@project_code@</td>
+      </tr>
 
-<td><a href="task-one?project_item_id=@item_id@&task_id=@tasks.item_id@&project_id=@project_id@">@tasks.title@</a></td>
+      <tr>
+        <th>Goal</th>
+        <td>@goal@</td>
+      </tr>   
 
-<td>@tasks.percent_complete@%</td>
+      <tr>
+        <th valign="top">Description</th>
+        <td>@description@</td>
+      </tr>
 
-<td>@tasks.start_date@</td>
+      <tr>
+        <th>Start date (planned)</th>
+        <td>@planned_start_date@</td>
+      </tr>
 
-<td>@tasks.end_date@</td>
+      <tr>
+        <th>End date (planned)</th>
+        <td>@planned_end_date@</td>
+      </tr>
 
-<td valign="center">
+    </table>
 
-<if @tasks.parent_task_id@ not nil>
-  <a href="task-one?project_item_id=@item_id@&task_id=@tasks.parent_task_id@&project_id=@project_id@">@tasks.parent_task_id@</a>
-</if>
+  </table>
+  <p>
+  <a class="button" href="add-edit?project_id=@project_id@">Edit @project_term@</a>
+<a class="button" href="add-edit?parent_id=@item_id@">Add sub-@project_term_lower@</a>
+  </p>
+</div>
 
-  <if @tasks.const_type@ eq start_before_start>
-    <img src="images/start_before_start.png">
-  </if>
-  <if @tasks.const_type@ eq start_before_finish>
-    <img src="images/start_before_finish.png">
-  </if>
-  <if @tasks.const_type@ eq finish_before_start>
-    <img src="images/finish_before_start.png">
-  </if>
-  <if @tasks.const_type@ eq finish_before_finish>
-    <img src="images/finish_before_finish.png">
-  </if>
 
-</tr>
+<div id="rightcontent">
 
-</multiple>
+   <!--
+    TASKS
+    -->
 
-<if @tasks:rowcount@ ne 0>
+  <table border="1" cellpadding="0" cellspacing="1" width="100%">
+  <tr>
+    <th>Tasks</th>
   </tr>
 
   <tr>
-  <td colspan="4">
-  <!--<input type="submit" name="edit" value="Edit">-->
-  </form>
-</if>
+    <td>
+      <table border="0" width="100%">
 
-</table>
+        <if @tasks:rowcount@ ne 0>
+          <tr>
+            <th>ID</th>
+            <th>Name</th>
+            <th>Status</th>
+            <th>Start</th>
+            <th>End</th>
+            <th>Constraints</th>
 
-<ul>
-<li> 
-<form action="task-add-edit" method="post"> 
+            <form action="task-add-edit">
+              <input type="hidden" name="project_item_id" value="@item_id@">
+              <input type="hidden" name="project_id" value="@project_id@">
+          </tr>
+        </if>
 
-Add 
-<input type="hidden" name="project_item_id" value="@item_id@">
-<input type="hidden" name="project_id"      value="@project_id@">
-<input type="text"   name="number" size="3" value="1">
+        <multiple name="tasks">
 
-Tasks
+          <tr>
+            <td><input type="checkbox" name="task_id" value="@tasks.item_id@">#@tasks.item_id@</input></td>
 
-<input type="submit" name="submit" value="Go">
-</form>
+            <td><a href="task-one?project_item_id=@item_id@&task_id=@tasks.item_id@&project_id=@project_id@">@tasks.title@</a></td>
 
+            <td>@tasks.percent_complete@%</td>
 
-<li> Use a process
-<li> Task calendar
-</ul>
-</td>
+            <td>@tasks.start_date@</td>
 
-</table>
+            <td>@tasks.end_date@</td>
 
-</div>
+            <td valign="center">
 
+              <if @tasks.parent_task_id@ not nil>
+                <a href="task-one?project_item_id=@item_id@&task_id=@tasks.parent_task_id@&project_id=@project_id@">@tasks.parent_task_id@</a>
+              </if>
 
-<div id="leftcontent">
+              <if @tasks.const_type@ eq start_before_start>
+                <img src="images/start_before_start.png">
+              </if>
+              <if @tasks.const_type@ eq start_before_finish>
+                <img src="images/start_before_finish.png">
+              </if>
+              <if @tasks.const_type@ eq finish_before_start>
+                <img src="images/finish_before_start.png">
+              </if>
+              <if @tasks.const_type@ eq finish_before_finish>
+                <img src="images/finish_before_finish.png">
+              </if>
+            </td>
+          </tr>
 
-<a class="button" href=add-edit?project_id=@project_id@>Edit @project_term@</a>
-<a class="button" href=add-edit?parent_id=@item_id@>Add sub-@project_term_lower@</a>
+        </multiple>
 
-<P>
+        <if @tasks:rowcount@ ne 0>
+  </tr>
 
-<!-- PROJECT INFO-->
+  <tr>
+    <td colspan="4">
+      <!--<input type="submit" name="edit" value="Edit" />-->
+    </form>
+    </if>
 
-<table border="1" cellpadding="0" cellspacing="0">
-<tr>
-<th>@project_term@
-<tr>
-<tr>
-<td>
+</table>
 
-<P>
+<ul>
+  <li> 
+    <form action="task-add-edit" method="post"> 
+      Add 
+      <input type="hidden" name="project_item_id" value="@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>
+  <li> Use a process </li>
+  <li> Task calendar </li>
+</ul>
+</td>
 
-<table border=0>
-
-<tr>
-<td>Name</td>
-<td>@project_name@</td>
-</tr>
-
-<tr>
-<td>Code</td>
-<td>@project_code@</td>
-</tr>
-
-<tr>
-<td>Goal</td>
-<td>@goal@</td>
-</tr>
-
-<tr>
-<td>Description</td>
-<td>@description@</td>
-</tr>
-
-<tr>
-<td>Start date (planned)</td>
-<td>@planned_start_date@</td>
-</tr>
-
-<tr>
-<td>End date (planned)</td>
-<td>@planned_end_date@</td>
-</tr>
-
 </table>
 
-</table>
-
 </div>
+</div>
 
 
-
 <div id="bottomcontent">
-<!-- REVISIONS -->
+  <!-- REVISIONS -->
 
-<P>
+  <p />
 
-<table border=1 cellpadding=0 cellspacing=0 width="100%">
-<tr>
-<th>@project_term@ versions
-<tr>
-<tr>
-<td>
+  <table border="1" cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <th>@project_term@ versions</th>
+  </tr>
+  <tr>
+    <td>
 
-<table border=0>
-<th>@project_term@</th>
-<th>Code</th>
-<th>Goal</th>
-<th>Description</th>
-<th>Start date (planned)</th>
-<th>End date (planned)</th>
-<th>Ongoing?</th>
+      <table border="0" cellpadding="2" cellspacing="1" width="100%">
+      <tr>
+        <th width="15%">@project_term@</th>
+        <th width="10%">Code</th>
+        <th width="15%">Goal</th>
+        <th width="30%">Description</th>
+        <th>Start date (planned)</th>
+        <th>End date (planned)</th>
+        <th>Ongoing?</th>
+      </tr>
 
+      <multiple name="versions">
 
-<multiple name="versions">
+        <tr>
+          <if @versions.project_id@ eq @versions.live_revision@>
+            <td><b><a href="one?project_id=@versions.project_id@">@versions.project_name@</a></b></td>
+          </if>
 
-<tr>
+          <else>
+            <td><a href="one?project_id=@versions.project_id@">@versions.project_name@</a></td>
+          </else>
 
-<if @versions.project_id@ eq @versions.live_revision@>
-<td><B><a href="one?project_id=@versions.project_id@">@versions.project_name@</a></B></td>
-</if>
-<else>
-<td><a href="one?project_id=@versions.project_id@">@versions.project_name@</a></td>
-</else>
-
-
-<td>@versions.project_code@</td>
-<td>@versions.goal@</td>
-<td>@versions.description@</td>
-<td>@versions.planned_start_date@</td>
-<td>@versions.planned_end_date@</td>
-<td>@versions.ongoing_p@</td>
+          <td>@versions.project_code@</td>
+          <td>@versions.goal@</td>
+          <td>@versions.description@</td>
+          <td>@versions.planned_start_date@</td>
+          <td>@versions.planned_end_date@</td>
+          <td>@versions.ongoing_p@</td>
+        </tr>
+      </multiple>
+    </table>
+  </td>
 </tr>
-</multiple>
-
 </table>
-</table>
 
+<!--left out because of display bug on Safari</div>-->
 
Index: openacs-4/contrib/packages/project-manager/www/style.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/style.css,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/style.css	4 Aug 2003 20:34:47 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/style.css	13 Aug 2003 20:03:27 -0000	1.4
@@ -1,42 +1,55 @@
-<style type="text/css">
+body {
+        margin:5px 5px 0px 5px;
+        padding:0;
+}
 
+#root {
+}
+
+#topcontent {
+}
+
 #leftcontent {
         float:left;
-        width:40%;
+        width:400px;
         margin-right:15px;
 }
 
 #rightcontent {
-        width:60%;
-        float:right;
-        margin-left:15px;
 }
 
 #bottomcontent {
         width:100%;
-        margin-top:10px;
+        margin-left:0px;
         float:left;
 }
 
+#master-top {
+}
+
+#master-bottom {
+        float:left;
+}
+
+#slave {
+}
+
 TABLE {
-        border-collapse: collapse;
         border-right:solid;
         border-left:solid;
         border-top:solid;
         border-bottom:solid;        
-        border-color:eeeeee;
+        border-color:#eeeeee;
 }
 TR {
         border-width:1px;
 }
 TD { 
-        padding: 0;
         font-size: 9pt;
 }
 TH {    font-size: 9pt;
         text-align: left;
-        padding: 0;
-        background-color:dfdfff;
+        background-color:#dfdfff;
 }
 
 A:link.button { 
@@ -80,4 +93,3 @@
         border-style: outset;
         white-space: nowrap;
 }
-</style>
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.8 -r1.9
--- openacs-4/contrib/packages/project-manager/www/task-one.adp	8 Aug 2003 22:24:14 -0000	1.8
+++ openacs-4/contrib/packages/project-manager/www/task-one.adp	13 Aug 2003 20:03:27 -0000	1.9
@@ -5,45 +5,10 @@
 <property name="title">@task_term@ #@item_id@: @task_info.task_title@</property>
 <property name="context_bar">@context_bar@</property>
 
-<div id="rightcontent">
+<div id="topcontent">
 
-<B>@task_term@(s) this relies on.</B>
-<listtemplate name="consts"></listtemplate>
-<P>
-
-<B>@task_term@(s) relying on this @task_term@</B>
-<listtemplate name="consts2"></listtemplate>
-
-<P>
-<table border=0 cellpadding=3 cellspacing=1 width="100%">
-
-<tr>
-<th colspan=2>People</th>
-</tr>
-
-<tr>
-<td valign="top">@assignee_term@(s):
-
-</td>
-
-<td valign="top">
-@watcher_term@(s):
-
-</td>
-</tr>
-</table>
-
-</table>
-</div>
-
-
 <div id="leftcontent">
 
-<a class="button" href="">Breakdown</a>
-<a class="button" href="task-edit?task_id=@task_id@">Edit @task_term_lower@</a>
-
-<P>
-
 <table border="1" cellpadding="0" cellspacing="0" width="100%">
 <tr>
 <td>
@@ -81,8 +46,44 @@
 
 <P>
 
+<a class="button" href="">Breakdown</a>
+<a class="button" href="task-edit?task_id=@task_id@">Edit @task_term_lower@</a>
+
 </div>
 
+<div id="rightcontent">
+
+<B>@task_term@(s) this relies on.</B>
+<listtemplate name="consts"></listtemplate>
+<P>
+
+<B>@task_term@(s) relying on this @task_term@</B>
+<listtemplate name="consts2"></listtemplate>
+
+<P>
+<table border=0 cellpadding=3 cellspacing=1 width="100%">
+
+<tr>
+<th colspan=2>People</th>
+</tr>
+
+<tr>
+<td valign="top">@assignee_term@(s):
+
+</td>
+
+<td valign="top">
+@watcher_term@(s):
+
+</td>
+</tr>
+</table>
+
+</table>
+</div>
+
+</div>
+
 <div id="bottomcontent">
 <!-- REVISIONS -->