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.11 -r1.12
--- openacs-4/packages/new-portal/www/themes/simple-theme.adp	18 Feb 2002 05:53:52 -0000	1.11
+++ openacs-4/packages/new-portal/www/themes/simple-theme.adp	6 Mar 2002 05:14:08 -0000	1.12
@@ -1,53 +1,44 @@
-<!-- Element: '@name@' begin (application/x-ats) -->
-    <table border=0 bgcolor=black cellpadding=1 cellspacing=0 width=100% class="portal_border">
-    <tr>
-      <td>
-        <table bgcolor=white border=0 cellpadding=2 width=100% cellspacing=0>
-	  <tr>
-            <td class="portal_header" bgcolor="#cc0000" align=left>
-              <font face=arial,helvetica size="-1" color=#ffffcc link=#ffffcc vlink=#ffffcc>
-              <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>-->
-                 <b>@name@</b>
-              </else>
-              </font>
-            </td>
-         
-            <!-- no title buttons -->
-            <td align=right class="portal_header" bgcolor="#cc0000">
-		<if @user_editable_p@ eq "t">	
-		  <a href=configure-element?element_id=@element_id@&op=edit>
-	          <img border=0 src="@dir@/e.gif" alt="edit"></a>
-		</if>
-		<if @shadeable_p@ eq "t">		
-   		  <a href=configure-element?element_id=@element_id@&op=shade>
-		  <if @shaded_p@ eq "f">
-	            <img border=0 src="@dir@/shade.gif" alt="shade"></a>
-		  </if>
-		  <else>
-	              <img border=0 src="@dir@/unshade.gif" alt="shade"></a>
-		  </else>
-		</if>
-		<if @hideable_p@ eq "t">		
-		  <a href=configure-element?element_id=@element_id@&op=hide>
-		  <img border=0 src="@dir@/x.gif" alt="hide"></a>
-		</if>
-            </td>
-	  </tr>
+<!-- Portal Element '@name@' begin -->
+<table class="element">
+<tr>
+ 
+  <td class="element_header_text">
+    <if @link_hideable_p@ eq "t" and @hide_links_p@ eq "t">	
+      <b>@name@</b>
+    </if>
+    <else>
+      <!-- set up the link; a workaround for now-->
+        <b>@name@</b>
+    </else>
+  </td>
+  
+  <td class="element_header_buttons" align=right>
+    <if @user_editable_p@ eq "t">   
+      <a href="configure-element?element_id=@element_id@&op=edit">
+        <img src="@dir@/e.gif" alt="edit"></a>
+    </if>
+    <if @shadeable_p@ eq "t">		
+      <a href="configure-element?element_id=@element_id@&op=shade">
+        <if @shaded_p@ eq "f">
+          <img src="@dir@/shade.gif" alt="shade"></a>
+	</if>
+	<else>
+          <img src="@dir@/unshade.gif" alt="shade"></a>
+	</else>
+    </if>
+    <if @hideable_p@ eq "t">		
+      <a href="configure-element?element_id=@element_id@&op=hide">
+      <img src="@dir@/x.gif" alt="hide"></a>
+    </if>
+  </td>
+</tr>
 
-          <tr>
-            <td class="portal_body" colspan=2 bgcolor="#ffffff">
-            <font face=arial,helvetica size=-1 color=black>
-<!-- Content: '@name@' begin -->
-	      <slave>
-<!-- Content: '@name@' end -->
-            </font>
-            </td>
-          </tr>
-	</table>
-	</td>
-    </tr>
-  </table>
-<!-- Element: '@name@' end -->
+<tr>
+  <td class="element_content" colspan=2>
+  <!-- Portal Element '@name@' Content begin -->
+    <slave>
+  <!-- Portal Element '@name@' Content end -->
+  </td>
+</tr>
+</table>
+<!-- Portal Element '@name@' end -->