Index: openacs-4/contrib/packages/portal/lib/page-configure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/page-configure.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/lib/page-configure.adp	27 Feb 2004 01:13:14 -0000	1.1
+++ openacs-4/contrib/packages/portal/lib/page-configure.adp	27 Feb 2004 23:58:15 -0000	1.2
@@ -1,50 +1,66 @@
 
-<form method="post" action="portal-configure-2">
-  <br><strong>Page:</strong>
-  <input type="hidden" name="portal_id" value="@portal_id@">
-  <input type="hidden" name="page_id" value="@page_id@">
-  <input type="text" name="name" value="@page.name@">
-  <input type="hidden" name="op" value="rename_page">
-  <input type=submit value="Update">
-</form>
+<table border=0 bgcolor="#eeeeee" width="100%" cellpadding="0" cellspacing="0">
 
-<table bgcolor=#eeeeee border=0 width="100%">
+  <tr>
+    <td align="left" colspan="0">
+      <table>
+        <tr>
+          <td align="left">
+            <form method="post" action="portal-configure-2">
+              <strong>Page:</strong>
+              <input type="hidden" name="portal_id" value="@portal_id@">
+              <input type="hidden" name="page_id" value="@page_id@">
+              <input type="text" name="name" value="@page.name@">
+              <input type="hidden" name="op" value="rename_page">
+              <input type=submit value="Update">
+            </form>
+          </td>
+
+          <if @has_visible_elements_p@ false>
+            <td align="left">
+              <form method="post" action="portal-configure-2">
+                <input type="hidden" name="portal_id" value="@portal_id@">
+                <input type="hidden" name="page_id" value="@page_id@">
+                <input type="hidden" name="op" value="change_layout">
+                <strong>Layout:</strong>
+                <select name="layout_id">
+                  <multiple name="layouts">
+                    <option value="@layouts.layout_id@" <if @layouts.layout_id@ eq @page.layout_id@> selected</if>>@layouts.description@</option>
+                  </multiple>
+                </select>
+                <input type=submit value="Update">
+              </form>
+            </td>
+          </if>
+        </tr>
+      </table>
+    </td>
+  </tr>
+
   <tr width="100%">
     <if @has_visible_elements_p@ false>
       <td>
         <center>
           No Elements on this page
-          <form method="post" action="portal-configure-2">
-            <input type="hidden" name="portal_id" value="@portal_id@">
-            <input type="hidden" name="page_id" value="@page_id@">
-            <input type="hidden" name="op" value="remove_page">
-            <input type="submit" value="Remove Empty Page">
-          </form>
-          <form method="post" action="portal-configure-2">
-            <input type="hidden" name="portal_id" value="@portal_id@">
-            <input type="hidden" name="page_id" value="@page_id@">
-            <input type="hidden" name="op" value="update_layout">
-            <small>
-              <b>Change page layout:</b><br>
-            </small>
-            <select>
-              <multiple name="layouts">
-                <option value="@layouts.layout_id@" <if @layouts.layout_id@ eq @page.layout_id@> selected</if>>@layouts.description@</option>
-              </multiple>
-            <input type=submit value="Change Layout">
-          </form>
+          <if @page.sort_key@ ne 0>
+            <form method="post" action="portal-configure-2">
+              <input type="hidden" name="portal_id" value="@portal_id@">
+              <input type="hidden" name="page_id" value="@page_id@">
+              <input type="hidden" name="op" value="remove_page">
+              <input type="submit" value="Remove Empty Page">
+            </form>
+          </if>
         </center>
       </td>
     </if>
     <else>
       <multiple name="regions">
-        <td valign="top" align="left" width="@region_width@">
+        <td valign="top" align="left" width="@region_width@" bgcolor="#eeeeee">
           <include src="/packages/portal/lib/region-configure"
                    page_list="@page_list@"
                    page_count="@page_count@"
                    region="@regions.region@"
                    region_count="@region_count@">
-        </td>
       </multiple>
     </else>
   </tr>
Index: openacs-4/contrib/packages/portal/sql/oracle/defaults.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/oracle/Attic/defaults.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/sql/oracle/defaults.sql	25 Oct 2002 21:29:17 -0000	1.1
+++ openacs-4/contrib/packages/portal/sql/oracle/defaults.sql	27 Feb 2004 23:58:16 -0000	1.2
@@ -67,8 +67,8 @@
 
     -- Now, some element themes.
     theme_id := portal_theme.new(
-        name => 'simple',
-        description => 'A simple red table-based theme',
+        name => 'standard',
+        description => 'Standard OpenACS theme',
         filename => 'themes/simple-theme',
         resource_dir => 'themes/simple-theme'
     );
Index: openacs-4/contrib/packages/portal/sql/postgresql/defaults.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/Attic/defaults.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/sql/postgresql/defaults.sql	25 Sep 2003 02:12:16 -0000	1.2
+++ openacs-4/contrib/packages/portal/sql/postgresql/defaults.sql	27 Feb 2004 23:58:17 -0000	1.3
@@ -86,7 +86,7 @@
     -- Now, some element themes.
     theme_id := portal_theme__new(
         ''simple'',
-        ''A simple red table-based theme'',
+        ''Standard OpenACS Theme'',
         ''themes/simple-theme'',
         ''themes/simple-theme''
     );
Index: openacs-4/contrib/packages/portal/www/themes/simple-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/themes/Attic/simple-theme.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/www/themes/simple-theme.adp	25 Oct 2002 21:29:17 -0000	1.1
+++ openacs-4/contrib/packages/portal/www/themes/simple-theme.adp	27 Feb 2004 23:58:17 -0000	1.2
@@ -19,54 +19,36 @@
 %>
 
 <!-- Portal Element '@name@' begin -->
-<table class="element" border="0" cellpadding="1" cellspacing="0" width="100%">
-<tr>
-  <td class="element-header-text">
-    <big><strong>@name@</strong></big>
-  </td>
+<table class="portlet" border="0" cellpadding="1" cellspacing="0" width="100%">
+  <tr class="portlet-header">
+    <td>
+      <h2>@name@</h2>
+    </td>
 
-  <td class="element-header-buttons" align="right">
-    <if @shadeable_p@ eq "t">		
-      <a href="configure-element?element_id=@element_id@&amp;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@&amp;op=hide">
-      <img border=0  src="@dir@/x.gif" alt="hide"></a>
-    </if>
-    <if @shadeable_p@ eq "f" and @hideable_p@ eq "f">
-      &nbsp;
-    </if>
-  </td>
-</tr>
+    <td align="right">
+      <if @shadeable_p@ eq "t">		
+        <a href="configure-element?element_id=@element_id@&amp;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@&amp;op=hide">
+        <img border=0  src="@dir@/x.gif" alt="hide"></a>
+      </if>
+      <if @shadeable_p@ eq "f" and @hideable_p@ eq "f">
+        &nbsp;
+      </if>
+    </td>
+  </tr>
 
-<tr>
-  <td colspan="2">
+  <tr>
+    <td class="portlet-body" colspan="2">
+      <slave>
+    </td>
+  </tr>
 
-<table border="0" bgcolor="black" cellpadding="1" cellspacing="0" width="100%">
-<tr>
-<td>
-<table border="0" bgcolor="white" cellpadding="2" cellspacing="0" width="100%">
-<tr>
-<td>
-
-  <!-- Portal Element '@name@' Content begin -->
-    <slave>
-  <!-- Portal Element '@name@' Content end -->
-</td>
-</tr>
 </table>
-
-</td>
-</tr>
-</table>
-
-  </td>
-</tr>
-</table>
-<!-- Portal Element '@name@' end -->