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.18 -r1.19
--- openacs-4/packages/new-portal/www/themes/simple-theme.adp	9 Aug 2002 20:56:31 -0000	1.18
+++ openacs-4/packages/new-portal/www/themes/simple-theme.adp	1 Oct 2003 14:51:06 -0000	1.19
@@ -18,7 +18,6 @@
 
 %>
 
-<!-- Portal Element '@name@' begin -->
 <table class="element" border="0" cellpadding="1" cellspacing="0" width="100%">
 <tr> 
   <td class="element-header-text">
@@ -66,9 +65,7 @@
 <tr>
 <td>
 
-  <!-- Portal Element '@name@' Content begin -->
     <slave>
-  <!-- Portal Element '@name@' Content end -->
 </td>
 </tr>
 </table>
@@ -80,4 +77,3 @@
   </td>
 </tr>
 </table>
-<!-- Portal Element '@name@' end -->
Index: openacs-4/packages/new-portal/www/themes/sloan-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/sloan-theme.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/new-portal/www/themes/sloan-theme.adp	29 May 2003 18:04:55 -0000	1.3
+++ openacs-4/packages/new-portal/www/themes/sloan-theme.adp	1 Oct 2003 14:51:06 -0000	1.4
@@ -18,41 +18,34 @@
 
 %>
 
-<!-- Portal Element '@name@' begin -->
 <table class="element" border=0 cellpadding="0" cellspacing="0" width="100%">
-<tr> 
-  <td colspan=3 class="element-header-text">
-<bold>      <%= [string toupper @name@] %></bold>
-  </td>
-</tr>
-<tr><td colspan=3 class="dark-line" height="0"><img src="/shared/images/spacer.gif"></td></tr>
-<tr>
-  <td class="light-line" width="1"><img src="/shared/images/spacer.gif" width="1"></td>
-  <td class="element-text" width="100%">
-	<table cellspacing="0" cellpadding="0" class="element-content" width="100%">
-	<tr><td>
-
-		<table border="0" bgcolor="white" cellpadding="0" cellspacing="0" width="100%">
-		<tr>
-		<td class=element-text>
-
-		  <!-- Portal Element '@name@' Content begin -->
-		    <slave>
-		  <!-- Portal Element '@name@' Content end -->
-		</td>
-		</tr>
-		</table>
-
-	</td>
-	</tr>
-	</table>
-  </td>
-	  <td align="right" class="light-line" width="1"><img src="/shared/images/spacer.gif" width="1"></td>
-
-</tr>
-<tr><td colspan=3 class="light-line" width="1"><img src="/shared/images/spacer.gif"></td></tr>
+  <tr> 
+    <td colspan=3 class="element-header-text">
+      <bold><%= [string toupper @name@] %></bold>
+    </td>
+  </tr>
+  <tr><td colspan=3 class="dark-line" height="0"><img src="/resources/acs-subsite/spacer.gif"></td></tr>
+  <tr>
+    <td class="light-line" width="1"><img src="/resources/acs-subsite/spacer.gif" width="1"></td>
+    <td class="element-text" width="100%">
+      <table cellspacing="0" cellpadding="0" class="element-content" width="100%">
+        <tr>
+          <td>
+            <table border="0" bgcolor="white" cellpadding="0" cellspacing="0" width="100%">
+              <tr>
+                <td class=element-text>
+                  <slave>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+    <td align="right" class="light-line" width="1"><img src="/resources/acs-subsite/spacer.gif" width="1"></td>
+  </tr>
+  <tr><td colspan=3 class="light-line" width="1"><img src="/resources/acs-subsite/spacer.gif"></td></tr>
 </table>
-<!-- Portal Element '@name@' end -->