Index: openacs-4/packages/new-portal/sql/oracle/defaults.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/defaults.sql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/new-portal/sql/oracle/defaults.sql	14 Nov 2001 19:49:20 -0000	1.12
+++ openacs-4/packages/new-portal/sql/oracle/defaults.sql	13 Dec 2001 21:10:02 -0000	1.13
@@ -55,16 +55,22 @@
 
 	theme_id := portal_element_theme.new (
 		name => 'simple',
-		description => 'A simple red box theme',
+		description => 'A simple red table-based theme',
 		filename => 'themes/simple-theme',
 		resource_dir => 'themes/simple-theme');
 
 	theme_id := portal_element_theme.new (
-		name => 'window',
-		description => 'An Art Deco-esque theme',
-		filename => 'themes/window-theme',
-		resource_dir => 'themes/window-theme');
+		name => 'deco',
+		description => 'An Art Deco theme',
+		filename => 'themes/deco-theme',
+		resource_dir => 'themes/deco-theme');
 
+	theme_id := portal_element_theme.new (
+		name => 'nada',
+		description => 'The un-theme. No graphics.',
+		filename => 'themes/nada-theme',
+		resource_dir => 'themes/nada-theme');
+
 end;
 /
 
Index: openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql	11 Dec 2001 04:36:10 -0000	1.31
+++ openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql	13 Dec 2001 21:10:02 -0000	1.32
@@ -161,6 +161,11 @@
 -- No securtiy checks are done here. If you can view and bind to a DS you have
 -- a PE for it.
 
+-- this sequence is only used for swapping sort keys so that we
+-- don't abuse the acs_object_id_seq
+create sequence portal_element_map_sk_seq start with 1;
+
+
 create table portal_element_map (
 	element_id		integer
 				constraint p_element_map_element_id_pk
@@ -179,7 +184,7 @@
 	state			varchar(6) default 'full'
 				constraint p_element_map_state
 				check(state in ('full', 'shaded', 'hidden', 
-					        'locked')),
+					        'pinned')),
  	-- Two elements may not exist in the same place on a portal.
 	constraint p_element_map_pid_rgn_srt_un 
 	unique(portal_id,region,sort_key),
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.84 -r1.85
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	12 Dec 2001 19:25:20 -0000	1.84
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	13 Dec 2001 21:10:02 -0000	1.85
@@ -58,14 +58,34 @@
     # Special Hacks
     #
 
-    # Work around for template::util::url_to_file 
+    # The mangement is not responsible for the results of multi-mounting
+
+    ad_proc -private  package_key {} {
+	Returns the package_key
+    } { 
+        return "new-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
-    } { return "/packages/new-portal/www"  }
+	Returns the path of the www dir of the portal package. We
+        need this for stupid template tricks.
+    } { 
+        return "/packages/[package_key]/www"
+    }
 
-    # Work around for template::util::url_to_file 
-    ad_proc -private  mount_point {} {
-	Returns the mount point - XXX fixme
+    ad_proc -public  mount_point {} {
+	Returns the mount point of the portal package. 
+        Sometimes we need to know this for like <include>ing 
+        templates from tcl
+    } { 
+        return [site_nodes::get_info -return param \
+                -param url \
+                -package_key [package_key]]
+    }
+
+    ad_proc -public  automount_point {} {
+        packages such as dotlrn can automount the portal here
     } { return "/portal"  }
     
     #
@@ -189,7 +209,7 @@
 	but a template::multirow isn't really well suited to data of this
 	shape. It'll setup a set of variables, $var_stub_1 - $var_stub_8
 	and $var_stub_i1- $var_stub_i8, each contining the portal_ids that
-	belong in that region.
+	belong in that region. - Ian Baker
 
 	AKS: XXX improve me
 	
@@ -387,19 +407,19 @@
 		
 		db_dml update_theme {}
 	    }
