Index: openacs-4/contrib/packages/simulation/www/simplay/control-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/control-bar.adp,v
diff -u -N -r1.17.2.2 -r1.17.2.3
--- openacs-4/contrib/packages/simulation/www/simplay/control-bar.adp	22 Mar 2004 15:49:03 -0000	1.17.2.2
+++ openacs-4/contrib/packages/simulation/www/simplay/control-bar.adp	4 May 2004 09:19:11 -0000	1.17.2.3
@@ -1,36 +1,35 @@
-#simulation.control_bar_current_player#
 
+<div class="simplay_control-bar_you-are">
+You are <a href="@role.character_url@">@role.character_title@</a>
+(@role.role_pretty@)
+</div>
+
+<div class="simplay_control-bar_thumbnail">
 <if @role.thumbnail_url@ not nil>
   <img src="@role.thumbnail_url@" width="@role.thumbnail_width@" height="@role.thumbnail_height@">
 </if>
+</div>
 
 <p>
 
-<if @show_states_p@>
-<h4>#simulation.States#</h4>
-
-<ul>
-  <multiple name="states">
-    <li><if @states.state_id@ eq @states.current_state@><b>@states.pretty_name@</b></if><else>@states.pretty_name@</else></li>
-  </multiple>
+<div class="simplay_control-bar_options">
+<h4>Your Options</if></h4>
+<ul class="action-links">
+<div class="simplay_control-bar_options_case-home"><li><a href="@case_home_url@">Case home</a></div>
+  <li><a href="@messages_url@">@message_count@ message<if @message_count@ ne 1>s</if></a>
+  <li><if @task_count@ eq 1><a href="@tasks_url@">@task_count@ task</a></if><else><a href="@tasks_url@">@task_count@ tasks</a></else>
+  <li><a href="@portfolio_url@">Portfolio</a>
+  <li><a href="@about_sim_url@">About this simulation</a>
+  <li><a href="@notifications_url@">My Notifications</a>
 </ul>
-</if>
+</div>
 
-<h4>#simulation.Your_Options#</if></h4>
+<div class="simplay_control-bar_contacts">
+<h4>Contacts</h4>
 <ul class="action-links">
-  <li><a href="@case_home_url@">#simulation.Case_home#</a>
-  <li><a href="@messages_url@">@message_count@ <if @message_count@ eq 1>#simulation.message#</if><else>#simulation.messages#</else></a>
-  <li><a href="@tasks_url@">@task_count@ <if @task_count@ eq 1>#simulation.task#</if><else>#simulation.tasks#</else></a>
-  <li><a href="@portfolio_url@">#simulation.Portfolio#</a>
-  <li><a href="@about_sim_url@">#simulation.lt_About_this_simulation#</a>
-  <li><a href="@notifications_url@">#simulation.My_Notifications#</a>
-</ul>
-<if @show_contacts_p@>
-<h4>#simulation.Contacts#</h4>
-<ul class="action-links">
   <multiple name="contacts">
     <li><a href="@contacts.character_url@">@contacts.character_title@</a> (@contacts.role_pretty@)</li>
   </multiple>
 </ul>
-</if>
+</div>