Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.131 -r1.132
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	18 Apr 2002 03:31:11 -0000	1.131
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	22 Apr 2002 00:10:07 -0000	1.132
@@ -21,7 +21,7 @@
 
     @author Arjun Sanyal (arjun@openforce.net)
     @creation-date Sept 2001
-    @cvs-id $Id$
+    @version $Id$
 }
 
 namespace eval portal {
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.9 -r1.10
--- openacs-4/packages/new-portal/www/layouts/simple2.adp	2 Apr 2002 20:22:06 -0000	1.9
+++ openacs-4/packages/new-portal/www/layouts/simple2.adp	22 Apr 2002 00:10:07 -0000	1.10
@@ -18,39 +18,41 @@
 
 %>
 
-  <!-- A simple 2-column thingy. -->
+<!-- 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@" 
-          element_id="@element_ids_1:item@" 
-          action_string=@action_string@ 
-          theme_id=@theme_id@ 
-          region="1"
-          portal_id=@portal_id@ 
-          edit_p=@edit_p@
-          return_url=@return_url@ 
-          hide_links_p=@hide_links_p@ 
-          page_id=@page_id@ 
-          layout_id=@layout_id@><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@ 
-          edit_p=@edit_p@
-          return_url=@return_url@ 
-          hide_links_p=@hide_links_p@ 
-          page_id=@page_id@ 
-          layout_id=@layout_id@> <br>
-        </list>
-      </td>
-    </tr>
-    </table>
+<table border="0" width="100%">
+  <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@"
+                 edit_p="@edit_p@"
+                 return_url="@return_url@"
+                 hide_links_p="@hide_links_p@"
+                 page_id="@page_id@"
+                 layout_id="@layout_id@">
+        <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@"
+                 edit_p="@edit_p@"
+                 return_url="@return_url@"
+                 hide_links_p="@hide_links_p@"
+                 page_id="@page_id@"
+                 layout_id="@layout_id@">
+        <br>
+      </list>
+    </td>
+  </tr>
+</table>
Index: openacs-4/packages/new-portal/www/layouts/simple2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple2.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/new-portal/www/layouts/simple2.tcl	2 Apr 2002 20:22:06 -0000	1.11
+++ openacs-4/packages/new-portal/www/layouts/simple2.tcl	22 Apr 2002 00:10:07 -0000	1.12
@@ -14,13 +14,14 @@
 #  details.
 #
 
-# www/templates/simple2.tcl
+# new-portal/www/layouts/simple2.tcl
+
 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 hte individual portlets to the template in the "element_src" var
+    of the individual portlets to the template in the "element_src" var
 
-    @cvs_id $Id$
+    @version $Id$
 } -properties {
     element_list:onevalue
     element_src:onevalue
@@ -29,15 +30,15 @@
     return_url:onevalue
 }
 
-if { ![info exists action_string]} {
+if {![exists_and_not_null action_string]} {
     set action_string ""
 }
 
-if { ![info exists theme_id]} {
+if {![exists_and_not_null theme_id]} {
     set theme_id ""
 }
 
-if { ![info exists return_url]} {
+if {![exists_and_not_null return_url]} {
     set return_url ""
 }