Index: openacs-4/contrib/packages/portal/portal.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/portal.info,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/portal/portal.info	12 Mar 2004 04:54:02 -0000	1.8
+++ openacs-4/contrib/packages/portal/portal.info	14 Mar 2004 01:16:29 -0000	1.9
@@ -24,7 +24,7 @@
         </callbacks>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="create_private_portals_p"  default="0" description="If set to 1, create private portals for users.  Users will be able to configure their private portal layout (number of pages, portal element placement).  If false, a single portal, edited only by portal package admins, will be created and shared by all visitors."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_theme_name"  default="standard" description="the default theme"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_theme_name"  default="default" description="the default theme"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="full_cache"  default="0" description="The number of seconds to cache a fully rendered portal." section_name="Performance"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="log_datasource_errors_p"  default="1" description="Create an entry in the error log whenever an error occurs while evaluating a datasource." section_name="Debug"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="navbar_class"  default="navbar" description="Use the default (&quot;navbar&quot;) if the parent subsite is configured to use the &quot;plain&quot; style of presentation, &quot;subnavbar&quot; if it configured to use the &quot;tabbed&quot; style of presentation."/>
Index: openacs-4/contrib/packages/portal/lib/layouts/header3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/layouts/Attic/header3.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/layouts/header3.adp	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,47 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+  <!-- A simple 2-column thingy. -->
+  <table border=0 width=100%>
+    <tr>
+      <td colspan=3 valign=top>
+        <list name="element_ids_i1">
+          <include src="@element_src;noquote@" element_id="@element_ids_i1;noquote@" region="i1"><br>
+        </list>
+      </td>
+    </tr>
+    <tr>
+      <td valign=top width="33%">
+        <list name="element_ids_1">
+          <include src="@element_src;noquote@" element_id="@element_ids_1;noquote@" region="1"><br>
+        </list>
+      </td>
+      <td valign=top width="34%">
+        <list name="element_ids_2">
+          <include src="@element_src;noquote@" element_id="@element_ids_2;noquote@" region="2"><br>
+        </list>
+      </td>
+      <td valign=top width="33%">
+        <list name="element_ids_3">
+          <include src="@element_src;noquote@" element_id="@element_ids_3;noquote@" region="3"><br>
+        </list>
+      </td>
+    </tr>
+  </table>
Index: openacs-4/contrib/packages/portal/lib/layouts/header3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/layouts/Attic/header3.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/layouts/header3.tcl	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,25 @@
+#
+#  Copyright (C) 2001, 2002 MIT
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+# www/templates/header3.tcl
+ad_page_contract {
+    @cvs_id $Id: header3.tcl,v 1.1 2004/03/14 01:16:30 donb Exp $
+} -properties {
+    element_list:onevalue
+    element_src:onevalue
+}
+
+portal_layout_elements $element_list
Index: openacs-4/contrib/packages/portal/lib/layouts/simple-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/layouts/Attic/simple-element.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/layouts/simple-element.adp	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,46 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+<!-- Element: '@name@' begin (application/x-ats) -->
+    <table border=0 bgcolor=#CC0000 cellpadding=1 cellspacing=0 width=100% class="portal_border">
+    <tr>
+      <td>
+        <table border=0 cellpadding=3 cellspacing=0 width=100%>
+	  <tr>
+            <td class="portal_header" bgcolor="#CC0000">
+              @name@
+            </td>
+            <td align=right class="portal_header" bgcolor="#CC0000">
+		<!-- include title buttons here -->
+            </td>
+	  </tr>
+
+          <tr>
+            <td class="portal_body" colspan=2 bgcolor="#ffffff">
+<!-- Content: '@name@' begin -->
+	      <slave>
+<!-- Content: '@name@' end -->
+            </td>
+          </tr>
+	</table>
+	</td>
+    </tr>
+  </table>
+<!-- Element: '@name@' end -->
Index: openacs-4/contrib/packages/portal/lib/layouts/simple1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/layouts/Attic/simple1.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/layouts/simple1.adp	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,40 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+  <!-- A simple 1-column thingy. -->
+
+  <table border=0 width="100%">
+    <tr>
+      <td valign=top width="50%">
+        <list name="element_ids_1">
+          <include src="@element_src;noquote@" 
+          element_id="@element_ids_1:item;noquote@" 
+          action_string=@action_string;noquote@ 
+          theme_id=@theme_id;noquote@ 
+          region="1" 
+          portal_id=@portal_id;noquote@ 
+          edit_p=@edit_p;noquote@
+          return_url=@return_url;noquote@ 
+          page_id=@page_id;noquote@ 
+          layout_id=@layout_id;noquote@><br>
+        </list>
+      </td>
+    </tr>
+    </table>
Index: openacs-4/contrib/packages/portal/lib/layouts/simple1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/layouts/Attic/simple1.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/layouts/simple1.tcl	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,42 @@
+#
+#  Copyright (C) 2001, 2002 MIT
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+# www/templates/simple2.tcl
+ad_page_contract {
+    @cvs_id $Id: simple1.tcl,v 1.1 2004/03/14 01:16:30 donb Exp $
+} -properties {
+    element_list:onevalue
+    element_src:onevalue
+    action_string:onevalue
+    theme_id:onevalue
+    return_url:onevalue
+}
+
+if { ![info exists action_string]} {
+    set action_string ""
+}
+
+if { ![info exists theme_id]} {
+    set theme_id ""
+}
+
+if { ![info exists return_url]} {
+    set return_url ""
+}
+
+portal::layout_elements $element_list
+
+ad_return_template
Index: openacs-4/contrib/packages/portal/lib/layouts/simple2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/layouts/Attic/simple2.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/layouts/simple2.adp	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,56 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+<!-- A simple 2-column thingy. -->
+
+<table border="0" width="100%">
+  <tr>
+    <td valign="top" width="50%">
+      <list name="element_ids_1">
+        <include src="@element_src;noquote@"
+                 element_id="@element_ids_1:item;noquote@"
+                 action_string="@action_string;noquote@"
+                 theme_id="@theme_id;noquote@"
+                 region="1"
+                 portal_id="@portal_id;noquote@"
+                 edit_p="@edit_p;noquote@"
+                 return_url="@return_url;noquote@"
+                 page_id="@page_id;noquote@"
+                 layout_id="@layout_id;noquote@">
+        <br>
+      </list>
+    </td>
+    <td valign="top" width="50%">
+      <list name="element_ids_2">
+        <include src="@element_src;noquote@"
+                 element_id="@element_ids_2:item;noquote@"
+                 action_string="@action_string;noquote@"
+                 theme_id="@theme_id;noquote@"
+                 region="2"
+                 portal_id="@portal_id;noquote@"
+                 edit_p="@edit_p;noquote@"
+                 return_url="@return_url;noquote@"
+                 page_id="@page_id;noquote@"
+                 layout_id="@layout_id;noquote@">
+        <br>
+      </list>
+    </td>
+  </tr>
+</table>
Index: openacs-4/contrib/packages/portal/lib/layouts/simple2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/layouts/Attic/simple2.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/layouts/simple2.tcl	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,45 @@
+#
+#  Copyright (C) 2001, 2002 MIT
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+ad_page_contract {
+    This is a simple 2 column layout called from portal::render and the like. 
+    It laysout the elements with portal::layout_elements and hands off rendering
+    of the individual portlets to the template in the "element_src" var
+
+    @version $Id: simple2.tcl,v 1.1 2004/03/14 01:16:30 donb Exp $
+} -properties {
+    element_list:onevalue
+    element_src:onevalue
+    action_string:onevalue
+    theme_id:onevalue
+    return_url:onevalue
+}
+
+if {![exists_and_not_null action_string]} {
+    set action_string ""
+}
+
+if {![exists_and_not_null theme_id]} {
+    set theme_id ""
+}
+
+if {![exists_and_not_null return_url]} {
+    set return_url ""
+}
+
+portal::layout_elements $element_list
+
+ad_return_template
Index: openacs-4/contrib/packages/portal/lib/layouts/simple3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/layouts/Attic/simple3.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/layouts/simple3.adp	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,71 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+<!-- A simple 3-column layout. -->
+
+<table border="0" width="100%">
+  <tr>
+    <td valign="top" width="33%">
+      <list name="element_ids_1">
+        <include src="@element_src;noquote@"
+                 element_id="@element_ids_1:item;noquote@"
+                 action_string="@action_string;noquote@"
+                 theme_id="@theme_id;noquote@"
+                 region="1"
+                 portal_id="@portal_id;noquote@"
+                 edit_p="@edit_p;noquote@"
+                 return_url="@return_url;noquote@"
+                 page_id="@page_id;noquote@"
+                 layout_id="@layout_id;noquote@">
+        <br>
+      </list>
+    </td>
+    <td valign="top" width="33%">
+      <list name="element_ids_2">
+        <include src="@element_src;noquote@"
+                 element_id="@element_ids_2:item;noquote@"
+                 action_string="@action_string;noquote@"
+                 theme_id="@theme_id;noquote@"
+                 region="2"
+                 portal_id="@portal_id;noquote@"
+                 edit_p="@edit_p;noquote@"
+                 return_url="@return_url;noquote@"
+                 page_id="@page_id;noquote@"
+                 layout_id="@layout_id;noquote@">
+        <br>
+      </list>
+    </td>
+    <td valign="top" width="33%">
+      <list name="element_ids_3">
+        <include src="@element_src;noquote@"
+                 element_id="@element_ids_3:item;noquote@"
+                 action_string="@action_string;noquote@"
+                 theme_id="@theme_id;noquote@"
+                 region="3"
+                 portal_id="@portal_id;noquote@"
+                 edit_p="@edit_p;noquote@"
+                 return_url="@return_url;noquote@"
+                 page_id="@page_id;noquote@"
+                 layout_id="@layout_id;noquote@">
+        <br>
+      </list>
+    </td>
+  </tr>
+</table>
Index: openacs-4/contrib/packages/portal/lib/layouts/simple3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/layouts/Attic/simple3.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/layouts/simple3.tcl	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,48 @@
+#
+#  Copyright (C) 2001, 2002 MIT
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+ad_page_contract {
+    This is a simple 3 column layout called from portal::render and the like. 
+    It lays out the elements with portal::layout_elements and hands off
+    rendering of the individual portlets to the template in the
+    "element_src" var
+
+    @author arjun@openforce.net
+    @author yon@openforce.net
+    @version $Id: simple3.tcl,v 1.1 2004/03/14 01:16:30 donb Exp $
+} -properties {
+    element_list:onevalue
+    element_src:onevalue
+    action_string:onevalue
+    theme_id:onevalue
+    return_url:onevalue
+}
+
+if {![exists_and_not_null action_string]} {
+    set action_string ""
+}
+
+if {![exists_and_not_null theme_id]} {
+    set theme_id ""
+}
+
+if {![exists_and_not_null return_url]} {
+    set return_url ""
+}
+
+portal::layout_elements $element_list
+
+ad_return_template
Index: openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-element.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-element.adp	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,35 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+<master src="@element.filename@">
+<property name="header_stuff">
+  <link rel="stylesheet" type="text/css" href="/resources/portal/@element.resource_dir@/portal.css" media="all"/>
+</property>
+<property name="name">@element.name;noquote@</property>
+<property name="dir">@element.resource_dir;noquote@</property>
+<property name="element_id">@element.element_id;noquote@</property>
+<property name="shadeable_p">@element.shadeable_p;noquote@</property>
+<property name="shaded_p">@element.shaded_p;noquote@</property>
+<property name="hideable_p">@element.hideable_p;noquote@</property>
+
+<ul>
+<li><b>@element.name@</b><br>
+<li><include src="@element.template_path@" cf="@element.config@">
+</ul>
Index: openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-element.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-element.tcl	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,34 @@
+#
+#  Copyright (C) 2001, 2002 MIT
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+# www/render-element.tcl
+
+ad_page_contract {
+    Render an element.
+
+    @author Don Baccus (dhogaza@pacifier.com)
+    @creation-date
+    @cvs_id $Id: render-element.tcl,v 1.1 2004/03/14 01:16:30 donb Exp $
+} -properties {
+    element_id:onevalue
+    region:onevalue
+}
+
+# we get element_id, action_string, theme_id, region, portal_id,
+
+# Get all the good stuff we need to render this sucker
+array set element [portal::element::get_render_data -element_id $element_id]
+
Index: openacs-4/contrib/packages/portal/lib/render-styles/individual/render-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/render-styles/individual/render-element.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/render-styles/individual/render-element.adp	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,32 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+<master src="@element.filename@">
+<property name="header_stuff">
+  <link rel="stylesheet" type="text/css" href="/resources/portal/@element.resource_dir@/portal.css" media="all"/>
+</property>
+<property name="name">@element.name;noquote@</property>
+<property name="dir">@element.resource_dir;noquote@</property>
+<property name="element_id">@element.element_id;noquote@</property>
+<property name="shadeable_p">@element.shadeable_p;noquote@</property>
+<property name="shaded_p">@element.shaded_p;noquote@</property>
+<property name="hideable_p">@element.hideable_p;noquote@</property>
+
+<include src="@element.template_path@" cf="@element.config@">
Index: openacs-4/contrib/packages/portal/lib/render-styles/individual/render-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/render-styles/individual/render-element.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/render-styles/individual/render-element.tcl	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,32 @@
+#
+#  Copyright (C) 2001, 2002 MIT
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+# www/render-element.tcl
+ad_page_contract {
+
+    Render a portal element.
+
+    @author Don Baccus (dhogaza@pacifier.com)
+    @creation-date
+    @cvs_id $Id: render-element.tcl,v 1.1 2004/03/14 01:16:30 donb Exp $
+
+}
+
+# we get element_id, action_string, theme_id, region, portal_id,
+# edit_p, return_url, page_id, and layout_id from the layout_template
+
+# Get all the good stuff we need to render this sucker
+array set element [portal::element::get_render_data -element_id $element_id -edit_p $edit_p]
Index: openacs-4/contrib/packages/portal/lib/render-styles/individual/render-page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/render-styles/individual/render-page.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/render-styles/individual/render-page.adp	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,9 @@
+<if @elements_exist_p@>
+  <include src="@page.layout_filename;noquote@"
+           element_list="@page.element_list;noquote@"
+           element_src="@page.element_src;noquote@"
+           portal_id="@page.portal_id@"
+           edit_p="@edit_p@"
+           page_id="@page_id@"
+           layout_id="@page.layout_id@">
+</if>
Index: openacs-4/contrib/packages/portal/lib/render-styles/individual/render-page.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/render-styles/individual/render-page.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/render-styles/individual/render-page.tcl	14 Mar 2004 01:16:30 -0000	1.1
@@ -0,0 +1,35 @@
+#
+#  Copyright (C) 2001, 2002 MIT
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+# render-page.tcl
+
+ad_page_contract {
+
+    Render a portal page.
+
+    This is intended to be included, not called directly, with the following parameters
+    defined:
+
+    @param page_id The portal the page belongs to
+
+    @author Don Baccus (dhogaza@pacifier.com)
+    @creation-date 2004/01/24
+    @cvs_id $Id: render-page.tcl,v 1.1 2004/03/14 01:16:30 donb Exp $
+
+}
+
+array set page [portal::page::get_render_data -page_id $page_id]
+set elements_exist_p [expr {[llength $page(element_list)] > 0}]
Index: openacs-4/contrib/packages/portal/lib/themes/deco-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/themes/deco-theme.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/themes/deco-theme.adp	14 Mar 2004 01:16:31 -0000	1.1
@@ -0,0 +1,83 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+
+<!-- Element: '@name@' begin (text+html) -->
+<table border="0" width="100%" cellpadding="0" cellspacing="0" >
+<tr> <td width="11" height="11" background="@dir@/tbl-tleft.gif"><img src="@dir@/tbl-tleft.gif" alt=" " width="11" height="11"></td>
+<td width="100%" align="center" valign="top" background="@dir@/tbl-top.gif"><img src="@dir@/tbl-top.gif" alt=" " width="1" height="11"></td>
+<td width="11" background="@dir@/tbl-tright.gif"><img src="@dir@/tbl-tright.gif" alt=" " width="11" height="11"></td>
+</tr>
+
+<!-- Title/button bar begin -->
+<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"><b>@name@</b></font>
+    </td>
+		<if @shadeable_p@ eq "t">		
+                  <td align=right width=7%>
+		    <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></td>
+		    </if><else>
+		    <img border=0 src="@dir@/unshade.gif" alt="unshade"></a></td>
+		    </else>
+		</if>
+
+		<if @hideable_p@ eq "t">		
+                  <td align=right width=7%>
+			<a href=configure-element?element_id=@element_id@&op=hide><img border=0 src="@dir@/x.gif" alt="hide"></a></td>
+		</if>
+
+                </tr>
+              </tbody>
+            </table>
+
+</td>
+
+<!-- title/button bar end -->
+
+
+
+<td background="@dir@/tbl-right.gif" rowspan="2"><img src="@dir@/tbl-right.gif" alt=" " width="11" height="1"></td>
+</tr>
+<tr>
+<td align="left" valign="middle" bgcolor="#ffffff">
+<br>
+<font face="verdana,arial,helvetica" color="#333333">
+<!-- Content: '@name@' begin -->
+<slave>
+<!-- Content: '@name@' end @dir@ -->
+</font>
+</td>
+</tr>
+<tr>
+<td height="11" background="@dir@/tbl-bleft.gif"><img src="@dir@/tbl-bleft.gif" alt=" " width="11" height="11"></td>
+<td align="center" valign="top" background="@dir@/tbl-bottom.gif"><img src="@dir@/tbl-bottom.gif" alt=" " width="1" height="11"></td>
+<td background="@dir@/tbl-bright.gif"><img src="@dir@/tbl-bright.gif" alt=" " width="11" height="11"></td>
+</tr>
+</table>
+
+<!-- Element: '@name@' end -->
Index: openacs-4/contrib/packages/portal/lib/themes/nada-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/themes/nada-theme.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/themes/nada-theme.adp	14 Mar 2004 01:16:31 -0000	1.1
@@ -0,0 +1,74 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+
+<!-- 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 class="element-header-text-plain">
+      <big><strong>@name@</strong></big>
+    </td>
+
+    <td class="element-header-buttons-plain">
+
+      <if @shadeable_p@ eq "t">		
+        <a href=configure-element?element_id=@element_id@&op=shade>
+          <if @shaded_p@ eq "f">
+            [shade]</a>
+          </if>
+          <else>
+            [unshade]</a>
+          </else>
+      </if>
+
+      <if @hideable_p@ eq "t">		
+        <a href=configure-element?element_id=@element_id@&op=hide> [hide]</a>
+      </if>
+
+    </td>
+
+    </tr>
+
+    </tbody>
+
+  </table>
+
+</td>
+<!-- title/button bar end -->
+</tr>
+<tr>
+  <td align="left" valign="middle" bgcolor="#ffffff">
+  <br>
+  <!-- Content: '@name@' begin -->
+  <slave>
+  <!-- Content: '@name@' end @dir@ -->
+  </td>
+</tr>
+</table>
+
+<!-- Element: '@name@' end -->
Index: openacs-4/contrib/packages/portal/lib/themes/raw-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/themes/raw-theme.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/themes/raw-theme.adp	14 Mar 2004 01:16:31 -0000	1.1
@@ -0,0 +1,21 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+<slave>
Index: openacs-4/contrib/packages/portal/lib/themes/sloan-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/themes/sloan-theme.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/themes/sloan-theme.adp	14 Mar 2004 01:16:31 -0000	1.1
@@ -0,0 +1,59 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 OpenForce, Inc.
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+<!-- 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="/resources/spacer.gif"></td></tr>
+<tr>
+  <td class="light-line" width="1"><img src="/resources/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="/resources/spacer.gif" width="1"></td>
+
+</tr>
+<tr><td colspan=3 class="light-line" width="1"><img src="/resources/spacer.gif"></td></tr>
+</table>
+<!-- Portal Element '@name@' end -->
+
+
+
+
Index: openacs-4/contrib/packages/portal/lib/themes/standard-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/themes/standard-theme.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/themes/standard-theme.adp	14 Mar 2004 01:16:31 -0000	1.1
@@ -0,0 +1,54 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+<!-- Portal Element '@name@' begin -->
+<table class="portlet" border="0" cellpadding="1" cellspacing="0" width="100%">
+  <tr class="portlet-header">
+    <td>
+      <h2>@name@</h2>
+    </td>
+
+    <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 class="portlet-body" colspan="2">
+      <slave>
+    </td>
+  </tr>
+
+</table>
Index: openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl	12 Mar 2004 04:54:04 -0000	1.5
+++ openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl	14 Mar 2004 01:16:31 -0000	1.6
@@ -20,6 +20,86 @@
             }
         }
     }
