Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/admin/class-instance-new.adp 29 Nov 2001 06:05:37 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/class-instance-new.adp 10 Dec 2001 22:48:57 -0000 1.3 @@ -2,4 +2,4 @@ dotLRN New Class Instance for @class_name@ @context_bar@ - + Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 30 Nov 2001 03:41:17 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 10 Dec 2001 22:48:57 -0000 1.5 @@ -1,47 +1,49 @@ - - ad_page_contract { Create a New Class Instance @author Ben Adida (ben@openforce.net) @creation-date 2001-10-05 -} { + @version $Id$ +} -query { class_key + {referer ""} } form create add_class_instance -element create add_class_instance pretty_name \ - -label "Name" -datatype text -widget text -html { size 60 } - element create add_class_instance year \ - -label "Year" -datatype text -widget text -html { size 40 } + -label "Year" -datatype text -widget text -html {size 50} element create add_class_instance term \ - -label "Term" -datatype text -widget text -html { size 40 } + -label "Term" -datatype text -widget text -html {size 50} element create add_class_instance description \ - -label "Description" -datatype text -widget textarea -html {rows 5 cols 60 wrap soft} + -label "Description" -datatype text -widget textarea -html {rows 5 cols 60 wrap soft} element create add_class_instance class_key \ - -label "Class Key" -value $class_key -datatype text -widget hidden + -label "Class Key" -value $class_key -datatype text -widget hidden +element create add_class_instance referer \ + -label "Referer" -value $referer -datatype text -widget hidden if {[form is_valid add_class_instance]} { - template::form get_values add_class_instance class_key pretty_name year term description + template::form get_values add_class_instance class_key year term description referer - set class_instance_id [dotlrn_class::new_instance -description $description -class_type $class_key -class_name $pretty_name -term $term -year $year] + set class_instance_id [dotlrn_class::new_instance -description $description -class_type $class_key -term $term -year $year] - ad_returnredirect "one-class?class_key=$class_key" - return + if {[empty_string_p $referer]} { + set referer "one-class?class_key=$class_key" + } + + ad_returnredirect $referer + ad_script_abort } set class_name [dotlrn_community::get_community_type_name $class_key] set context_bar [list \ - {classes Classes} \ - [list "one-class?class_key=$class_key" "$class_name"] \ - {New Instance}] + {classes Classes} \ + [list "one-class?class_key=$class_key" "$class_name"] \ + {New Instance}] ad_return_template - Index: openacs-4/packages/dotlrn/www/admin/class-instance-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/class-instance-oracle.xql 10 Dec 2001 22:49:39 -0000 1.1 @@ -0,0 +1,16 @@ + + + + oracle8.1.6 + + + + select dotlrn_communities.pretty_name, + (select site_node.url(site_nodes.node_id) + from site_nodes + where site_nodes.object_id = dotlrn_communities.package_id) as url + from dotlrn_active_comms dotlrn_communities + where dotlrn_communities.community_id = :class_instance_id + + + Index: openacs-4/packages/dotlrn/www/admin/class-instance.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/class-instance.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/class-instance.adp 10 Dec 2001 22:49:39 -0000 1.1 @@ -0,0 +1,6 @@ +@pretty_name@ +[ + + admin + +] Index: openacs-4/packages/dotlrn/www/admin/class-instance.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/class-instance.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/class-instance.tcl 10 Dec 2001 22:49:39 -0000 1.1 @@ -0,0 +1,15 @@ +# dotlrn/www/admin/class-instance.tcl + +ad_page_contract { + @author yon (yon@milliped.com) + @creation-date Dec 10, 2001 + @version $Id: class-instance.tcl,v 1.1 2001/12/10 22:49:39 yon Exp $ +} -query { +} -properties { + pretty_name:onevalue + url:onevalue +} + +db_1row select_class_instance {} + +ad_return_template Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/class-new-2.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/www/admin/class-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-new.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/admin/class-new.adp 29 Nov 2001 06:05:37 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/class-new.adp 10 Dec 2001 22:48:57 -0000 1.3 @@ -2,20 +2,4 @@ dotLRN New Class @context_bar@ -
- - - - - - - - - - - - - -
Class Key (a short name, no spaces):
Class Pretty Name:
Description:
- -
+ Index: openacs-4/packages/dotlrn/www/admin/class-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-new.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/admin/class-new.tcl 29 Nov 2001 06:05:37 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/class-new.tcl 10 Dec 2001 22:48:57 -0000 1.3 @@ -1,12 +1,41 @@ - ad_page_contract { Create a New Class - input form @author Ben Adida (ben@openforce.net) + @author yon (yon@openforce.net) @creation-date 2001-08-20 -} { + @version $Id$ +} -query { + {referer ""} } +form create add_class + +element create add_class class_key \ + -label "Class Key (a short name, no spaces)" -datatype text -widget text -html {size 50} + +element create add_class name \ + -label "Name" -datatype text -widget text -html {size 50} + +element create add_class description \ + -label "Description" -datatype text -widget textarea -html {rows 5 cols 60 wrap soft} + +element create add_class referer \ + -label "Referer" -value $referer -datatype text -widget hidden + +if {[form is_valid add_class]} { + form get_values add_class class_key name description referer + + set class_key [dotlrn_class::new -class_key $class_key -pretty_name $name -description $description] + + if {[empty_string_p $referer]} { + set referer "classes" + } + + ad_returnredirect $referer + ad_script_abort +} + set context_bar {{classes Classes} New} -ad_return_template +ad_return_template Index: openacs-4/packages/dotlrn/www/admin/class.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/class.adp 10 Dec 2001 22:49:39 -0000 1.1 @@ -0,0 +1,14 @@ +@pretty_name@ +[ + + new instance + +] + + +
+ +
+ +
+ Index: openacs-4/packages/dotlrn/www/admin/class.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/class.tcl 10 Dec 2001 22:49:39 -0000 1.1 @@ -0,0 +1,16 @@ +# dotlrn/www/admin/class.tcl + +ad_page_contract { + @author yon (yon@milliped.com) + @creation-date Dec 10, 2001 + @version $Id: class.tcl,v 1.1 2001/12/10 22:49:39 yon Exp $ +} -query { +} -properties { + class_key:onevalue + pretty_name:onevalue + instances:multirow +} + +db_multirow instances select_class_instances {} + +ad_return_template Index: openacs-4/packages/dotlrn/www/admin/class.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/class.xql 10 Dec 2001 22:49:39 -0000 1.1 @@ -0,0 +1,12 @@ + + + + + + select class_instance_id + from dotlrn_class_instances + where class_key = :class_key + order by class_instance_id + + + Index: openacs-4/packages/dotlrn/www/admin/classes.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/admin/classes.adp 29 Nov 2001 06:05:37 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/classes.adp 10 Dec 2001 22:48:57 -0000 1.3 @@ -2,12 +2,17 @@ dotLRN Classes @context_bar@ - + +[ new class ] + Index: openacs-4/packages/dotlrn/www/admin/classes.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/admin/classes.tcl 29 Nov 2001 06:05:37 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/classes.tcl 10 Dec 2001 22:48:57 -0000 1.3 @@ -1,13 +1,17 @@ - ad_page_contract { Displays dotLRN classes admin page @author Ben Adida (ben@openforce.net) + @author yon (yon@openforce.net) @creation-date 2001-11-04 -} { + @version $Id$ +} -query { +} -properties { + classes:multirow } +set context_bar "Classes" + db_multirow classes select_classes {} -set context_bar "Classes" ad_return_template Index: openacs-4/packages/dotlrn/www/admin/classes.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/admin/classes.xql 7 Nov 2001 20:20:56 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/classes.xql 10 Dec 2001 22:48:57 -0000 1.2 @@ -1,11 +1,13 @@ - - - -select class_key, pretty_name, description from dotlrn_classes_full - - - + + + select class_key, + pretty_name, + description + from dotlrn_classes_full + order by pretty_name + + Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/club-new-2.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/www/admin/club-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club-new.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/admin/club-new.adp 8 Dec 2001 01:22:40 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/club-new.adp 10 Dec 2001 22:48:57 -0000 1.2 @@ -2,20 +2,4 @@ dotLRN New Club @context_bar@ -
- - - - - - - - - - - - - -
Club Key (a short name, no spaces):
Club Pretty Name:
Description:
- -
+ Index: openacs-4/packages/dotlrn/www/admin/club-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club-new.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/admin/club-new.tcl 8 Dec 2001 01:22:40 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/club-new.tcl 10 Dec 2001 22:48:57 -0000 1.2 @@ -3,12 +3,40 @@ @author yon (yon@openforce.net) @creation-date 2001-12-03 - @cvs-id $Id$ -} { + @version $Id$ +} -query { + {referer ""} } -properties { context_bar:onevalue } +form create add_club + +element create add_club club_key \ + -label "Club Key (a short name, no spaces)" -datatype text -widget text -html {size 50} + +element create add_club name \ + -label "Name" -datatype text -widget text -html {size 50} + +element create add_club description \ + -label "Charter" -datatype text -widget textarea -html {rows 5 cols 60 wrap soft} + +element create add_club referer \ + -label "Referer" -value $referer -datatype text -widget hidden + +if {[form is_valid add_club]} { + form get_values add_club club_key name description referer + + set key [dotlrn_club::new -description $description -key $club_key -pretty_name $name] + + if {[empty_string_p $referer]} { + set referer "clubs" + } + + ad_returnredirect $referer + ad_script_abort +} + set context_bar {{clubs Clubs} New} ad_return_template Index: openacs-4/packages/dotlrn/www/admin/club.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/admin/club.adp 8 Dec 2001 01:22:40 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/club.adp 10 Dec 2001 22:48:57 -0000 1.2 @@ -1,3 +1 @@ - -@pretty_name@ -@context_bar@ +@pretty_name@ - @description@ Index: openacs-4/packages/dotlrn/www/admin/club.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/admin/club.tcl 8 Dec 2001 01:22:40 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/club.tcl 10 Dec 2001 22:48:57 -0000 1.2 @@ -1,21 +1,18 @@ ad_page_contract { - displays single dotLRN club page + displays dotLRN clubs admin page @author yon (yon@openforce.net) @creation-date 2001-12-03 - @cvs-id $Id$ -} -query { - club_id:naturalnum,notnull -} -errors { - club_id:naturalnum,notnull {must provide a valid club_id} + @version $Id$ +} { } -properties { - context_bar:onevalue + club_id:onevalue pretty_name:onevalue - description:onevalue + descrition:onevalue } -set context_bar {{clubs Clubs} One} +if {![exists_and_not_null pretty_name]} { + db_1row select_club {} +} -db_1row select_club {} - ad_return_template Index: openacs-4/packages/dotlrn/www/admin/club.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/admin/club.xql 8 Dec 2001 01:22:40 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/club.xql 10 Dec 2001 22:48:57 -0000 1.2 @@ -3,12 +3,11 @@ - select dotlrn_communities.pretty_name, + select dotlrn_communities.community_key, + dotlrn_communities.pretty_name, dotlrn_communities.description - from dotlrn_clubs, - dotlrn_communities - where dotlrn_clubs.club_id = :club_id - and dotlrn_communities.community_id = :club_id + from dotlrn_communities + where dotlrn_communities.community_id = :club_id Index: openacs-4/packages/dotlrn/www/admin/clubs.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/clubs.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/admin/clubs.adp 8 Dec 2001 01:22:40 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/clubs.adp 10 Dec 2001 22:48:57 -0000 1.2 @@ -2,10 +2,17 @@ dotLRN Clubs @context_bar@ - +[ new club ] + +

