Index: openacs-4/www/site-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/www/site-master.adp	24 Jan 2004 16:42:14 -0000	1.14
+++ openacs-4/www/site-master.adp	29 Jan 2004 15:08:13 -0000	1.15
@@ -8,12 +8,6 @@
   <if @focus@ not nil>
     <property name="focus">@focus;noquote@</property>
   </if>
-  <if @context_bar@ not nil>
-    <property name="context_bar">@context_bar;noquote@</property>
-  </if>
-  <if @context@ not nil>
-    <property name="context">@context;noquote@</property>
-  </if>
   <property name="header_stuff">
     @header_stuff;noquote@
     <link rel="stylesheet" type="text/css" href="@css_url@" media="all">
@@ -57,10 +51,17 @@
     </td>
   </tr>
 </table>
-
-<if @sw_admin_p@ true>
+<if @user_messages:rowcount@ gt 0>
+  <div id="general-message">
+    <ul>
+      <multiple name="user_messages">
+        <li>@user_messages.message;noquote@</li>
+      </multiple>
+    </ul>
+  </div>
 </if>
 
+
 <slave>
 
 <if @num_of_locales@ gt 1>
Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/www/site-master.tcl	24 Jan 2004 16:42:14 -0000	1.14
+++ openacs-4/www/site-master.tcl	29 Jan 2004 15:07:48 -0000	1.15
@@ -69,22 +69,6 @@
 
 
 
-# Context bar
-if { [template::util::is_nil no_context_p] } {
-    if { ![template::util::is_nil context] } {
-        set cmd [list ad_context_bar -from_node $subsite_node_id --]
-        foreach elem $context {
-            lappend cmd $elem
-        }
-        set context_bar [eval $cmd]
-    }
-    if [template::util::is_nil context_bar] { 
-        set context_bar [ad_context_bar -from_node $subsite_node_id]
-    }
-} else {
-    set context_bar {}
-}
-
 # change locale
 set num_of_locales [llength [lang::system::get_locales]]
 if { $num_of_locales > 1 } {
@@ -102,3 +86,8 @@
 
 set whos_online_url "[subsite::get_element -element url]shared/whos-online"
 
+#----------------------------------------------------------------------
+# Display user messages
+#----------------------------------------------------------------------
+
+util_get_user_messages -multirow "user_messages"