Index: openacs-4/contrib/packages/simulation/lib/sim-template-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-template-tasks.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/simulation/lib/sim-template-tasks.adp	8 Jan 2004 10:50:34 -0000	1.7
+++ openacs-4/contrib/packages/simulation/lib/sim-template-tasks.adp	8 Jan 2004 11:03:02 -0000	1.8
@@ -4,3 +4,5 @@
   <formwidget id="formbutton:ok">
 </formtemplate>
 
+<p>TODO: B: Allow reordering of roles, tasks, states.</p>
+
Index: openacs-4/contrib/packages/simulation/www/simbuild/template-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/template-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/simbuild/template-delete.adp	11 Dec 2003 13:21:53 -0000	1.2
+++ openacs-4/contrib/packages/simulation/www/simbuild/template-delete.adp	8 Jan 2004 11:03:02 -0000	1.3
@@ -6,6 +6,4 @@
   You have deleted template "@template_name@".
 </p>
 
-<p>
-  <b>&raquo;</b> <a href="@template_list_url@">Return to template list page</a>
-</p>
+<a href="@template_list_url@" class="action">Return to template list page</a>
Index: openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/template-edit.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp	8 Jan 2004 10:50:34 -0000	1.17
+++ openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp	8 Jan 2004 11:03:02 -0000	1.18
@@ -3,32 +3,56 @@
   <property name="context">@context;noquote@</property>
   <property name="focus">sim_template.pretty_name</property>
 
-<formtemplate id="sim_template"></formtemplate>
+<if @workflow_id@ nil>
+  <!-- Creating -->
+  <formtemplate id="sim_template"></formtemplate>
+</if>
+<else>
+  <!-- Editing -->
+  <table width="100%">
+    <tr>
+      <td valign="top">
+        <div class="portlet">
+          <h2>Template</h2>
+          <div class="portlet-body">
+            <formtemplate id="sim_template"></formtemplate>
+              <a href="@spec_url@" class="action">Download a specification for this template</a>
 
-<if @workflow_id@ not nil>
+              <if @mark_ready_url@ not nil>
+                <a href="@mark_ready_url@" class="action">Mark this template ready for use</a>
+              </if>
 
-  <a name="roles"><h4>Roles</h4></a>
+              <if @inst_url@ not nil>
+                <a href="@inst_url@" class="action">Start a simulation with this template</a>
+              </if>
 
-  <include src="/packages/simulation/lib/sim-template-roles" workflow_id="@workflow_id@" display_mode="edit">
-  <p></p>
+              <a href="@delete_url@" class="action" 
+                onclick="return confirm('Are you sure you want to delete the template?');">Delete this template</a>
 
-  <a name="tasks"><h4>Tasks</h4></a>
 
-  <include src="/packages/simulation/lib/sim-template-tasks" workflow_id="@workflow_id@" display_mode="edit" >
-  
-<p>
-  <p>TODO: B: Allow reordering of roles, tasks, states.</p>
+          </div>
+        </div>
+      </td>
+      <td valign="top">
+        <div class="portlet">
+          <a name="roles"><h2>Roles</h2></a>
+          <div class="portlet-body">
+            <include src="/packages/simulation/lib/sim-template-roles" workflow_id="@workflow_id@" display_mode="edit">
+          </div>
+        </div>
+      </td>
+    </tr>
 
-  <a href="@spec_url@" class="action">Download a specification for this template</a>
+    <tr>
+      <td valign="top" colspan="2">
+        <div class="portlet">
+          <a name="tasks"><h2>Tasks</h2></a>
+          <div class="portlet-body">
+            <include src="/packages/simulation/lib/sim-template-tasks" workflow_id="@workflow_id@" display_mode="edit" >
+          </div>
+        </div>
+      </td>
+    </tr>
+  </table>
 
-  <if @mark_ready_url@ not nil>
-    <a href="@mark_ready_url@" class="action">Mark this template ready for use</a>
-  </if>
-
-  <if @inst_url@ not nil>
-    <a href="@inst_url@" class="action">Start a simulation with this template</a>
-  </if>
-
-  <a href="@delete_url@" class="action" onclick="return confirm('Are you sure you want to delete the template?');">Delete this template</a>
-
-</if>
+</else>
Index: openacs-4/packages/simulation/lib/sim-template-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-template-tasks.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/simulation/lib/sim-template-tasks.adp	8 Jan 2004 10:50:34 -0000	1.7
+++ openacs-4/packages/simulation/lib/sim-template-tasks.adp	8 Jan 2004 11:03:02 -0000	1.8
@@ -4,3 +4,5 @@
   <formwidget id="formbutton:ok">
 </formtemplate>
 