+
+    # Now define some default layouts.
+
+    set var_list {
+        {name 1_column}
+        {description "One column"}
+        {filename layouts/simple1}
+    }
+    set layout_id [package_instantiate_object -var_list $var_list portal_layout]
+
+    set var_list [list \
+        [list layout_id $layout_id] \
+        [list region 1]]
+    package_exec_plsql -var_list $var_list portal_layout add_region
+
+    set var_list {
+        {name 2_column}
+        {description "Two columns"}
+        {filename layouts/simple2}
+    }
+    set layout_id [package_instantiate_object -var_list $var_list portal_layout]
+
+    set var_list [list \
+        [list layout_id $layout_id] \
+        [list region 1]]
+    package_exec_plsql -var_list $var_list portal_layout add_region
+
+    set var_list [list \
+        [list layout_id $layout_id] \
+        [list region 2]]
+    package_exec_plsql -var_list $var_list portal_layout add_region
+
+    set var_list {
+        {name 3_column}
+        {description "Three columns"}
+        {filename layouts/simple3}
+    }
+    set layout_id [package_instantiate_object -var_list $var_list portal_layout]
+
+    set var_list [list \
+        [list layout_id $layout_id] \
+        [list region 1]]
+    package_exec_plsql -var_list $var_list portal_layout add_region
+
+    set var_list [list \
+        [list layout_id $layout_id] \
+        [list region 2]]
+    package_exec_plsql -var_list $var_list portal_layout add_region
+
+    set var_list [list \
+        [list layout_id $layout_id] \
+        [list region 3]]
+    package_exec_plsql -var_list $var_list portal_layout add_region
+
+    # And some themes
+
+    set var_list {
+        {name default}
+        {description "Default OpenACS Theme"}
+        {filename themes/standard-theme}
+        {resource_dir themes/standard-theme}
+    }
+    package_instantiate_object -var_list $var_list portal_theme
+
+    set var_list {
+        {name blank}
+        {description "No graphics"}
+        {filename themes/nada-theme}
+        {resource_dir themes/nada-theme}
+    }
+    package_instantiate_object -var_list $var_list portal_theme
+
+    set var_list {
+        {name deco}
+        {description "An Art Deco Theme"}
+        {filename themes/deco-theme}
+        {resource_dir themes/deco-theme}
+    }
+    package_instantiate_object -var_list $var_list portal_theme
+    
 }
 
 ad_proc portal::install::package_uninstall {} {
Index: openacs-4/contrib/packages/portal/tcl/element-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/element-procs.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/contrib/packages/portal/tcl/element-procs.tcl	12 Mar 2004 04:54:04 -0000	1.11
+++ openacs-4/contrib/packages/portal/tcl/element-procs.tcl	14 Mar 2004 01:16:31 -0000	1.12
@@ -417,7 +417,7 @@
                 -portal_id [portal::page::get_portal_id -page_id $element(page_id)] \
             ] \
         ]
