Index: openacs-4/packages/curriculum/curriculum.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/curriculum.info,v diff -u -r1.2 -r1.3 --- openacs-4/packages/curriculum/curriculum.info 3 Jun 2003 18:55:09 -0000 1.2 +++ openacs-4/packages/curriculum/curriculum.info 4 Jun 2003 16:41:49 -0000 1.3 @@ -22,6 +22,7 @@ + Index: openacs-4/packages/curriculum/lib/admin-curriculums-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/admin-curriculums-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum/lib/admin-curriculums-oracle.xql 3 Jun 2003 10:21:50 -0000 1.1 +++ openacs-4/packages/curriculum/lib/admin-curriculums-oracle.xql 4 Jun 2003 16:43:42 -0000 1.2 @@ -7,9 +7,11 @@ select cc.curriculum_id, cc.name as curriculum_name, + cc.description as curriculum_desc, cc.sort_key as curriculum_sort_order, ce.element_id, ce.name as element_name, + ce.description as element_desc, ce.url as element_url, ce.enabled_p as element_enabled_p, ce.sort_key as element_sort_order, Index: openacs-4/packages/curriculum/lib/admin-curriculums-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/admin-curriculums-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum/lib/admin-curriculums-postgresql.xql 3 Jun 2003 10:21:50 -0000 1.1 +++ openacs-4/packages/curriculum/lib/admin-curriculums-postgresql.xql 4 Jun 2003 16:43:42 -0000 1.2 @@ -7,9 +7,11 @@ select cc.curriculum_id, cc.name as curriculum_name, + cc.description as curriculum_desc, cc.sort_key as curriculum_sort_order, ce.element_id, ce.name as element_name, + ce.description as element_desc, ce.url as element_url, ce.enabled_p as element_enabled_p, ce.sort_key as element_sort_order, Index: openacs-4/packages/curriculum/lib/admin-curriculums.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/admin-curriculums.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum/lib/admin-curriculums.adp 3 Jun 2003 10:21:50 -0000 1.1 +++ openacs-4/packages/curriculum/lib/admin-curriculums.adp 4 Jun 2003 16:43:42 -0000 1.2 @@ -1,84 +1,124 @@ + +Available columns: +

@curriculums:columns@

+ +@debug_output;noquote@ +

[ Package parameters | Package permissions ]

- - -Here are the available columns: -

@curriculums:columns@

- - -@debug_output;noquote@ - - - +
+ + + + + + + +
NameDescriptionStateActionsMove
+
+ + + + + + + + + +
+ @curriculums.curriculum_name@ + + @curriculums.curriculum_desc;noquote@ + + @curriculums.pretty_state@ + + WF ACTIONS + | + delete + + + down + + + up + +
-
+ -
  • -@curriculums.curriculum_name@ -- -[ -delete - -| -down - - -up - -] -
    • + + + + + + + -
  • No elements +
    • + + -
  • Add an element +
    • + + +
    +
  • + @curriculums.element_name@ +
    • +     		+ @curriculums.element_desc;noquote@ + + + Enabled + + Disable + + + Disabled + + Enable + | + Delete + + + + down + + + up + +
    +
  • + No elements +
    • +
    +
  • + Add an element +
    • +
    - - +

    - - -     -
  • No curriculums +
  • + No curriculums +
    •  - -
  • Add a curriculum - +
  • + Add a curriculum +
    • +
    Index: openacs-4/packages/curriculum/lib/bar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/Attic/bar.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/curriculum/lib/bar.adp 3 Jun 2003 18:45:12 -0000 1.2 +++ openacs-4/packages/curriculum/lib/bar.adp 4 Jun 2003 16:43:41 -0000 1.3 @@ -1,54 +1,48 @@ - +
    - + - +
    - Curr Name! - + Unchecked + | + Curriculum Name + | + i + - - +
    + - - - - - -
    - - - - - - Checked Unchecked - + | @elements.name@ @elements.name@ + | + i - ? - - [Remove] -
    		- Refresh! - + � + + | + X + +

    Index: openacs-4/packages/curriculum/lib/user-curriculums.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/user-curriculums.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/curriculum/lib/user-curriculums.adp 3 Jun 2003 18:45:12 -0000 1.2 +++ openacs-4/packages/curriculum/lib/user-curriculums.adp 4 Jun 2003 16:43:42 -0000 1.3 @@ -1,5 +1,4 @@ -

    [ Refresh all curriculums @@ -9,23 +8,21 @@ ]

    - - +
    Name Description Status Options
    -
    - - - +
    - + Index: openacs-4/packages/curriculum/tcl/misc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/tcl/misc-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum/tcl/misc-procs.tcl 3 Jun 2003 10:28:20 -0000 1.1 +++ openacs-4/packages/curriculum/tcl/misc-procs.tcl 4 Jun 2003 16:42:24 -0000 1.2 @@ -363,11 +363,11 @@ -short_name published] # We need user_id to join against the mapping table that holds information - # on what curriculums (in the package instance) the user care about. + # on what curriculums (in the package instance) the user cares about. set user_id [ad_conn user_id] - # FIXME. Add patameter. - set truncation_length 12 + set truncation_length [parameter::get -package_id $package_id \ + -parameter DescTruncLength -default 200] set ns_sets [db_list_of_ns_sets user_element_ns_set_list {*SQL*}] @@ -377,6 +377,7 @@ ad_proc -public curriculum::elements_flush { {-package_id ""} + {-user_id ""} } { Flushes the memoized proc that gets the element_id, url and name for the curriculum bar(s). Should be run upon ceation, enabling, disabling or deletion of a curriculum or an element. @@ -385,14 +386,18 @@ set package_id [conn package_id] } - # Only bother to flush the cache if the bar is going to be displayed. - if { ![parameter::get -package_id $package_id -parameter ShowCurriculumBarP -default 1] } { - return {} + if { [empty_string_p $user_id] } { + set user_id [ad_conn user_id] } - set user_id [ad_conn user_id] + # Only bother to flush the cache if the bar is going to be displayed. + # FIXME. Bad idea since the index page takes advantage of this cache too - not just the bar. + # + #if { ![parameter::get -package_id $package_id -parameter ShowCurriculumBarP -default 1] } { + #return {} + #} - util_memoize_flush "curriculum::enabled_elements -package_id $package_id -user_id $user_id" + util_memoize_flush [list curriculum::enabled_elements -package_id $package_id -user_id $user_id] } Index: openacs-4/packages/curriculum/www/curriculum-ave.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/www/curriculum-ave.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/curriculum/www/curriculum-ave.adp 4 Jun 2003 16:42:51 -0000 1.1 @@ -0,0 +1 @@ + Index: openacs-4/packages/curriculum/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/www/admin/index.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum/www/admin/index.adp 3 Jun 2003 10:32:38 -0000 1.1 +++ openacs-4/packages/curriculum/www/admin/index.adp 4 Jun 2003 16:43:24 -0000 1.2 @@ -2,6 +2,12 @@ @title@ @context@ - +
    @elements.curriculum_name@ + @elements.curriculum_name@ + @elements.curriculum_desc@ @@ -56,14 +53,12 @@ -
      -
    + @@ -91,7 +86,6 @@ No elements -
  • - @elements.groupnum@. - @elements.element_name@ + @elements.element_name@
    		• @elements.element_desc;noquote@
    + + + +
    + +