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.2 -r1.3
--- openacs-4/packages/new-portal/www/template-place-element.adp	21 Nov 2001 17:15:44 -0000	1.2
+++ openacs-4/packages/new-portal/www/template-place-element.adp	21 Nov 2001 18:41:08 -0000	1.3
@@ -6,10 +6,10 @@
 
 <table border=1 width="100%">
 <tr>
-<td align=center>
+<td align=left>
 
 <multiple name=element_multi>
-    @element_multi.name@
+    @element_multi.name@ - @element_multi.description@
     <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>
@@ -31,7 +31,7 @@
 
 <p align=left>
 
-Action: <a href="@target_stub@-2?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@">hide this element</a>
+Action: (<a href="@target_stub@-2?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@">hide this element</a>)
 
 <BR>
 
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.1 -r1.2
--- openacs-4/packages/new-portal/www/template-place-element.tcl	21 Nov 2001 17:03:34 -0000	1.1
+++ openacs-4/packages/new-portal/www/template-place-element.tcl	21 Nov 2001 18:41:17 -0000	1.2
@@ -19,12 +19,13 @@
 
 # get the elements for this region.
 set region_count 0
-template::multirow create element_multi element_id name sort_key state hideable_p shadeable_p
+template::multirow create element_multi element_id name sort_key state hideable_p shadeable_p description
 db_foreach select_elements_by_region {
-    select element_id, name, sort_key, state
-     from portal_element_map
+    select pem.element_id, pem.name, sort_key, state, pd.description
+     from portal_element_map pem, portal_datasources pd 
      where
        portal_id = :portal_id 
+       and pem.datasource_id  = pd.datasource_id
        and region = :region 
        and state != 'hidden'
     order by sort_key } {
@@ -36,7 +37,7 @@
 		"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
+		$element_id $name $sort_key $state $hideable_p $shadeable_p $description
 	incr region_count
 	
     }