Index: openacs-4/packages/new-portal/www/render-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/render-element.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/new-portal/www/render-element.adp	17 Nov 2001 17:37:43 -0000	1.3
+++ openacs-4/packages/new-portal/www/render-element.adp	16 Jan 2002 21:43:36 -0000	1.4
@@ -7,5 +7,7 @@
 <property name="shaded_p">@element.shaded_p@</property>
 <property name="hideable_p">@element.hideable_p@</property>
 <property name="user_editable_p">@element.user_editable_p@</property>
+<property name="link_hideable_p">@element.link_hideable_p@</property>
+<property name="hide_links_p">@hide_links_p@</property>
 
 @element.content@
Index: openacs-4/packages/new-portal/www/layouts/simple2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple2.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/new-portal/www/layouts/simple2.adp	26 Nov 2001 20:27:29 -0000	1.5
+++ openacs-4/packages/new-portal/www/layouts/simple2.adp	16 Jan 2002 21:43:36 -0000	1.6
@@ -4,12 +4,12 @@
     <tr>
       <td valign=top width="50%">
         <list name="element_ids_1">
-          <include src="@element_src@" element_id="@element_ids_1:item@" action_string=@action_string@ theme_id=@theme_id@ region="1" portal_id=@portal_id@ return_url=@return_url@><br>
+          <include src="@element_src@" element_id="@element_ids_1:item@" action_string=@action_string@ theme_id=@theme_id@ region="1" portal_id=@portal_id@ return_url=@return_url@ hide_links_p=@hide_links_p@><br>
         </list>
       </td>
       <td valign=top width="50%">
         <list name="element_ids_2">
-          <include src="@element_src@" element_id="@element_ids_2:item@" action_string=@action_string@ theme_id=@theme_id@ region="2" portal_id=@portal_id@ return_url=@return_url@><br>
+          <include src="@element_src@" element_id="@element_ids_2:item@" action_string=@action_string@ theme_id=@theme_id@ region="2" portal_id=@portal_id@ return_url=@return_url@ hide_links_p=@hide_links_p@><br>
         </list>
       </td>
     </tr>
Index: openacs-4/packages/new-portal/www/themes/deco-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/deco-theme.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/new-portal/www/themes/deco-theme.adp	3 Jan 2002 20:12:26 -0000	1.2
+++ openacs-4/packages/new-portal/www/themes/deco-theme.adp	16 Jan 2002 21:43:36 -0000	1.3
@@ -10,13 +10,18 @@
 <tr>
 <td height="15" background="@dir@/tbl-left.gif" rowspan="2"><img src="@dir@/tbl-left.gif" alt=" " width="11" height="1"></td>
 <td>
-
-	<table cellpadding="0" cellspacing="0" border="0" width="100%">
-              <tbody>
-                <tr>
-                  <td align=left valign=middle width=88%  bgcolor="#eeeee7">
-			<font face="verdana,arial,helvetica" size="+1">
-				<a style="text-decoration: none" href=@link@><b>@name@</b></a></font></td>
+  <table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tbody>
+    <tr>
+    <td align=left valign=middle width=88%  bgcolor="#eeeee7">
+      <font face="verdana,arial,helvetica" size="+1">
+	<if @link_hideable_p@ eq "t" and @hide_links_p@ eq "t">	
+          <b>@name@</b>
+        </if><else>
+          <a style="text-decoration: none" href=@link@><b>@name@</b></a>
+        </else>
+    </font>
+    </td>
 		<if @user_editable_p@ eq "t">	
                   <td align=right width=7%>
 
Index: openacs-4/packages/new-portal/www/themes/nada-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/nada-theme.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/new-portal/www/themes/nada-theme.adp	13 Dec 2001 21:04:40 -0000	1.1
+++ openacs-4/packages/new-portal/www/themes/nada-theme.adp	16 Jan 2002 21:43:36 -0000	1.2
@@ -1,18 +1,27 @@
 
-<!-- The nada theme, I'm a code hero  -->
+<!-- The ''nada'' theme, I'm a ''code'' hero!  -->
 
 <!-- Element: '@name@' begin (text+html) -->
 <table border="0" width="100%" cellpadding="0" cellspacing="0" >
 
 <!-- Title/button bar begin -->
 <tr>
 <td>
-	<table cellpadding="0" cellspacing="0" border="0" width="100%">
-              <tbody>
-                <tr>
-                  <td align=left valign=middle width=88%  bgcolor="#eeeee7">
-			<font face="verdana,arial,helvetica" size="+1">
-				<a style="text-decoration: none" href=@link@><b>@name@</b></a></font></td>
+  <table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tbody>
+    <tr>
+    <td align=left valign=middle width=88%  bgcolor="#eeeee7">
+      <font face="verdana,arial,helvetica" size="+1">
+	<if @link_hideable_p@ eq "t" and @hide_links_p@ eq "t">	
+          <b>@name@</b>
+        </if><else>
+          <a style="text-decoration: none" href=@link@><b>@name@</b></a>
+        </else>
+      </font>
+    </td>
+
+
+
 		<if @user_editable_p@ eq "t">	
                   <td align=right width=7%>
 			<a href=configure-element?element_id=@element_id@&op=edit>[edit]</a></td>
Index: openacs-4/packages/new-portal/www/themes/simple-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/simple-theme.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/new-portal/www/themes/simple-theme.adp	19 Nov 2001 14:46:27 -0000	1.7
+++ openacs-4/packages/new-portal/www/themes/simple-theme.adp	16 Jan 2002 21:43:36 -0000	1.8
@@ -5,10 +5,16 @@
         <table border=0 cellpadding=3 width=100% cellspacing=0>
 	  <tr>
             <td class="portal_header" bgcolor="#cc0000" align=left>
-              <a style="text-decoration: none" href=@link@>
-	      <font face="arial,helvetica" size="+1" color="#cccccc">
-	       <b>@name@</b></font></a>
+              <font size="+1">
+              <if @link_hideable_p@ eq "t" and @hide_links_p@ eq "t">	
+                <b>@name@</b>
+              </if><else>
+                <a style="text-decoration: none" href=@link@><b>@name@</b></a>
+              </else>
+              </font>
             </td>
+         
+
             <td align=right class="portal_header" bgcolor="#cc0000">
 		<!-- include title buttons here -->
 		<if @user_editable_p@ eq "t">