Index: openacs-4/packages/new-portal/www/template-place-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/template-place-element.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/new-portal/www/template-place-element.tcl	29 Jun 2018 17:27:19 -0000	1.14
+++ openacs-4/packages/new-portal/www/template-place-element.tcl	3 Sep 2024 15:37:39 -0000	1.15
@@ -14,7 +14,6 @@
 #  details.
 #
 
-# www/template-place-element.tcl
 ad_page_contract {
     Place elements in a portal template.
 
@@ -30,10 +29,11 @@
 
 # this template gets its vars from the layout template (e.g. simple2.adp)
 
-db_1row select_num_regions "
-select count(*) as num_regions
-from portal_supported_regions
-where layout_id = :layout_id"
+db_1row select_num_regions {
+    select count(*) as num_regions
+    from portal_supported_regions
+    where layout_id = :layout_id
+}
 
 # get the elements for this region.
 set region_count 0
@@ -42,66 +42,59 @@
     select element_id, pem.pretty_name as name, pem.sort_key, state, pp.page_id, pd.description
      from portal_element_map pem, portal_datasources pd, portal_pages pp
      where
-       pp.portal_id = :portal_id 
+       pp.portal_id = :portal_id
        and pp.page_id = :page_id
        and pem.page_id = pp.page_id
        and pem.datasource_id  = pd.datasource_id
-       and region = :region 
+       and region = :region
        and state != 'hidden'
     order by sort_key } {
-	
-	db_1row select_shadeable_p \
-		"select value as shadeable_p from portal_element_parameters where key = 'shadeable_p' and element_id = :element_id"
 
-	db_1row select_hideable_p \
-		"select value as hideable_p from portal_element_parameters where key = 'hideable_p' and element_id = :element_id"
-	
-	template::multirow append element_multi \
-		$element_id $name $sort_key $state $hideable_p $shadeable_p $description $page_id
-	incr region_count
-	
+        db_1row select_shadeable_p \
+            {select value as shadeable_p from portal_element_parameters where key = 'shadeable_p' and element_id = :element_id}
+
+        db_1row select_hideable_p \
+            {select value as hideable_p from portal_element_parameters where key = 'hideable_p' and element_id = :element_id}
+
+        template::multirow append element_multi \
+            $element_id $name $sort_key $state $hideable_p $shadeable_p $description $page_id
+        incr region_count
+
     }
-    
-    db_1row select_all_noimm_count \
-	    "select count(*) as all_count
+
+db_1row select_all_noimm_count {
+    select count(*) as all_count
     from portal_element_map pem, portal_pages pp
     where
     pp.portal_id = :portal_id
     and pp.page_id = :page_id
     and pp.page_id = pem.page_id
     and state != 'hidden'
-    and region not like 'i%'"
-    
+    and region not like 'i%'}
+
     # Set up the form target
     set target_stub [lindex [ns_conn urlv] [ns_conn urlc]-1]
     set show_avail_p 0
     set show_html ""
-    
+
     append show_html "<select name=element_id>"
-    
+
     db_foreach hidden_elements {
-	select element_id, pem.pretty_name
-	from portal_element_map pem, portal_pages pp
-	where
-	pp.portal_id = :portal_id 
+        select element_id, pem.pretty_name
+        from portal_element_map pem, portal_pages pp
+        where
+        pp.portal_id = :portal_id
         and pp.page_id = :page_id
-        and pp.page_id = pem.page_id 
-	and pem.state = 'hidden'
-	order by name
+        and pp.page_id = pem.page_id
+        and pem.state = 'hidden'
+        order by name
     } {
-	set show_avail_p 1
-	append show_html "<option value=$element_id>$pretty_name</option>\n"
+        set show_avail_p 1
+        append show_html "<option value=$element_id>$pretty_name</option>\n"
     }
-    
-    
 
-
-set dir /resources/new-portal/images
-
 append show_html ""
-        
 
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4