-	    "toggle_lock" {
+	    "toggle_pinned" {
 		set element_id [ns_set get $form element_id]
 
-		if {[db_string toggle_lock_select {}] == "full"} {
+		if {[db_string toggle_pinned_select {}] == "full"} {
 		    
-                    db_dml toggle_lock_update_1 {}
+                    db_dml toggle_pinned_update_pin {}
 
-                    # "locked" implies not user hideable, shadable
+                    # "pinned" implies not user hideable, shadable
 		    set_element_param $element_id "hideable_p" "f"
 		    set_element_param $element_id "shadeable_p" "f"
                     
 		} else {
-		    db_dml toggle_lock_update_2 {}
+		    db_dml toggle_pinned_update_unpin {}
 		}
 	    }
 	    "toggle_hideable" {
Index: openacs-4/packages/new-portal/tcl/portal-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/new-portal/tcl/portal-procs.xql	12 Dec 2001 19:25:52 -0000	1.2
+++ openacs-4/packages/new-portal/tcl/portal-procs.xql	13 Dec 2001 21:10:02 -0000	1.3
@@ -123,7 +123,7 @@
   </querytext>
 </fullquery> 
 
-<fullquery name="portal::configure_dispatch.toggle_lock_select">
+<fullquery name="portal::configure_dispatch.toggle_pinned_select">
   <querytext>
     select state
     from portal_element_map 
@@ -132,16 +132,16 @@
   </querytext>
 </fullquery> 
 
-<fullquery name="portal::configure_dispatch.toggle_lock_update_1">
+<fullquery name="portal::configure_dispatch.toggle_pinned_update_pin">
   <querytext>
     update portal_element_map
-    set state = 'locked'
+    set state = 'pinned'
     where portal_id = :portal_id
     and element_id = :element_id
   </querytext>
 </fullquery> 
 
-<fullquery name="portal::configure_dispatch.toggle_lock_update_2">
+<fullquery name="portal::configure_dispatch.toggle_pinned_update_unpin">
   <querytext>
     update portal_element_map
     set state = 'full'
@@ -243,7 +243,7 @@
           where portal_id = :portal_id 
           and region = :region 
           and sort_key < :sort_key
-          and state != 'locked'
+          and state != 'pinned'
           order by sort_key desc) where rownum = 1
   </querytext>
 </fullquery> 
@@ -256,7 +256,7 @@
           where portal_id = :portal_id 
           and region = :region 
           and sort_key > :sort_key 
-          and state != 'locked'
+          and state != 'pinned'
           order by sort_key) where rownum = 1 
   </querytext>
 </fullquery> 
Index: openacs-4/packages/new-portal/www/place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/new-portal/www/place-element.adp	7 Dec 2001 23:45:43 -0000	1.18
+++ openacs-4/packages/new-portal/www/place-element.adp	13 Dec 2001 21:10:02 -0000	1.19
@@ -10,29 +10,29 @@
 
 <multiple name=element_multi>
     @element_multi.name@
-    <if @element_multi.state@ ne "locked">
+    <if @element_multi.state@ ne "pinned">
 
     <if @element_multi:rowcount gt 1>
       <if @element_multi.rownum@ gt 1>
-        <a href="@target_stub@-2?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&sort_key=@element_multi.sort_key@&direction=up"><img border=0 src="@dir@/finger-up.gif" alt="move up"></a>
+        <a href="@target_stub@-2?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&sort_key=@element_multi.sort_key@&direction=up"><img border=0 src="@dir@/arrow-up.gif" alt="move up"></a>
       </if>
       <if @element_multi:rowcount@ gt @element_multi.rownum@>
-        <a href="@target_stub@-2?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&sort_key=@element_multi.sort_key@&direction=down"><img border=0 src="@dir@/finger-down.gif" alt="move down"></a>
+        <a href="@target_stub@-2?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&sort_key=@element_multi.sort_key@&direction=down"><img border=0 src="@dir@/arrow-down.gif" alt="move down"></a>
       </if>
     </if>
 
 
 	<if @region@ eq 1>
-	<a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@"><img border=0 src="@dir@/finger-right.gif" alt="move right"></a>
+	<a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@"><img border=0 src="@dir@/arrow-right.gif" alt="move right"></a>
 	</if>
 	<if @region@ gt 1 and @region@ lt @num_regions@>
-	<a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@"><img border=0 src="@dir@/finger-left.gif" alt="move left"></a>
-	<a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@"><img border=0 src="@dir@/finger-right.gif" alt="move right"></a>
+	<a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@"><img border=0 src="@dir@/arrow-left.gif" alt="move left"></a>
+	<a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@"><img border=0 src="@dir@/arrow-right.gif" alt="move right"></a>
 	</if>
-	<if @region@ eq @num_regions@><a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@"><img border=0 src="@dir@/finger-left.gif" alt="move left"></a>
+	<if @region@ eq @num_regions@><a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@"><img border=0 src="@dir@/arrow-left.gif" alt="move left"></a>
 	</if>
 
-(<a href="@target_stub@-2?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@">hide</a>)    
+[<a href="@target_stub@-2?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@">hide</a>]    
     </if>
 
 
Index: openacs-4/packages/new-portal/www/template-place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/template-place-element.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/new-portal/www/template-place-element.adp	29 Nov 2001 20:14:02 -0000	1.6
+++ openacs-4/packages/new-portal/www/template-place-element.adp	13 Dec 2001 21:10:02 -0000	1.7
@@ -13,50 +13,50 @@
 
     <if @element_multi:rowcount gt 1>
       <if @element_multi.rownum@ gt 1>
-        <a href="@target_stub@-2?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&sort_key=@element_multi.sort_key@&direction=up&return_url=@return_url@"><img border=0 src="@dir@/finger-up.gif" alt="move up"></a>
+        <a href="@target_stub@-2?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&sort_key=@element_multi.sort_key@&direction=up&return_url=@return_url@"><img border=0 src="@dir@/arrow-up.gif" alt="move up"></a>
       </if>
       <if @element_multi:rowcount@ gt @element_multi.rownum@>
-        <a href="@target_stub@-2?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&sort_key=@element_multi.sort_key@&direction=down&return_url=@return_url@"><img border=0 src="@dir@/finger-down.gif" alt="move down"></a>
+        <a href="@target_stub@-2?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&sort_key=@element_multi.sort_key@&direction=down&return_url=@return_url@"><img border=0 src="@dir@/arrow-down.gif" alt="move down"></a>
       </if>
     </if>
 
     <if @region@ eq 1>
-    <a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@&return_url=@return_url@"><img border=0 src="@dir@/finger-right.gif" alt="move right"></a>
+    <a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@&return_url=@return_url@"><img border=0 src="@dir@/arrow-right.gif" alt="move right"></a>
     </if>
 
     <if @region@ gt 1 and @region@ lt @num_regions@>
-    <a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@"><img border=0 src="@dir@/finger-left.gif" alt="move left"></a>
-    <a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@&return_url=@return_url@"><img border=0 src="@dir@/finger-right.gif" alt="move right"></a>
+    <a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@"><img border=0 src="@dir@/arrow-left.gif" alt="move left"></a>
+    <a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@&return_url=@return_url@"><img border=0 src="@dir@/arrow-right.gif" alt="move right"></a>
     </if>
-    <if @region@ eq @num_regions@><a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@"><img border=0 src="@dir@/finger-left.gif" alt="move left"></a>     </if>
+    <if @region@ eq @num_regions@><a href="@target_stub@-2?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@"><img border=0 src="@dir@/arrow-left.gif" alt="move left"></a>     </if>
 
 
 <p align=left>
 
-Shown? (<a href="@target_stub@-2?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@&return_url=@return_url@">hide this element</a>)
+Shown? Yes [<a href="@target_stub@-2?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@&return_url=@return_url@">hide this element</a>]
 
 <BR>
 
-<if @element_multi.state@ ne "locked">
-Locked? unlocked (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_lock&element_id=@element_multi.element_id@&return_url=@return_url@">set lock</a>)
+<if @element_multi.state@ ne "pinned">
+User Movable? Yes, Unpinned [<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_pinned&element_id=@element_multi.element_id@&return_url=@return_url@">Pin</a>]
 </if>
-<else>Locked? locked (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_lock&element_id=@element_multi.element_id@&return_url=@return_url@">unlock</a>)
+<else>User Movable? No, Pinned [<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_pinned&element_id=@element_multi.element_id@&return_url=@return_url@">Unpin</a>]
 </else>
 
 <BR>
 
 <if @element_multi.hideable_p@ eq "t">
-User hideable? true (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_hideable&element_id=@element_multi.element_id@&return_url=@return_url@">don't allow hiding</a>)
+User Hideable? Yes [<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_hideable&element_id=@element_multi.element_id@&return_url=@return_url@">don't allow hiding</a>]
 </if>
-<else>User Hideable? false (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_hideable&element_id=@element_multi.element_id@&return_url=@return_url@">allow hiding</a>)
+<else>User Hideable? No [<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_hideable&element_id=@element_multi.element_id@&return_url=@return_url@">allow hiding</a>]
 </else>
 
 <BR>
 
 <if @element_multi.shadeable_p@ eq "t">
-User shadeable? true (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_shadeable&element_id=@element_multi.element_id@&return_url=@return_url@">don't allow shading</a>)
+User Shadeable? Yes [<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_shadeable&element_id=@element_multi.element_id@&return_url=@return_url@">don't allow shading</nobr></a>]
 </if>
-<else>User shadeable? false (<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_shadeable&element_id=@element_multi.element_id@&return_url=@return_url@">allow shading</a>)
+<else>User Shadeable? No [<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_shadeable&element_id=@element_multi.element_id@&return_url=@return_url@">allow shading</a>]
 </else>
 
 <p>