Index: openacs.org-dev/www/templates/community-new-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/community-new-index.adp,v
diff -u -r1.6 -r1.7
--- openacs.org-dev/www/templates/community-new-index.adp	12 Aug 2002 17:10:43 -0000	1.6
+++ openacs.org-dev/www/templates/community-new-index.adp	29 Oct 2002 16:43:10 -0000	1.7
@@ -1,6 +1,5 @@
 <master>
-
-
+<property name="title">OpenACS Community</property>
 <div class="container-left">
 
 <!-- START FORUMS -->
Index: openacs.org-dev/www/templates/default-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/default-content.adp,v
diff -u -r1.8 -r1.9
--- openacs.org-dev/www/templates/default-content.adp	28 Oct 2002 01:05:02 -0000	1.8
+++ openacs.org-dev/www/templates/default-content.adp	29 Oct 2002 16:43:10 -0000	1.9
@@ -2,10 +2,6 @@
 <property name="title">@pa.title@</property>
 <property name="context_bar">@pa.context_bar@</property>
 
-<h2 class="page_title">@pa.title@</h2>
-<span class="context">
-@pa.context_bar@</span>
-<hr noshade />
 <span class="reg">
 <b>@pa.description@</b>
 <br>
Index: openacs.org-dev/www/templates/default-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/default-index.adp,v
diff -u -r1.6 -r1.7
--- openacs.org-dev/www/templates/default-index.adp	28 Oct 2002 01:05:02 -0000	1.6
+++ openacs.org-dev/www/templates/default-index.adp	29 Oct 2002 16:43:10 -0000	1.7
@@ -1,12 +1,7 @@
 <master>
 <property name="title">@pa.title@</property>
 <property name="context_bar">@pa.context_bar@</property>
-<h2 class="page_title">@pa.title@</h2>
-<span class="context">
-@pa.context_bar@
-</span>
-<hr noshade />
-<p>
+
 <if @pa.content@ not nil>
 @pa.content@
 </if>
Index: openacs.org-dev/www/templates/default-index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/default-index.tcl,v
diff -u -r1.3 -r1.4
--- openacs.org-dev/www/templates/default-index.tcl	28 Oct 2002 01:05:02 -0000	1.3
+++ openacs.org-dev/www/templates/default-index.tcl	29 Oct 2002 16:43:10 -0000	1.4
@@ -22,6 +22,4 @@
 etp::get_content_items
 
 set etp_link [etp::get_etp_link]
-#don't show context bar if 2ndlevel page
-#if {[ns_conn urlc] < 2} {set pa(context_bar) ""}
 
Index: openacs.org-dev/www/templates/general-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/general-master.adp,v
diff -u -r1.6 -r1.7
--- openacs.org-dev/www/templates/general-master.adp	28 Oct 2002 20:16:56 -0000	1.6
+++ openacs.org-dev/www/templates/general-master.adp	29 Oct 2002 16:43:10 -0000	1.7
@@ -14,6 +14,9 @@
 </div>
 
 <!-- END HEADER -->
+<if @title@ not nil and @notitle@ nil>
+<h2>@title@</h2>
+</if>
 <if @context_bar@ not nil>
 <span class="context">
 @context_bar@
Index: openacs.org-dev/www/templates/general-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/general-master.tcl,v
diff -u -r1.6 -r1.7
--- openacs.org-dev/www/templates/general-master.tcl	28 Sep 2002 21:22:19 -0000	1.6
+++ openacs.org-dev/www/templates/general-master.tcl	29 Oct 2002 16:43:10 -0000	1.7
@@ -30,13 +30,19 @@
 if [template::util::is_nil signatory] { set signatory    [ad_system_owner] }
 #if ![info exists header_stuff]        { set header_stuff {<link rel="stylesheet" type="text/css" href="/templates/css/main.css">}                }
 append header_stuff {<link rel="stylesheet" type="text/css" href="/templates/css/main.css">}
-if [template::util::is_nil context_bar] { set context_bar "" }
-
-
+if ![template::util::is_nil context] { set context_bar [eval ad_context_bar $context]}
+if [template::util::is_nil context_bar] { set context_bar [ad_context_bar] }
 # Edit This Page - format the etp link for style sheet
 set etp_link [etp::get_etp_link]
 regsub "^<a" $etp_link "<a class=\"top\"" etp_link
 
+
+# clean out title and context bar for index page.
+if {[string equal [ad_conn url] "/"] || [string match /index* [ad_conn url]] || [string equal [ad_conn url] "/community/"]} { 
+    set context_bar {} 
+    set notitle 1
+}
+
 # stuff that is in the stock default-master
 
 template::multirow create attribute key value
Index: openacs.org-dev/www/templates/homepage-new-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/homepage-new-index.adp,v
diff -u -r1.7 -r1.8
--- openacs.org-dev/www/templates/homepage-new-index.adp	28 Oct 2002 01:05:02 -0000	1.7
+++ openacs.org-dev/www/templates/homepage-new-index.adp	29 Oct 2002 16:43:10 -0000	1.8
@@ -1,6 +1,5 @@
 <master>
 <property name="title">@pa.title@</property>
-<property name="context_bar">@pa.context_bar@</property>
 
 <!-- START LEFT PANEL -->
 
