Index: openacs-4/packages/dotfolio/catalog/dotfolio.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/catalog/dotfolio.en_US.ISO-8859-1.xml,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/dotfolio/catalog/dotfolio.en_US.ISO-8859-1.xml	16 Sep 2005 13:18:15 -0000	1.10
+++ openacs-4/packages/dotfolio/catalog/dotfolio.en_US.ISO-8859-1.xml	29 Sep 2005 15:53:53 -0000	1.11
@@ -150,5 +150,7 @@
   <msg key="no_portfolios_in_section">There are no portfolios for this section.</msg>
   <msg key="default_welcome_note">{Welcome to %first_names% %last_name%'s portfolio!} text/enhanced</msg>
   <msg key="num_of_blog_entries">No. of Blog Entries</msg>
+  <msg key="continue_with_delete_group">Continue with deleting this group?</msg>
+  <msg key="delete_group">Delete group</msg>
 
 </message_catalog>
Index: openacs-4/packages/dotfolio/www/admin/group-del-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/admin/group-del-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/dotfolio/www/admin/group-del-postgresql.xql	14 May 2005 14:27:44 -0000	1.1
+++ openacs-4/packages/dotfolio/www/admin/group-del-postgresql.xql	29 Sep 2005 15:53:54 -0000	1.2
@@ -9,4 +9,16 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="get_member_names">
+    <querytext>
+      select u.first_names || ' ' || u.last_name || ' (' || u.email || ')' as member_name
+      from dotfolio_groups g, 
+           group_member_map m,
+           cc_users u
+      where g.group_id = m.group_id
+            and g.group_id = :group_id
+            and m.member_id = u.user_id
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/dotfolio/www/admin/group-del.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/admin/group-del.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotfolio/www/admin/group-del.adp	29 Sep 2005 15:53:54 -0000	1.1
@@ -0,0 +1,5 @@
+<master>
+  <property name="title">#dotfolio.delete_group#</property>
+  <property name="context">@context;noquote@</property>
+
+<formtemplate id="del_group"></formtemplate>
Index: openacs-4/packages/dotfolio/www/admin/group-del.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/admin/group-del.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotfolio/www/admin/group-del.tcl	2 Aug 2005 01:54:52 -0000	1.3
+++ openacs-4/packages/dotfolio/www/admin/group-del.tcl	29 Sep 2005 15:53:54 -0000	1.4
@@ -10,12 +10,28 @@
     group_id:integer,notnull
 }
 
-db_transaction {
-    # Delete entry from dotfolio_group_adviser_map.
-    db_dml delete_group {}
+set context [list [list groups "[_ dotfolio.groups]"] "[_ dotfolio.delete_group]"]
 
-    # Delete group.
-    group::delete $group_id
-}
-
-ad_returnredirect "groups"
+ad_form \
+    -name del_group \
+    -cancel_url "groups" \
+    -export { group_id } \
+    -form {
+        {group_members:text(inform)  {label "[_ dotfolio.group_members]"}}
+        {prompt:text(inform) {label "[_ dotfolio.confirm]"} {value "[_ dotfolio.continue_with_delete_group]"}}
+    } \
+    -on_request {
+        set group_members [join [db_list get_member_names {}] "<br />"]
+    } \
+    -on_submit {
+        db_transaction {
+            # Delete entry from dotfolio_group_adviser_map.
+            db_dml delete_group {}
+            
+            # Delete group.
+            group::delete $group_id
+        }
+    } \
+    -after_submit {
+        ad_returnredirect "groups"
+    }