Index: openacs-4/packages/layout-managed-subsite/www/admin/layouts/add-elements.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/www/admin/layouts/add-elements.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/layout-managed-subsite/www/admin/layouts/add-elements.tcl	5 Dec 2008 13:46:40 -0000	1.2
+++ openacs-4/packages/layout-managed-subsite/www/admin/layouts/add-elements.tcl	5 Dec 2008 13:59:56 -0000	1.3
@@ -7,14 +7,12 @@
     @cvs-id $Id$
 
 } {
-    pageset_id:naturalnum,notnull
+    page_id:naturalnum,notnull
     package_id:naturalnum,notnull
     name:notnull,multiple
     return_url:notnull
 }
 
-permission::require_permission -object_id $pageset_id -privilege admin
-
 set added_names [list]
 
 db_transaction {
@@ -29,6 +27,7 @@
 
             layout::element::new \
                 -package_id $package_id \
+                -page_id $page_id \
                 -includelet_name $one_name \
                 -state hidden \
                 -initialize
Index: openacs-4/packages/layout-managed-subsite/www/admin/layouts/manage-includelets.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/www/admin/layouts/manage-includelets.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/layout-managed-subsite/www/admin/layouts/manage-includelets.tcl	3 Dec 2008 09:22:00 -0000	1.2
+++ openacs-4/packages/layout-managed-subsite/www/admin/layouts/manage-includelets.tcl	5 Dec 2008 13:59:56 -0000	1.3
@@ -62,9 +62,12 @@
         }
     }
 
+# Hide our new elements on the first page of the pageset (dotlrn design hangover)
+set page_id [layout::page::get_id -pageset_id $pageset_id]
+
 db_multirow -extend {add_url} includelets get_includelets {} {
     set add_url [export_vars -base [ad_conn package_url]admin/layouts/add-elements \
-                    { package_id pageset_id name title admin_url return_url}]
+                    { package_id page_id name title admin_url return_url}]
     set singleton_p [ad_decode $singleton_p t Yes f No $singleton_p]
 }
 
@@ -78,7 +81,7 @@
         {[_ layout-managed-subsite.Add_checked_includelets]}
     " \
     -bulk_action_export_vars {
-        package_id pageset_id return_url admin_url
+        package_id page_id return_url admin_url
     } \
     -elements {
         name {