-        set element(filename) "[portal::www_path]/$theme(filename)"
+        set element(filename) "/packages/portal/lib/$theme(filename)"
         set element(resource_dir) "/resources/portal/$theme(resource_dir)"
 
         if {!$edit_p} {
Index: openacs-4/contrib/packages/portal/tcl/page-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/page-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/portal/tcl/page-procs.tcl	29 Jan 2004 03:50:59 -0000	1.5
+++ openacs-4/contrib/packages/portal/tcl/page-procs.tcl	14 Mar 2004 01:16:32 -0000	1.6
@@ -165,9 +165,9 @@
         array set page [get -page_id $page_id]
         set layout_id [get_layout_id -page_id $page_id]
         db_1row layout_select {}
-        set page(layout_filename) "[portal::www_path]/$layout_filename"
+        set page(layout_filename) "/packages/portal/lib/$layout_filename"
 
-        set page(element_src) "[portal::www_path]/render-styles/${render_style}/render-element"
+        set page(element_src) "/packages/portal/lib/render-styles/${render_style}/render-element"
         db_foreach element_select {} -column_array entry {
             lappend element_ids($entry(region)) $entry(element_id)
         } if_no_rows {
Index: openacs-4/contrib/packages/portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/portal-procs.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	13 Mar 2004 00:40:26 -0000	1.18
+++ openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	14 Mar 2004 01:16:32 -0000	1.19
@@ -27,14 +27,6 @@
 
 namespace eval portal {
 
-    # work around for template::util::url_to_file
-    ad_proc -private www_path {} {
-        returns the path of the www dir of the portal package. we need this for
-        stupid template tricks.
-    } {
-        return "/packages/portal/www"
-    }
-
     ad_proc -public mount_point {} {
         caches the mount point
     } {
@@ -55,6 +47,7 @@
         {-page_list {{{Page 1} 2_column}}}
         {-owner_privileges {read write admin}}
         {-initialize_elements:boolean}
+        {-theme_name ""}
     } {
         Create a new portal for the passed in owner_id. create pages passed in
         the page_list.
@@ -70,20 +63,27 @@
           would make sense to only grant read to the party directly.
         @initialize_elements_p If true and template_id is set, initialize elements after
           copying.
+        @theme_name The theme to assign to this portal (defaults to the package's
+          default_theme_name)
 
     } {
 
         if { [string equal $context_id ""] } {
             set context_id [ad_conn package_id]
         }
 
+        if { [string equal $theme_name ""] } {
+            set theme_name [parameter::get -parameter default_theme_name]
+        }
+
         db_transaction {
 
             set var_list [subst {
                 {name $name}
                 {template_id $template_id}
                 {context_id $context_id}
                 {owner_id $owner_id}
+                {theme_id [portal::theme::get_id -name $theme_name]}
                 {package_id [ad_conn package_id]}}]
 
             set portal_id [package_instantiate_object -var_list $var_list portal]
@@ -269,7 +269,7 @@
         # get the portal and layout
         db_1row portal_select {} -column_array portal
         set page_id $portal(page_id)
-        set portal(page_src) "[www_path]/render-styles/${render_style}/render-page"
+        set portal(page_src) "/packages/portal/lib/render-styles/${render_style}/render-page"
         return [array get portal]
     }
 
@@ -693,11 +693,11 @@
      
             # create the master template
 
-            portal::new -owner_id 0 -owner_privileges {}
+            portal::new -name "Shared Portal" -owner_id 0 -owner_privileges {}
      
             # create the admin template
 
-            portal::new -owner_id [ad_conn package_id] -owner_privileges {}
+            portal::new -name "Administration" -owner_id [ad_conn package_id] -owner_privileges {}
     
         }
     }
Index: openacs-4/contrib/packages/portal/tcl/theme-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/theme-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/portal/tcl/theme-procs.tcl	27 Feb 2004 01:13:15 -0000	1.3
+++ openacs-4/contrib/packages/portal/tcl/theme-procs.tcl	14 Mar 2004 01:16:32 -0000	1.4
@@ -42,4 +42,16 @@
         return [array get theme]
     }
 
+    ad_proc -public get_id {
+        {-name:required}
+    } {
+        Return a theme's id
+ 
+        @name The name of the theme
+        @return The theme_id
+
+    } {
+        return [db_string select_theme_id {}]
+    }
+
 }