Index: openacs.org-dev/www/templates/widgets/header.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/header.adp,v
diff -u -r1.11 -r1.12
--- openacs.org-dev/www/templates/widgets/header.adp	15 Aug 2002 02:15:18 -0000	1.11
+++ openacs.org-dev/www/templates/widgets/header.adp	29 Oct 2002 16:43:20 -0000	1.12
@@ -1,39 +1,72 @@
-<form method="GET" action="/search/search">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-  <tr>
-    <td valign="top" NOWRAP><a href="/"><img src="/templates/slices/alex.gif" width="54" height="58" border="0" alt="Home"><img src="/templates/slices/openacs.gif" width="81" height="58" border="0" alt="Home"></a></td>
-    <td width="100%" valign="top">
-
-<span class="navigation">
-<table bgcolor="#006699" border="0" cellpadding="0" cellspacing="0" width="100%">
-  <tr align="center">
-    <td><img src="/templates/slices/spacer.gif" width="10" height="28" border="0" alt=""></td>
-    <include src="navigation">
-  </tr>
-</table>
+<form method="GET" action="/search/search">
+
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+
+  <tr>
+
+      <td valign="top" NOWRAP><a href="/"><img src="/templates/slices/openacs.gif" width="154" height="68" border="0" alt="Home"></a></td>
+
+    <td width="100%" valign="top">
+
+<span class="navigation">
+
+<table bgcolor="#006699" border="0" cellpadding="0" cellspacing="0" width="100%">
+
+  <tr align="center">
+
+    <td><img src="/templates/slices/spacer.gif" width="10" height="33" border="0" alt=""></td>
+
+    <include src="navigation">
+
+  </tr>
+
+</table>
+
 </span>
 
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-  <tr>
-    <td colspan="4"><img src="/templates/slices/spacer.gif" width="0" height="2" border="0" alt=""></td>
-  </tr>
-  <tr bgcolor="#cccccc" align="center">
-    <td width="1%"><img src="/templates/slices/spacer.gif" width="0" height="28" border="0" alt=""></td>
-    <td width="33%" NOWRAP><span class="statistics"><font size="-5"><include src="statistics"></font></span></td>
-    <td width="33%" NOWRAP><span class="user-status"><include src="user-status"></span></td>
-    <td width="33%" NOWRAP><img src="/templates/slices/spacer.gif" width="0" height="1" border="0" alt="">
-      <font size="1">
-        <span class="search">
-          <input type="text" name="q" maxlength="256">
-          <input type="submit" value="Search">
-        </span>
-      </font>
-    </td>
-  </tr>
-</table>
-
-    </td>
-    <td valign="top" width="8"><img src="/templates/slices/head_upright.gif" width="8" height="28" border="0" alt=""><img src="/templates/slices/spacer.gif" width="8" height="2" border="0" alt=""><img src="/templates/slices/head_lowright.gif" width="8" height="28" border="0" alt=""></td>
-  </tr>
-</table>
-</form>
+
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+
+  <tr>
+
+    <td colspan="4"><img src="/templates/slices/spacer.gif" width="0" height="2" border="0" alt=""></td>
+
+  </tr>
+
+  <tr bgcolor="#eeeeee" align="center">
+
+    <td width="1%"><img src="/templates/slices/spacer.gif" width="1" height="33" border="0" alt=""></td>
+
+    <td width="33%" NOWRAP><span class="statistics"><include src="statistics"></span></td>
+
+    <td width="1%"><img src="/templates/slices/spacer.gif" width="5" height="1" border="0" alt=""></td>
+
+    <include src="user-status">
+
+    <td width="1%"><img src="/templates/slices/spacer.gif" width="5" height="1" border="0" alt=""></td>
+  
+    <td width="10%" NOWRAP>
+
+        <span class="search">
+
+          <input type="text" name="q" maxlength="256">
+
+              </span> </td>
+
+    <td width="1%"><img src="/templates/slices/spacer.gif" width="5" height="1" border="0" alt=""></td>
+
+	<td width="5%" NOWRAP><input type="image" src="/templates/images/search.gif" width="47" height="19" border="0"></td>
+
+  </tr>
+
+</table>
+
+    </td>
+
+      <td valign="top" width="8"><img src="/templates/slices/head_upright.gif" width="8" height="33" border="0" alt=""><img src="/templates/slices/spacer.gif" width="8" height="2" border="0" alt=""><img src="/templates/slices/head_lowright.gif" width="8" height="33" border="0" alt=""></td>
+
+  </tr>
+
+</table>
+
+</form>
\ No newline at end of file
Index: openacs.org-dev/www/templates/widgets/user-status.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/user-status.adp,v
diff -u -r1.3 -r1.4
--- openacs.org-dev/www/templates/widgets/user-status.adp	12 Aug 2002 11:40:39 -0000	1.3
+++ openacs.org-dev/www/templates/widgets/user-status.adp	29 Oct 2002 16:43:20 -0000	1.4
@@ -1,6 +1,22 @@
+              <td width="32%" NOWRAP><span class="user-status">
+
 <if @login_p@ eq 1>
-  logged in as <a href="/pvt/home">@name@</a>&nbsp;&nbsp;&#149;&nbsp;&nbsp;<a href="/register/logout">log out</a>
+logged in as<br><a href="/pvt/home">@name@</a>
 </if>
 <else>
-  <a href="/register/">log in</a>&nbsp;&nbsp;&#149;&nbsp;&nbsp;<a href="/register/">register</a>
-</else>
\ No newline at end of file
+<a href="/register/">Log In</a>
+</else>
+
+</span></td>
+
+              <td width="1%"><img src="/templates/slices/spacer.gif" width="5" height="1" border="0" alt=""></td>
+              <td width="15%" NOWRAP><span class="user-status">
+
+<if @login_p@ eq 1>
+<a href="/register/logout">Log Out</a>
+</if>
+<else>
+  <a href="/register/">Register</a>
+</else>
+
+</span></td>