Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case.adp	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case.adp	19 Nov 2001 18:27:40 -0000	1.2
@@ -1,87 +1,195 @@
 <master>
-<property name="title">Case: @case.object_name@ (@case.state@)</property>
-<h2>Case: @case.object_name@ (@case.state@)</h2>
+<property name="title">@case.object_name@ case</property>
+<h2>@case.object_name@ case</h2>
 @context_bar@
 <hr>
 
-<table align="right">
+<table width="100%" cellspacing="4" cellpadding="2" border="0">
   <tr>
-    <td>
-      Actions:
-      <multiple name="actions">
-        (<a href="@actions.url@">@actions.title@</a>)
-      </multiple>
-    </td>
-  </tr>
-  <tr>
-    <td align="right">
-      (<a href="@case.debug_url@">debug case</a>)
-    </td>
-  </tr>
-</table>
+    <td valign="top">
 
-<if @workflow_img_tag@ not nil>
-  <h3>Process</h3>
-  <center>
-    @workflow_img_tag@
-  </center>
-</if>
+      <!-- Left side --> 
 
-<h3>Currently Enabled Tasks</h3>
+      <!-- State panel -->
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td bgcolor="#cccccc">
+            <table border="0" cellspacing="1" cellpadding="2" width="100%">
+              <tr bgcolor="#ccccff">
+                <th>
+                  This case is currently @case.state@
+                </th>
+              </tr>
+              <tr bgcolor="#ffffff">
+                <td>
+                  <table width="100%" cellspacing="0" cellpadding="0" border="0">
+                    <tr>
+                      <td>
+                        <if @actions:rowcount@ gt 0>
+			  Change state:
+			  <multiple name="actions">
+			    (<a href="@actions.url@">@actions.title@</a>)
+			  </multiple>
+                        </if>
+                      </td>
+                      <td align="right">
+                        (<a href="@case.debug_url@">debug case</a>)
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
 
-<table cellspacing=0 cellpadding=0 border=0>
-  <tr>
-    <td bgcolor=#cccccc>
-      <table width="100%" cellspacing=1 cellpadding=4 border=0>
-        <tr valign=middle bgcolor="#ffffe4">
-          <th>Task Name</th>
-          <th>State</th>
-          <th>Enabled Date</th>
+      <p>
+
+      <!-- Active Tasks -->
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td bgcolor="#cccccc">
+            <table border="0" cellspacing="1" cellpadding="2" width="100%">
+              <tr bgcolor="#ccccff">
+                <th>
+                  Active Tasks
+                </th>
+              </tr>
+              <tr bgcolor="#ffffff">
+                <td>
+                  <include src="active-tasks" case_id="@case_id@" return_url="@return_url@">
+                </td>
+              </tr>
+            </table>
+          </td>
         </tr>
-        <multiple name="current_tasks">
-          <tr bgcolor="#eeeeee">
-            <td><a href="task?task_id=@current_tasks.task_id@">@current_tasks.transition_name@</a></td>
-            <td>@current_tasks.state@</td>
-            <td>@current_tasks.enabled_date_pretty@</td>
-          </tr>
-        </multiple>
-        <if @current_tasks:rowcount@ eq 0>
-          <tr><td><em>no current_tasks</em></td></tr>
-        </if>
       </table>
+
+      <p>
+ 
+      <!-- Manual Assignments -->
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td bgcolor="#cccccc">
+            <table border="0" cellspacing="1" cellpadding="2" width="100%">
+              <tr bgcolor="#ccccff">
+                <th>
+                  Manual Assignments
+                </th>
+              </tr>
+              <tr bgcolor="#ffffff">
+                <td>
+                  <include src="case-assignments-table" case_id="@case_id@">
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+
+      <p>
+
+      <!-- Deadlines -->
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td bgcolor="#cccccc">
+            <table border="0" cellspacing="1" cellpadding="2" width="100%">
+              <tr bgcolor="#ccccff">
+                <th>
+                  Deadlines
+                </th>
+              </tr>
+              <tr bgcolor="#ffffff">
+                <td>
+                  <include src="case-deadlines-table" case_id="@case_id@">
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+
+      <p>
+
+      <!-- Past Tasks -->
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td bgcolor="#cccccc">
+            <table border="0" cellspacing="1" cellpadding="2" width="100%">
+              <tr bgcolor="#ccccff">
+                <th>
+                  Past Tasks
+                </th>
+              </tr>
+              <tr bgcolor="#ffffff">
+                <td>
+                  <include src="finished-tasks" case_id="@case_id@">
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+
+      <p>
+
+      <!-- Attributes -->
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td bgcolor="#cccccc">
+            <table border="0" cellspacing="1" cellpadding="2" width="100%">
+              <tr bgcolor="#ccccff">
+                <th>
+                  Attributes
+                </th>
+              </tr>
+              <tr bgcolor="#ffffff">
+                <td>
+                  <include src="case-attributes-table" case_id="@case_id@">
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+
     </td>
-  </tr>
-</table>
+    <td align="center" valign="top">
 
-<h3>All Tasks So Far</h3>
+      <!-- Right side -->
 
-<table cellspacing=0 cellpadding=0 border=0>
-  <tr>
-    <td bgcolor=#cccccc>
-      <table width="100%" cellspacing=1 cellpadding=4 border=0>
-        <tr valign=middle bgcolor="#ffffe4">
-          <th>Task Name</th>
-          <th>State</th>
-          <th>Enabled Date</th>
+      <!-- Case graph -->
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td bgcolor="#cccccc">
+            <table border="0" cellspacing="1" cellpadding="2" width="100%">
+              <tr bgcolor="#ccccff">
+                <th>
+                  Process State
+                </th>
+              </tr>
+              <tr bgcolor="#ffffff">
+                <td>
+                  <include src="case-state-graph" case_id="@case_id@" size="3,10">
+                </td>
+              </tr>
+            </table>
+          </td>
         </tr>
-        <multiple name="old_tasks">
-          <tr bgcolor="#eeeeee">
-            <td><a href="task?task_id=@old_tasks.task_id@">@old_tasks.transition_name@</a></td>
-            <td>@old_tasks.state@</td>
-            <td>@old_tasks.enabled_date_pretty@</td>
-          </tr>
-        </multiple>
-        <if @old_tasks:rowcount@ eq 0>
-          <tr><td><em>no old_tasks</em></td></tr>
-        </if>
       </table>
+ 
     </td>
   </tr>
-</table>
+  <tr>
 
-<h3>Journal</h3>
+    <!-- Bottom row -->
 
-<include src="journal" case_id="@case.case_id@">
+    <td colspan="2">
+      <include src="journal" case_id="@case.case_id@">
+    </td>
+  </tr>
+</table>
 
 </master>