Index: openacs-4/contrib/packages/simulation/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/Attic/index.adp,v
diff -u -r1.25 -r1.26
--- openacs-4/contrib/packages/simulation/www/index.adp	2 Dec 2003 17:24:32 -0000	1.25
+++ openacs-4/contrib/packages/simulation/www/index.adp	11 Dec 2003 13:21:52 -0000	1.26
@@ -2,29 +2,11 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-
-<div style="margin: 4px; padding: 4px; border: 1px solid black;">
-  <h3><a href="simplay/">SimPlay</a></h3>
-
-  <if @user_id@ ne 0>
-    <include src="/packages/simulation/lib/cases" party_id="@user_id@"/>
-  </if>
-  <else>
-    <u>Log in</u> to see your active cases.
-  </else>
-
-    <include src="/packages/simulation/lib/simulations-available" party_id="@user_id@"/>
-</div>
-
-<div style="margin: 4px; padding: 4px; border: 1px solid black;">
-  <h3><a href="yellow-pages">Yellow Pages</a></h3>
-</div>
-
 <if @citybuild_p@>
 <div style="margin: 4px; padding: 4px; border: 1px solid black;">
   <h3><a href="citybuild/">CityBuild</a></h3>
 
-  <include src="/packages/simulation/lib/sim-objects" size="short" display_mode="display"/>
+  <include src="/packages/simulation/lib/sim-objects-grouped/">
 </div>
 </if>
 
@@ -37,8 +19,26 @@
 </if>
 
 <if @siminst_p@>
-<div style="margin: 4px; padding: 4px; background: lightgray; border: 1px solid
+<div style="margin: 4px; padding: 4px; border: 1px solid
 black;">
   <h3><a href="siminst/">SimInst</a></h3>
+    <include src="/packages/simulation/lib/sim-insts-grouped"/>
 </div>
-</if>
\ No newline at end of file
+</if>
+
+<div style="margin: 4px; padding: 4px; border: 1px solid black;">
+  <h3><a href="simplay/">SimPlay</a></h3>
+
+  <if @user_id@ ne 0>
+    <include src="/packages/simulation/lib/cases" party_id="@user_id@"/>
+  </if>
+  <else>
+    <u>Log in</u> to see your active cases.
+  </else>
+
+    <include src="/packages/simulation/lib/simulations-available" party_id="@user_id@"/>
+</div>
+
+<div style="margin: 4px; padding: 4px; border: 1px solid black;">
+  <h3><a href="yellow-pages">Yellow Pages</a></h3>
+</div>