+<p>TODO: B: Allow reordering of roles, tasks, states.</p>
+
Index: openacs-4/packages/simulation/www/simbuild/template-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/template-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/www/simbuild/template-delete.adp	11 Dec 2003 13:21:53 -0000	1.2
+++ openacs-4/packages/simulation/www/simbuild/template-delete.adp	8 Jan 2004 11:03:02 -0000	1.3
@@ -6,6 +6,4 @@
   You have deleted template "@template_name@".
 </p>
 
-<p>
-  <b>&raquo;</b> <a href="@template_list_url@">Return to template list page</a>
-</p>
+<a href="@template_list_url@" class="action">Return to template list page</a>
Index: openacs-4/packages/simulation/www/simbuild/template-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/template-edit.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/simulation/www/simbuild/template-edit.adp	8 Jan 2004 10:50:34 -0000	1.17
+++ openacs-4/packages/simulation/www/simbuild/template-edit.adp	8 Jan 2004 11:03:02 -0000	1.18
@@ -3,32 +3,56 @@
   <property name="context">@context;noquote@</property>
   <property name="focus">sim_template.pretty_name</property>
 
-<formtemplate id="sim_template"></formtemplate>
+<if @workflow_id@ nil>
+  <!-- Creating -->
+  <formtemplate id="sim_template"></formtemplate>
+</if>
+<else>
+  <!-- Editing -->
+  <table width="100%">
+    <tr>
+      <td valign="top">
+        <div class="portlet">
+          <h2>Template</h2>
+          <div class="portlet-body">
+            <formtemplate id="sim_template"></formtemplate>
+              <a href="@spec_url@" class="action">Download a specification for this template</a>
 
-<if @workflow_id@ not nil>
+              <if @mark_ready_url@ not nil>
+                <a href="@mark_ready_url@" class="action">Mark this template ready for use</a>
+              </if>
 
-  <a name="roles"><h4>Roles</h4></a>
+              <if @inst_url@ not nil>
+                <a href="@inst_url@" class="action">Start a simulation with this template</a>
+              </if>
 
-  <include src="/packages/simulation/lib/sim-template-roles" workflow_id="@workflow_id@" display_mode="edit">
-  <p></p>
+              <a href="@delete_url@" class="action" 
+                onclick="return confirm('Are you sure you want to delete the template?');">Delete this template</a>
 
-  <a name="tasks"><h4>Tasks</h4></a>
 
-  <include src="/packages/simulation/lib/sim-template-tasks" workflow_id="@workflow_id@" display_mode="edit" >
-  
-<p>
-  <p>TODO: B: Allow reordering of roles, tasks, states.</p>
+          </div>
+        </div>
+      </td>
+      <td valign="top">
+        <div class="portlet">
+          <a name="roles"><h2>Roles</h2></a>
+          <div class="portlet-body">
+            <include src="/packages/simulation/lib/sim-template-roles" workflow_id="@workflow_id@" display_mode="edit">
+          </div>
+        </div>
+      </td>
+    </tr>
 
-  <a href="@spec_url@" class="action">Download a specification for this template</a>
+    <tr>
+      <td valign="top" colspan="2">
+        <div class="portlet">
+          <a name="tasks"><h2>Tasks</h2></a>
+          <div class="portlet-body">
+            <include src="/packages/simulation/lib/sim-template-tasks" workflow_id="@workflow_id@" display_mode="edit" >
+          </div>
+        </div>
+      </td>
+    </tr>
+  </table>
 
-  <if @mark_ready_url@ not nil>
-    <a href="@mark_ready_url@" class="action">Mark this template ready for use</a>
-  </if>
-
-  <if @inst_url@ not nil>
-    <a href="@inst_url@" class="action">Start a simulation with this template</a>
-  </if>
-
-  <a href="@delete_url@" class="action" onclick="return confirm('Are you sure you want to delete the template?');">Delete this template</a>
-
-</if>
+</else>