Index: openacs-4/packages/simulation/www/simplay/control-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/control-bar.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/simulation/www/simplay/control-bar.adp	30 Nov 2004 21:30:41 -0000	1.21
+++ openacs-4/packages/simulation/www/simplay/control-bar.adp	31 Oct 2006 09:00:06 -0000	1.22
@@ -1,28 +1,34 @@
 
-<div class="simplay_control-bar_you-are">
+<div class="simplay_control-bar_block">
+<p>
 #simulation.You_are# <a href="@role.character_url@">@role.character_title@</a>
 (@role.role_pretty@)
-</div>
+</p>
 
+
 <div class="simplay_control-bar_thumbnail">
 <if @role.thumbnail_url@ not nil>
+<p>
   <img src="@role.thumbnail_url@" width="@role.thumbnail_width@" height="@role.thumbnail_height@">
+</p>
 </if>
 </div>
 
 <if @show_states_p@>
 <p><strong>@curr_state@:</strong> @state_name@</p>
 </if>
 
-<div class="simplay_control-bar_options">
-<h4>#simulation.Your_Options#</if></h4>
+</div>
+
+<div class="simplay_control-bar_block">
+<h4>#simulation.Your_Options#</h4>
 <ul class="action-links">
-<li class="simplay_control-bar_options_case-home"><strong>
+<li><strong>
 <if @case_home_url@ ne @current_url@>
 <a href="@case_home_url@">#simulation.Session_Home#</a>
 </if>
 <else>
-#simulation.Home#
+#simulation.Session_Home#
 </else>
 </strong>
 </li>
@@ -31,9 +37,10 @@
 <a href="@messages_url@">#simulation.Messages# [@message_count@]</a>
 </li>
   <li><a href="@tasks_url@">#simulation.Tasks# [@task_count@]</a></li>
+  <li><a href="@portfolio_url@">#simulation.Portfolio#</a></li>
   <li><a href="@map_url@">#simulation.Sieberdam_Map#</a></li>
   <li><a href="@yp_url@">#simulation.Yellow_Pages#</a></li>
-  <li><a href="@portfolio_url@">#simulation.Portfolio#</a></li>
+  <li><a href="@history_url@">#simulation.Sieberdam_History#</a></li>
   <li><a href="@about_sim_url@">#simulation.lt_About_this_simulation#</a></li>
   <li><a href="@notifications_url@">#simulation.Notifications#</a></li>
   <li><a href="@help_url@">#simulation.Simplay_Help#</a></li>
@@ -42,7 +49,7 @@
 </div>
 
 <if @show_contacts_p@>
-<div class="simplay_control-bar_contacts">
+<div class="simplay_control-bar_block">
 <h4>#simulation.Contacts#</h4>
 <ul class="action-links">
   <multiple name="contacts">
@@ -51,5 +58,3 @@
 </ul>
 </div>
 </if>
-
-