+ + + + +

+ + + + +[ new club ] + Index: openacs-4/packages/dotlrn/www/admin/clubs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/clubs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/admin/clubs.tcl 8 Dec 2001 01:22:40 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/clubs.tcl 10 Dec 2001 22:48:57 -0000 1.2 @@ -3,7 +3,7 @@ @author yon (yon@openforce.net) @creation-date 2001-12-03 - @cvs-id $Id$ + @version $Id$ } { } -properties { clubs:multirow 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.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/index.adp 29 Nov 2001 06:05:37 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/index.adp 10 Dec 2001 22:48:57 -0000 1.4 @@ -1,10 +1,15 @@ + + dotLRN Admin @context_bar@ - Index: openacs-4/packages/dotlrn/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/index.tcl 29 Nov 2001 06:05:37 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/index.tcl 10 Dec 2001 22:48:57 -0000 1.4 @@ -1,5 +1,3 @@ - - ad_page_contract { Displays main dotLRN admin page Index: openacs-4/packages/dotlrn/www/admin/one-club.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/one-club.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/one-club.adp 10 Dec 2001 22:48:57 -0000 1.1 @@ -0,0 +1,5 @@ + +@pretty_name@ +@context_bar@ + +@pretty_name@ - @description@ Index: openacs-4/packages/dotlrn/www/admin/one-club.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/one-club.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/one-club.tcl 10 Dec 2001 22:48:57 -0000 1.1 @@ -0,0 +1,23 @@ +# dotlrn/www/admin/one-club.tcl + +ad_page_contract { + displays single dotLRN club page + + @author yon (yon@openforce.net) + @creation-date 2001-12-03 + @version $Id: one-club.tcl,v 1.1 2001/12/10 22:48:57 yon Exp $ +} -query { + club_id:naturalnum,notnull +} -errors { + club_id:naturalnum,notnull {must provide a valid club_id} +} -properties { + context_bar:onevalue + pretty_name:onevalue + description:onevalue +} + +set context_bar {{clubs Clubs} One} + +db_1row select_club {} + +ad_return_template Index: openacs-4/packages/dotlrn/www/admin/one-club.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/one-club.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/one-club.xql 10 Dec 2001 22:48:57 -0000 1.1 @@ -0,0 +1,12 @@ + + + + + + select dotlrn_communities.pretty_name, + dotlrn_communities.description + from dotlrn_communities + where dotlrn_communities.community_id = :club_id + + +