Index: openacs-4/packages/dotlrn/www/dotlrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.adp,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/dotlrn/www/dotlrn-master.adp	27 Sep 2003 22:18:14 -0000	1.28
+++ openacs-4/packages/dotlrn/www/dotlrn-master.adp	28 Sep 2003 01:36:30 -0000	1.29
@@ -71,21 +71,22 @@
 
   <tr><td colspan=3 class="dark-line" height="1"><img src="/resources/dotlrn/spacer.gif"></td></tr>
 
-  <!-- navbars on every page -->
-  <tr><td colspan=3 valign=top>@navbar;noquote@</td></tr>
-  </table>
-  <p>
-  <p>
-
-  <!-- Header End -->
-  
-  <if @display_title@ not nil>
-    <h1>@display_title@</h1>
+  <if @in_dotlrn_p@ true>  
+      <!-- navbars on every page -->
+    <tr><td colspan=3 valign=top>@navbar;noquote@</td></tr>
+    </table>
+    <p>
+    <p>
   </if>
+  <else>
+    </table>
+    <h1>@title@</h1>
+    <if @context_bar@ not nil>
+      <p>@context_bar;noquote@</p>
+    </if>
+  </else>
 
-  <if @context_bar@ not nil>
-    <p>@context_bar;noquote@</p>
-  </if>
+    <!-- Header End -->
 
   <slave>
 
Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/dotlrn/www/dotlrn-master.tcl	27 Sep 2003 22:18:14 -0000	1.22
+++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl	28 Sep 2003 01:36:30 -0000	1.23
@@ -598,7 +598,8 @@
 
 # Hack for title and context bar outside of dotlrn
 
-if { ![string match [ad_conn url] "/dotlrn/*"] && [info exists context] } {
+set in_dotlrn_p [expr [string match "[dotlrn::get_url]/*" [ad_conn url]]]
+
+if { [info exists context] } {
     set context_bar [eval ad_context_bar $context]
-    set display_title $title
 }