Index: openacs-4/contrib/packages/portal/tcl/theme-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/theme-procs.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/portal/tcl/theme-procs.xql	27 Feb 2004 01:13:15 -0000	1.4
+++ openacs-4/contrib/packages/portal/tcl/theme-procs.xql	14 Mar 2004 01:16:32 -0000	1.5
@@ -10,4 +10,12 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="portal::theme::get_id.select_theme_id">
+        <querytext>
+            select theme_id
+            from portal_themes
+            where name = :name
+        </querytext>
+    </fullquery>
+
 </queryset>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/header3.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/header3.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/simple-element.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/simple1.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/simple1.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/simple2.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/simple2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/simple3.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/simple3.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/title-buttons.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/title-buttons.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/components/header3/example.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/components/simple-element/example.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/components/simple2/example.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/layouts/components/simple3/example.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/render-styles/all-in-one/render-element.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/render-styles/all-in-one/render-element.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/render-styles/individual/render-element.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/render-styles/individual/render-element.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/render-styles/individual/render-page.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/render-styles/individual/render-page.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/packages/portal/www/resources/themes/standard-theme/shade.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/resources/themes/standard-theme/shade.gif,v
diff -u
Binary files differ
Index: openacs-4/contrib/packages/portal/www/resources/themes/standard-theme/unshade.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/resources/themes/standard-theme/unshade.gif,v
diff -u
Binary files differ
Index: openacs-4/contrib/packages/portal/www/resources/themes/standard-theme/x.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/resources/themes/standard-theme/x.gif,v
diff -u
Binary files differ
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/themes/deco-theme.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/themes/nada-theme.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/themes/raw-theme.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/themes/simple-theme.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/themes/sloan-theme.adp'.
Fisheye: No comparison available.  Pass `N' to diff?