Index: openacs-4/packages/dotlrn/dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v diff -u -r1.92 -r1.93 --- openacs-4/packages/dotlrn/dotlrn.info 31 May 2002 06:23:49 -0000 1.92 +++ openacs-4/packages/dotlrn/dotlrn.info 31 May 2002 21:26:33 -0000 1.93 @@ -193,6 +193,9 @@ + + + Index: openacs-4/packages/dotlrn/www/one-community-admin.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.xql,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/one-community-admin.xql 6 May 2002 23:55:02 -0000 1.11 +++ openacs-4/packages/dotlrn/www/one-community-admin.xql 31 May 2002 21:24:28 -0000 1.12 @@ -9,8 +9,9 @@ description, portal_id, admin_portal_id, - non_member_portal_id - from dotlrn_communities + non_member_portal_id, + archived_p + from dotlrn_communities_all where community_id = :community_id Index: openacs-4/packages/dotlrn/www/subcommunity-archive.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-archive.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/subcommunity-archive.adp 14 May 2002 19:27:54 -0000 1.1 +++ openacs-4/packages/dotlrn/www/subcommunity-archive.adp 31 May 2002 21:24:13 -0000 1.2 @@ -23,10 +23,9 @@ 1 1 -Are you sure you want to ARCHIVE group @pretty_name@? +Are you sure you want to archive group @pretty_name@?

-This will not delete the group's data, but the group will only be able to be -accessed by Site Wide Admins. +The group's data will not be modified, but the group will only be accessible to system administrators.
- + Index: openacs-4/packages/dotlrn/www/subcommunity-archive.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-archive.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/subcommunity-archive.tcl 21 May 2002 17:30:02 -0000 1.3 +++ openacs-4/packages/dotlrn/www/subcommunity-archive.tcl 31 May 2002 21:24:13 -0000 1.4 @@ -15,54 +15,58 @@ # ad_page_contract { - Archive a subcommunity (aka subgroup) + Archive a group (need to rename file) @author arjun (arjun@openforce.net) @version $Id$ } -query { - {community_id:notnull} + {community_id ""} {referer "one-community-admin"} } -properties { title:onevalue } +if {[empty_string_p $community_id]} { + set community_id [dotlrn_community::get_community_id] +} + + set user_id [ad_get_user_id] dotlrn::require_user_admin_community $community_id set pretty_name [dotlrn_community::get_community_name $community_id] -set subcomm_pn [parameter::get -parameter subcommunity_pretty_name] -set title "Archive $subcomm_pn" +set title "Archive group $pretty_name" -form create archive_subcomm +form create archive_form # this is lame, but I don't have a better way yet set yes_label "Yes, I'm sure." set no_label "No, I don't want to archive this group." -element create archive_subcomm no_button \ +element create archive_form no_button \ -label $no_label \ -datatype text \ -widget submit \ -value "1" -element create archive_subcomm yes_button \ +element create archive_form yes_button \ -label $yes_label \ -datatype text \ -widget submit -element create archive_subcomm community_id \ +element create archive_form community_id \ -label " " \ -datatype text \ -widget hidden \ -value $community_id -element create archive_subcomm referer \ +element create archive_form referer \ -label "Referer" \ -datatype text \ -widget hidden \ -value $referer -if {[form is_valid archive_subcomm]} { - form get_values archive_subcomm community_id referer no_button yes_button +if {[form is_valid archive_form]} { + form get_values archive_form community_id referer no_button yes_button if {[string equal $yes_button $yes_label]} { Index: openacs-4/packages/dotlrn/www/admin/archived-communities.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/archived-communities.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/archived-communities.adp 31 May 2002 21:23:36 -0000 1.1 @@ -0,0 +1,43 @@ +<% + + # + # Copyright (C) 2001, 2002 OpenForce, Inc. + # + # This file is part of dotLRN. + # + # dotLRN is free software; you can redistribute it and/or modify it under the + # terms of the GNU General Public License as published by the Free Software + # Foundation; either version 2 of the License, or (at your option) any later + # version. + # + # dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY + # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + # details. + # + +%> + + +@title@ +@context_bar@ + + + + + + + + + + + + + + + +
NameDescriptionActions
@archived_comms.pretty_name@
@archived_comms.description@
+ + + No archived @groups_pretty_plural@ + Index: openacs-4/packages/dotlrn/www/admin/archived-communities.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/archived-communities.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/archived-communities.tcl 31 May 2002 21:23:36 -0000 1.1 @@ -0,0 +1,38 @@ +# +# Copyright (C) 2001, 2002 OpenForce, Inc. +# +# This file is part of dotLRN. +# +# dotLRN is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# + +ad_page_contract { + displays archived communities + + @author arjun (arjun@openforce.net) + @version $Id: archived-communities.tcl,v 1.1 2002/05/31 21:23:36 arjun Exp $ +} -query { +} -properties { + title:onevalue + context_bar:onevalue + archived_comms:multirow +} + +set groups_pretty_plural "[parameter::get -parameter class_instances_pretty_plural] / [parameter::get -parameter clubs_pretty_plural]" + +set title "Archived $groups_pretty_plural" +set context_bar [list $title] + +db_multirow archived_comms select_archived_comms {} { + set description [ad_quotehtml $description] +} + +ad_return_template Index: openacs-4/packages/dotlrn/www/admin/archived-communities.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/archived-communities.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/archived-communities.xql 31 May 2002 21:23:36 -0000 1.1 @@ -0,0 +1,17 @@ + + + + + + + select pretty_name, + description, + dotlrn_community.url(community_id) as url + from dotlrn_communities_all + where archived_p = 't' + order by pretty_name, + description + + + + Index: openacs-4/packages/dotlrn/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.adp,v diff -u -r1.18 -r1.19 --- openacs-4/packages/dotlrn/www/admin/index.adp 21 May 2002 17:30:02 -0000 1.18 +++ openacs-4/packages/dotlrn/www/admin/index.adp 31 May 2002 21:23:36 -0000 1.19 @@ -34,7 +34,10 @@

  • <%= [parameter::get -parameter departments_pretty_plural] %>
  • <%= [parameter::get -parameter classes_pretty_plural] %>
  • <%= [parameter::get -parameter class_instances_pretty_plural] %>
    • -
  • <%= [parameter::get -parameter clubs_pretty_plural] %>
    • -
  • Edit Pre-approved Email Servers
    • +
  • <%= [parameter::get -parameter clubs_pretty_plural] %>
  • Portal Templates
    • +
  • Archived + <%= [parameter::get -parameter class_instances_pretty_plural] %> and + <%= [parameter::get -parameter clubs_pretty_plural] %>
    • +
  • Edit Pre-approved Email Servers