(#assessment.max_time# @sections.max_time_to_complete@)
- + #assessment.Resume_Assessment_Title# Index: openacs-4/packages/assessment/www/instructions.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/instructions.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/www/instructions.xql 15 May 2007 20:14:17 -0000 1.2 +++ openacs-4/packages/assessment/www/instructions.xql 7 Oct 2007 22:36:54 -0000 1.3 @@ -9,6 +9,7 @@ where item_id = :assessment_id and assessment_id = revision_id and subject_id = :user_id + and completed_datetime is not null
Or use choices from an existing question + +
+ + +
#assessment.OrUseChoices# + +
-#assessment.add_section_first# -
#acs-subsite.Name#: @first_names@ @last_name@#assessment.anonymous_name# #assessment.Attempt#: @session_attempt@ / @assessment_data.number_tries@ (#assessment.Delete_Attempts#) - #assessment.Percent_Score#: @assessment_score@ + #assessment.Percent_Score#: @percent_score@% #assessment.Started#: @session_start@ #assessment.Finished#: @session_finish@ #assessment.Time_spent#: @session_time@ Index: openacs-4/packages/assessment/www/asm-admin/results-users-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/asm-admin/results-users-oracle.xql 6 Dec 2005 14:24:34 -0000 1.1 +++ openacs-4/packages/assessment/www/asm-admin/results-users-oracle.xql 7 Oct 2007 22:36:54 -0000 1.2 @@ -1,21 +1,55 @@ -oracle8.1.6 - - + + + select a.title, + a.user_id, a.first_names, a.last_name, + to_char(cs.completed_datetime, :format) as completed_datetime, + to_char(coalesce(cs.last_mod_datetime, ns.last_mod_datetime), :format) as last_mod_datetime, + coalesce(cs.subject_id, ns.subject_id) as subject_id, + coalesce(cs.session_id, ns.session_id) as session_id, + cs.percent_score, + a.last_name || ', ' || a.first_names as subject_name + + from (select a.assessment_id, cr.title, cr.item_id, cr.revision_id, + u.user_id, u.first_names, u.last_name + + from as_assessments a, cr_revisions cr, cr_items ci, acs_users_all u + where a.assessment_id = cr.revision_id + and cr.revision_id = ci.latest_revision + and ci.parent_id = :folder_id + and u.user_id <> 0 + and exists ( + select 1 from acs_object_party_privilege_map + where object_id = :assessment_id + and party_id = u.user_id + and privilege = 'read')) a + left join (select as_sessions.*, cr.item_id + from as_sessions, cr_revisions cr + where session_id in (select max(session_id) + from as_sessions, acs_objects o + where not completed_datetime is null + and o.object_id = session_id + and o.package_id = :package_id + group by subject_id, assessment_id ) + and revision_id=assessment_id) cs + on (a.user_id = cs.subject_id and a.item_id = cs.item_id) - and s.completed_datetime >= $start_time + left join (select * + from as_sessions + where session_id in (select max(session_id) + from as_sessions, acs_objects o + where completed_datetime is null + and o.object_id = session_id + and o.package_id = :package_id + group by subject_id, assessment_id)) ns + on (a.user_id = ns.subject_id and a.assessment_id = ns.assessment_id) - - + where 1=1 + [list::filter_where_clauses -and -name "results"] - - - - and trunc(s.completed_datetime) <= $end_time - - - - + order by lower(a.title), lower(a.last_name), lower(a.first_names) + + Index: openacs-4/packages/assessment/www/asm-admin/results-users-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/www/asm-admin/results-users-postgresql.xql 15 May 2007 20:14:18 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/results-users-postgresql.xql 7 Oct 2007 22:36:54 -0000 1.3 @@ -1,22 +1,56 @@ -postgresql7.1 - - + + + select a.title, + a.user_id, a.first_names, a.last_name, + to_char(cs.completed_datetime, :format) as completed_datetime, + to_char(coalesce(cs.last_mod_datetime, ns.last_mod_datetime), :format) as last_mod_datetime, + coalesce(cs.subject_id, ns.subject_id) as subject_id, + coalesce(cs.session_id, ns.session_id) as session_id, + cs.percent_score, + a.last_name || ', ' || a.first_names as subject_name + + from (select a.assessment_id, cr.title, cr.item_id, cr.revision_id, + u.user_id, u.first_names, u.last_name + + from as_assessments a, cr_revisions cr, cr_items ci, acs_users_all u + where a.assessment_id = cr.revision_id + and cr.revision_id = ci.latest_revision + and ci.parent_id = :folder_id + and u.user_id <> 0 + and exists ( + select 1 from acs_object_party_privilege_map + where object_id = :assessment_id + and party_id = u.user_id + and privilege = 'read')) a + left join (select as_sessions.*, cr.item_id + from as_sessions, cr_revisions cr + where session_id in (select max(session_id) + from as_sessions, acs_objects o + where not completed_datetime is null + and o.object_id = session_id + and o.package_id = :package_id + group by subject_id, assessment_id ) + and revision_id=assessment_id) cs + on (a.user_id = cs.subject_id and a.item_id = cs.item_id) - and (s.completed_datetime >= $start_time - or s.completed_datetime is null) - - + left join (select * + from as_sessions + where session_id in (select max(session_id) + from as_sessions, acs_objects o + where completed_datetime is null + and o.object_id = session_id + and o.package_id = :package_id + group by subject_id, assessment_id)) ns + on (a.user_id = ns.subject_id and a.assessment_id = ns.assessment_id) - - + where true - and (date_trunc('day', s.completed_datetime) <= $end_time - or $end_time > now ()) + [list::filter_where_clauses -and -name "results"] - - - + order by lower(a.title), lower(a.last_name), lower(a.first_names) + + Index: openacs-4/packages/assessment/www/asm-admin/results-users.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/assessment/www/asm-admin/results-users.adp 15 May 2007 20:14:18 -0000 1.5 +++ openacs-4/packages/assessment/www/asm-admin/results-users.adp 7 Oct 2007 22:36:54 -0000 1.6 @@ -4,9 +4,11 @@ @count_all_users@ users in community, @count_complete@ complete responses, @count_incomplete@ incomplete responses + #assessment.Responding_Users# + Index: openacs-4/packages/assessment/www/asm-admin/results-users.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/assessment/www/asm-admin/results-users.tcl 15 May 2007 20:14:18 -0000 1.10 +++ openacs-4/packages/assessment/www/asm-admin/results-users.tcl 7 Oct 2007 22:36:54 -0000 1.11 @@ -8,6 +8,7 @@ assessment_id {start_time:optional ""} {end_time:optional ""} + status:optional,notnull } -properties { context:onevalue page_title:onevalue @@ -21,13 +22,15 @@ # Get the assessment data as::assessment::data -assessment_id $assessment_id +set package_id [ad_conn package_id] +set folder_id [as::assessment::folder_id -package_id $package_id] if {![info exists assessment_data(assessment_id)]} { ad_return_complaint 1 "[_ assessment.Requested_assess_does]" ad_script_abort } set user_id [ad_conn user_id] -set assessment_rev_id $assessment_data(assessment_rev_id) + set page_title "[_ assessment.Results_by_user]" set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] set format "[lc_get formbuilder_date_format], [lc_get formbuilder_time_format]" @@ -53,19 +56,31 @@ regsub -all -- {to_date} $end_time {to_timestamp} end_time } + if {![empty_string_p $start_time]} { set start_date_sql [db_map restrict_start_date] } if {![empty_string_p $end_time]} { set end_date_sql [db_map restrict_end_date] } - #ad_returnredirect [export_vars -base results-users {assessment_id start_time end_time}] } +if { [exists_and_not_null status] } { + if { $status == "complete" } { + set whereclause "cs.completed_datetime is not null" + } elseif { $status == "incomplete" } { + set whereclause "cs.completed_datetime is null and ns.session_id is not null" + } else { + set whereclause "cs.completed_datetime is null and ns.session_id is null" + } +} else { + set whereclause "cs.completed_datetime is null and ns.session_id is null" +} + template::list::create \ -name results \ -multirow results \ - -key sessions_id \ + -key session_id \ -elements { session_id { label {[_ assessment.View_Results]} @@ -75,7 +90,7 @@ label {[_ assessment.Name]} } status { - label {#assessment.Status#} + label {\#assessment.Status\#} } completed_datetime { label {[_ assessment.Finish_Time]} @@ -86,19 +101,30 @@ html {align right nowrap} display_template {@results.percent_score@} } - delete { - label {} - display_template {[_ assessment.Delete_Attempts]} - } - } -main_class { - narrow - } + } -filters { + assessment_id { + where_clause { + a.item_id = :assessment_id + } + } + subject_id { + where_clause { + cs.subject_id = :subject_id + } + } + status { + values {{"[_ assessment.Complete]" complete} {"[_ assessment.Incomplete]" incomplete} {"[_ assessment.Not_Taken]" nottaken}} + where_clause { + $whereclause + } + } + } -bulk_actions {"#assessment.Send_Email#" send-mail "#assessment.Send_an_email_to_the_selected users#"} \ + -bulk_action_export_vars {assessment_id} template::multirow create subjects subject_id subject_url subject_name -db_multirow -extend { result_url subject_url status delete_url } results assessment_results { -} { +db_multirow -extend { result_url subject_url status delete_url } results assessment_results {} { # to display list of users who answered the assessment if anonymous template::multirow append subjects $subject_id [acs_community_member_url -user_id $subject_id] $subject_name @@ -133,15 +159,13 @@ } } -# FIXME -set dotlrn_installed_p [apm_package_installed_p dotlrn] -if {$dotlrn_installed_p} { - set count_all_users [llength [dotlrn_community::list_users [dotlrn_community::get_community_id]]] -} else { - # TODO get count from subsite - set count_all_users 0 -} - +set count_all_users [db_string q "select count(*) from users u + where u.user_id <> 0 + and exists (select 1 + from acs_object_party_privilege_map + where party_id = u.user_id + and object_id = :assessment_id + and privilege = 'read')" -default 0] set count_complete [template::multirow size subjects] set count_incomplete [expr {$count_all_users - $count_complete}] ad_return_template Index: openacs-4/packages/assessment/www/asm-admin/results-users.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/assessment/www/asm-admin/results-users.xql 15 May 2007 20:14:18 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/results-users.xql 7 Oct 2007 22:36:54 -0000 1.4 @@ -1,7 +1,7 @@ - + select s.session_id, s.subject_id, s.percent_score, to_char(s.completed_datetime, :format) as completed_datetime, @@ -21,4 +21,5 @@ order by s.completed_datetime + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/save-answer-set.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/save-answer-set.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/save-answer-set.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/assessment/www/asm-admin/section-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-form.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/assessment/www/asm-admin/section-form.tcl 15 May 2007 20:14:18 -0000 1.7 +++ openacs-4/packages/assessment/www/asm-admin/section-form.tcl 7 Oct 2007 22:36:54 -0000 1.8 @@ -124,7 +124,7 @@ } } } -after_submit { - ad_returnredirect [export_vars -base questions {assessment_id}] + ad_returnredirect [export_vars -base questions {assessment_id}]&\#S${new_section_id} ad_script_abort } Index: openacs-4/packages/assessment/www/asm-admin/send-mail-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/send-mail-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/asm-admin/send-mail-oracle.xql 1 Feb 2005 22:00:10 -0000 1.1 +++ openacs-4/packages/assessment/www/asm-admin/send-mail-oracle.xql 7 Oct 2007 22:36:54 -0000 1.2 @@ -2,45 +2,51 @@ oracle8.1.6 - + + select '[db_quote $sender_email]' as from_addr, '[db_quote $sender_first_names]' as sender_first_names, '[db_quote $sender_last_name]' as sender_last_name, parties.email, - decode(acs_objects.object_type, - 'user', - (select first_names - from persons - where person_id = parties.party_id), - 'group', - (select group_name - from groups - where group_id = parties.party_id), - 'rel_segment', - (select segment_name - from rel_segments - where segment_id = parties.party_id), - '') as first_names, - decode(acs_objects.object_type, - 'user', - (select last_name - from persons - where person_id = parties.party_id), - '') as last_name, - '[db_quote $community_name]' as community_name, - '[db_quote $community_url]' as community_url - from party_approved_member_map, + decode(acs_objects.object_type, + 'user', + (select first_names + from persons + where person_id = parties.party_id), + 'group', + (select group_name + from groups + where group_id = parties.party_id), + 'rel_segment', + (select segment_name + from rel_segments + where segment_id = parties.party_id), + '') as first_names, + decode(acs_objects.object_type, + 'user', + (select last_name + from persons + where person_id = parties.party_id), + '') as last_name + from parties, - acs_objects - where party_approved_member_map.party_id = $segment_id - and party_approved_member_map.member_id <> $segment_id - and party_approved_member_map.member_id = parties.party_id + acs_objects, + users + where + parties.party_id <> 0 + and parties.party_id = users.user_id and parties.party_id = acs_objects.object_id + and exists (select 1 from acs_object_party_privilege_map m + where m.object_id = $assessment_id + and m.party_id = parties.party_id + and m.privilege = 'read') + + - + select '[db_quote $sender_email]' as from_addr, '[db_quote $sender_first_names]' as sender_first_names, @@ -65,15 +71,13 @@ (select last_name from persons where person_id = parties.party_id), - '') as last_name, - '[db_quote $community_name]' as community_name, - '[db-quote $community_url]' as community_url - from party_approved_member_map, + '') as last_name + from parties, - acs_objects - where party_approved_member_map.party_id = $segment_id - and party_approved_member_map.member_id <> $segment_id - and party_approved_member_map.member_id = parties.party_id + acs_objects, + users + where + parties.party_id = users.user_id and parties.party_id = acs_objects.object_id and parties.party_id in ( select s.subject_id @@ -84,7 +88,7 @@ - + select '[db_quote $sender_email]' as from_addr, '[db_quote $sender_first_names]' as sender_first_names, @@ -109,22 +113,25 @@ (select last_name from persons where person_id = parties.party_id), - '') as last_name, - '[db_quote $community_name]' as community_name, - '[db_quote $community_url]' as community_url - from party_approved_member_map, + '') as last_name + from parties, - acs_objects - where party_approved_member_map.party_id = $segment_id - and party_approved_member_map.member_id <> $segment_id - and party_approved_member_map.member_id = parties.party_id + acs_objects, + users + where + parties.party_id <> 0 + and parties.party_id = users.user_id and parties.party_id = acs_objects.object_id and parties.party_id not in ( select s.subject_id from as_sessions s, cr_revisions r where s.assessment_id = r.revision_id and s.completed_datetime is not null and r.item_id = $assessment_id) + and exists (select 1 from acs_object_party_privilege_map m + where m.object_id = $assessment_id + and m.party_id = parties.party_id + and m.privilege = 'read') @@ -133,10 +140,10 @@ select '[db_quote $sender_email]' as from_addr, '[db_quote $sender_first_names]' as sender_first_names, '[db_quote $sender_last_name]' as sender_last_name, - parties.email, + parties.email from parties - where parties.party_id = acs_objects.object_id - and parties.party_id in ( + where + parties.party_id in ( select s.subject_id from as_sessions s, cr_revisions r where s.assessment_id = r.revision_id @@ -145,4 +152,15 @@ - \ No newline at end of file + + + select '[db_quote $sender_email]' as from_addr, + '[db_quote $sender_first_names]' as sender_first_names, + '[db_quote $sender_last_name]' as sender_last_name, + parties.email + from parties + where + parties.party_id in ([template::util::tcl_to_sql_list $user_ids]) + + + Index: openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql 1 Feb 2005 22:00:10 -0000 1.1 +++ openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql 7 Oct 2007 22:36:54 -0000 1.2 @@ -3,7 +3,7 @@ postgresql7.1 - + select '[db_quote $sender_email]' as from_addr, '[db_quote $sender_first_names]' as sender_first_names, @@ -28,20 +28,23 @@ (select last_name from persons where person_id = parties.party_id) - else '' end) as last_name, - '[db_quote $community_name]' as community_name, - '[db_quote $community_url]' as community_url - from party_approved_member_map, + else '' end) as last_name + from parties, - acs_objects - where party_approved_member_map.party_id = $segment_id - and party_approved_member_map.member_id <> $segment_id - and party_approved_member_map.member_id = parties.party_id + acs_objects, + users + where + parties.party_id <> 0 + and parties.party_id = users.user_id and parties.party_id = acs_objects.object_id + and exists (select 1 from acs_object_party_privilege_map m + where m.object_id = $assessment_id + and m.party_id = parties.party_id + and m.privilege = 'read') - + select '[db_quote $sender_email]' as from_addr, '[db_quote $sender_first_names]' as sender_first_names, @@ -66,15 +69,13 @@ (select last_name from persons where person_id = parties.party_id) - else '' end) as last_name, - '[db_quote $community_name]' as community_name, - '[db_quote $community_url]' as community_url - from party_approved_member_map, + else '' end) as last_name + from parties, - acs_objects - where party_approved_member_map.party_id = $segment_id - and party_approved_member_map.member_id <> $segment_id - and party_approved_member_map.member_id = parties.party_id + acs_objects, + users + where + parties.party_id = users.user_id and parties.party_id = acs_objects.object_id and parties.party_id in ( select s.subject_id @@ -85,7 +86,7 @@ - + select '[db_quote $sender_email]' as from_addr, '[db_quote $sender_first_names]' as sender_first_names, @@ -113,19 +114,24 @@ else '' end) as last_name, '[db_quote $community_name]' as community_name, '[db_quote $community_url]' as community_url - from party_approved_member_map, + from parties, - acs_objects - where party_approved_member_map.party_id = $segment_id - and party_approved_member_map.member_id <> $segment_id - and party_approved_member_map.member_id = parties.party_id + acs_objects, + users + where + parties.party_id <> 0 + and parties.party_id = users.user_id and parties.party_id = acs_objects.object_id and parties.party_id not in ( select s.subject_id from as_sessions s, cr_revisions r where s.assessment_id = r.revision_id and s.completed_datetime is not null and r.item_id = $assessment_id) + and exists (select 1 from acs_object_party_privilege_map m + where m.object_id = $assessment_id + and m.party_id = parties.party_id + and m.privilege = 'read') @@ -136,7 +142,8 @@ '[db_quote $sender_last_name]' as sender_last_name, parties.email from parties - where parties.party_id in ( + where + parties.party_id in ( select s.subject_id from as_sessions s, cr_revisions r where s.assessment_id = r.revision_id @@ -145,4 +152,16 @@ + + + select '[db_quote $sender_email]' as from_addr, + '[db_quote $sender_first_names]' as sender_first_names, + '[db_quote $sender_last_name]' as sender_last_name, + parties.email + from parties + where + parties.party_id in ([template::util::tcl_to_sql_list $user_ids]) + + + Index: openacs-4/packages/assessment/www/asm-admin/send-mail.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/send-mail.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/assessment/www/asm-admin/send-mail.tcl 8 Apr 2005 00:50:40 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/send-mail.tcl 7 Oct 2007 22:36:54 -0000 1.4 @@ -1,115 +1,123 @@ -ad_page_contract { +# packages/assessment/www/asm-admin/send-mail-to.tcl - this page offers options for sending email regarding - an assessment to various groups - - @param assessment_id +ad_page_contract { - @author dave@thedesignexperience.org - @date July 29, 2002 - @cvs-id $Id: -} { - assessment_id:integer,notnull - {to "responded"} + Choose who to send mail to + + @author Dave Bauer (dave@thedesignexperience.org) + @creation-date 2007-07-06 + @cvs-id $Id$ + +} -query { + {assessment_id ""} + {session_id:multiple ""} + {return_url ""} } -properties { context:onevalue page_title:onevalue } set package_id [ad_conn package_id] set user_id [ad_conn user_id] -set sender_id [ad_conn user_id] -permission::require_permission -object_id $package_id -privilege create -permission::require_permission -object_id $assessment_id -privilege admin +permission::require_permission \ + -privilege "admin" \ + -party_id $user_id \ + -object_id $package_id -# Get the assessment data as::assessment::data -assessment_id $assessment_id - -if {![info exists assessment_data(assessment_id)]} { - ad_return_complaint 1 "[_ assessment.Requested_assess_does]" - ad_script_abort -} - set page_title "[_ assessment.Send_Mail]" set assessment_name $assessment_data(title) set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] -db_1row select_sender_info {} -set dotlrn_installed_p [apm_package_installed_p dotlrn] -if {$dotlrn_installed_p} { - set rel_type "dotlrn_member_rel" - set community_id [dotlrn_community::get_community_id] - set segment_id [db_string select_rel_segment_id {}] - set community_name [dotlrn_community::get_community_name $community_id] - set community_url "[ad_parameter -package_id [ad_acs_kernel_id] SystemURL][dotlrn_community::get_community_url $community_id]" +ad_form -name send-mail -has_submit 1 -form { + {subject:text(text) {value $assessment_name} {label "[_ assessment.Message_Subject]"} {html {size 50}}} + {message:text(textarea) {label "[_ assessment.Enter_Message]"} {html {rows 15 cols 60}}} + {assessment_id:text(hidden) {value $assessment_id}} + {formbutton_ok:text(submit) {label "[_ acs-templating.OK]"}} +} +if {[llength $session_id]} { + if {[llength $session_id] == 1} { + set session_id [split [lindex $session_id 0]] + } + set options [db_list_of_lists get_session_user_options "select u.last_name || ', ' || u.first_names,user_id from acs_users_all u, as_sessions s where s.session_id in ([template::util::tcl_to_sql_list $session_id]) and u.user_id = s.subject_id"] + ad_form -extend -name send-mail -form { + {user_ids:text(checkbox) {label "[_ assessment.Send_mail_to_the_selected_users]"} {options $options}} + {session_id:text(hidden) {value $session_id}} + } +} else { set n_responses [db_string n_responses {}] + if {$n_responses > 0} { - ad_form -name send-mail -form { - {to:text(radio) {options { - {"[_ assessment.lt_Everyone_eligible_to_]" "all"} - {"[_ assessment.lt_Everyone_who_has_alre]" "responded"} - {"[_ assessment.lt_Everyone_who_has_not_]" "not_responded"}}} - {label "[_ assessment.Send_mail_to]"} - {value $to} - } - } + ad_form -extend -name send-mail -form { + {to:text(radio) {options { + {"[_ assessment.lt_Everyone_eligible_to_]" "all"} + {"[_ assessment.lt_Everyone_who_has_alre]" "responded"} + {"[_ assessment.lt_Everyone_who_has_not_]" "not_responded"}}} + {label "[_ assessment.Send_mail_to]"} + } + } } else { - ad_form -name send-mail -form { - {to:text(radio) {options { - {"[_ assessment.lt_Everyone_eligible_to_]" "all"} - {"[_ assessment.lt_Everyone_who_has_not_]" "not_responded"}}} - {label "[_ assessment.Send_mail_to]"} - {value $to} - } - } + ad_form -extend -name send-mail -form { + {to:text(radio) {options { + {"[_ assessment.lt_Everyone_eligible_to_]" "all"} + {"[_ assessment.lt_Everyone_who_has_not_]" "not_responded"}}} + {label "[_ assessment.Send_mail_to]"} + {value $to} + } + } } -} else { - ad_form -name send-mail -form { - {to:text(radio) {options { - {"[_ assessment.lt_Everyone_who_has_alre]" "responded"}}} - {label "[_ assessment.Send_mail_to]"} - {value ""} - } - } } -ad_form -extend -name send-mail -form { - {subject:text(text) {value $assessment_name} {label "[_ assessment.Message_Subject]"} {html {size 50}}} - {message:text(textarea) {label "[_ assessment.Enter_Message]"} {html {rows 15 cols 60}}} - {assessment_id:text(hidden) {value $assessment_id}} +ad_form -extend -name send-mail -on_request { + if {[info exists options]} { + set user_ids [list] + foreach elm $options { + lappend user_ids [lindex $elm 1] + } + } } -on_submit { + acs_user::get -user_id $user_id -array sender + set sender_email $sender(email) + set sender_first_names $sender(first_names) + set sender_last_name $sender(last_name) set query "" - if {$dotlrn_installed_p} { + if {[info exists to] && $to ne ""} { switch $to { all { - set query [db_map dotlrn_all] + set query [db_map all] } responded { - set query [db_map dotlrn_responded] + set query [db_map responded] } not_responded { - set query [db_map dotlrn_not_responded] + set query [db_map not_responded] } } + } elseif {[info exists user_ids] && [llength $user_ids]} { + set query [db_map list_of_user_ids] } else { set query [db_map responded] } - + bulk_mail::new \ -package_id $package_id \ -from_addr $sender_email \ -subject $subject \ -message $message \ -query $query - ad_returnredirect [export_vars -base one-a {assessment_id}] + if {$return_url eq ""} { + set return_url [export_vars -base one-a {assessment_id}] + } + set redirect_message "[_ assessment.Mail_subject_sent]" + ad_returnredirect -message $redirect_message $return_url ad_script_abort -} -ad_return_template + +} \ No newline at end of file Index: openacs-4/packages/assessment/www/asm-admin/send-mail.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/send-mail.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/asm-admin/send-mail.xql 1 Feb 2005 22:00:10 -0000 1.1 +++ openacs-4/packages/assessment/www/asm-admin/send-mail.xql 7 Oct 2007 22:36:54 -0000 1.2 @@ -14,15 +14,6 @@ - - - select rel_segments.segment_id - from rel_segments - where rel_segments.group_id = :community_id - and rel_segments.rel_type = :rel_type - - - select count(*) Index: openacs-4/packages/assessment/www/asm-admin/session-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/session-delete.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/assessment/www/asm-admin/session-delete.tcl 15 May 2007 20:14:18 -0000 1.5 +++ openacs-4/packages/assessment/www/asm-admin/session-delete.tcl 7 Oct 2007 22:36:54 -0000 1.6 @@ -9,7 +9,7 @@ permission::require_permission \ -party_id [ad_conn user_id] \ - -object_id [ad_conn package_id] \ + -object_id $assessment_id \ -privilege admin as::assessment::data -assessment_id $assessment_id set assessment_name $assessment_data(name) Index: openacs-4/packages/assessment/www/asm-admin/sessions.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/sessions.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/www/asm-admin/sessions.adp 26 Sep 2006 00:22:46 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/sessions.adp 7 Oct 2007 22:36:54 -0000 1.3 @@ -1,5 +1,6 @@ - #assessment.All_Users# + @page_title@ + @context@ #assessment.lt_Responses_for_assessm# #assessment.lt_Responses_of_user_per# Index: openacs-4/packages/assessment/www/asm-admin/sessions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/sessions.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/assessment/www/asm-admin/sessions.tcl 15 May 2007 20:14:18 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/sessions.tcl 7 Oct 2007 22:36:54 -0000 1.4 @@ -6,6 +6,7 @@ @author Roel Canicula (roel@solutiongrove.com) @creation-date 2006-06-05 + @arch-tag: cdb2d596-15fc-45ba-9ce1-d648a49a20b7 @cvs-id $Id$ } { @@ -21,16 +22,16 @@ permission::require_permission -object_id $package_id -privilege create set folder_id [as::assessment::folder_id -package_id $package_id] set user_id [ad_conn user_id] - -# hack for dotlrn ideally ad_conn subsite_id would pretend dotlrn was a subsite -if {![apm_package_installed_p dotlrn] \ - || [set members_party_id [dotlrn_community::get_community_id]] eq ""} { - set members_party_id [application_group::group_id_from_package_id \ - -package_id [ad_conn subsite_id]] -} - +set context_object_id $package_id set form [rp_getform] ns_set delkey $form status +set page_title [_ assessment.All_Users] +if {[info exists assessment_id]} { + as::assessment::data -assessment_id $assessment_id + set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] +} else { + set context [list [list index [_ assessment.admin]] $page_title] +} set base_url [ad_return_url] set actions [list] @@ -48,11 +49,23 @@ if { [info exists assessment_id] } { as::assessment::data -assessment_id $assessment_id - + set context_object_id $assessment_id set actions [linsert $actions 0 "[_ assessment.All_Assessments]" ? "[_ assessment.All_Assessments]"] lappend actions "[_ assessment.Summary]" [export_vars -base item-stats { assessment_id {return_url [ad_return_url]} }] "[_ assessment.Summary]" } +if { [exists_and_not_null status] } { + if { $status == "complete" } { + set whereclause "cs.completed_datetime is not null" + } elseif { $status == "incomplete" } { + set whereclause "cs.completed_datetime is null and ns.session_id is not null" + } else { + set whereclause "cs.completed_datetime is null and ns.session_id is null" + } +} else { + set whereclause "cs.completed_datetime is null and ns.session_id is null" +} + # Check membership template::list::create \ @@ -120,67 +133,9 @@ status { values {{"[_ assessment.Complete]" complete} {"[_ assessment.Incomplete]" incomplete} {"[_ assessment.Not_Taken]" nottaken}} where_clause { - (case when :status = 'complete' - then not cs.completed_datetime is null - when :status = 'incomplete' - then cs.completed_datetime is null and not ns.session_id is null - else cs.completed_datetime is null and ns.session_id is null end) + $whereclause } } } -db_multirow sessions get_sessions [subst { - select a.*, - to_char(cs.completed_datetime, 'YYYY-MM-DD HH24:MI:SS') as completed_datetime, - to_char(coalesce(cs.last_mod_datetime, ns.last_mod_datetime), 'YYYY-MM-DD HH24:MI:SS') as last_mod_datetime, - coalesce(cs.subject_id, ns.subject_id) as subject_id, - coalesce(cs.session_id, ns.session_id) as session_id, - cs.percent_score - - from (select a.assessment_id, cr.title, cr.item_id, cr.revision_id, - u.user_id, u.first_names, u.last_name - - from as_assessments a, cr_revisions cr, cr_items ci, acs_users_all u, - group_member_map g - - where a.assessment_id = cr.revision_id - and cr.revision_id = ci.latest_revision - and ci.parent_id = :folder_id - - and g.group_id = :members_party_id - and g.member_id = u.user_id - and acs_permission__permission_p(cr.item_id, u.user_id, 'read')) a - - left join (select as_sessions.*, cr.item_id - from as_sessions, cr_revisions cr - where session_id in (select max(session_id) - from as_sessions, acs_objects o - where not completed_datetime is null - and o.object_id = session_id - and o.package_id = :package_id - group by subject_id, assessment_id ) - and revision_id=assessment_id) cs - on (a.user_id = cs.subject_id and a.item_id = cs.item_id) - - left join (select * - from as_sessions - where session_id in (select max(session_id) - from as_sessions, acs_objects o - where completed_datetime is null - and o.object_id = session_id - and o.package_id = :package_id - group by subject_id, assessment_id)) ns - on (a.user_id = ns.subject_id and a.assessment_id = ns.assessment_id) - - where true - [list::filter_where_clauses -and -name "sessions"] - - order by lower(a.title), lower(a.last_name), lower(a.first_names) -}] - - - - - - - +db_multirow sessions get_sessions "" Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/sessions.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/assessment/www/asm-admin/toggle-publish.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/toggle-publish.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/www/asm-admin/toggle-publish.tcl 15 May 2007 20:14:18 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/toggle-publish.tcl 7 Oct 2007 22:36:54 -0000 1.3 @@ -2,6 +2,7 @@ Publish or unpublish an assessment } { assessment_id:integer,notnull + {return_url ""} } permission::require_permission \ @@ -26,4 +27,7 @@ set message "Publish failed. Following section(s) have no questions: ${empty_sections}" } -ad_returnredirect -message $message [export_vars -base one-a {assessment_id}] +if {$return_url eq ""} { + set return_url [export_vars -base one-a {assessment_id}] +} +ad_returnredirect -message $message $return_url Index: openacs-4/packages/assessment/www/asm-admin/unzip-file.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/unzip-file.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/www/asm-admin/unzip-file.tcl 26 Sep 2006 00:22:46 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/unzip-file.tcl 7 Oct 2007 22:36:54 -0000 1.3 @@ -12,7 +12,7 @@ permission::require_permission \ -object_id [ad_conn package_id] \ -party_id [ad_conn user_id] \ - -privilege "admin" + -privilege "create" set context [list "[_ assessment.Import_Results]"] Index: openacs-4/packages/assessment/www/asm-admin/export/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/export/index.vuh,v diff -u -r1.9 -r1.10 --- openacs-4/packages/assessment/www/asm-admin/export/index.vuh 12 Jun 2006 02:49:52 -0000 1.9 +++ openacs-4/packages/assessment/www/asm-admin/export/index.vuh 7 Oct 2007 22:36:54 -0000 1.10 @@ -384,12 +384,12 @@ $presentation appendChild $response_str #get rows and cols for painting a textarea (in abs_size is stored as "rows value cols value", we need to add the symbol =) db_0or1row html_rows_cols "SELECT html_display_options FROM as_item_display_ta WHERE as_item_display_id=:item_display_id" - if {![empty_string_p $html_display_options]} { - set rows "[lindex $html_display_options 3]" - set columns "[lindex $html_display_options 1]" + if {![catch {array set html_array $html_display_options} errMsg] && [info exists html_array(rows)] && [info exists html_array(cols)]} { + set rows $html_array(rows) + set columns $html_array(cols) } else { - set rows 5 - set columns 25 + set rows 15 + set columns 55 } # set render_fib [$doc createElement render_fib] @@ -473,7 +473,7 @@ # set or [$doc createElement or] $conditionvar appendChild $or - set list_choice_title $choice_title + set list_choice_title [list $choice_title] for {set j 0} {$j < [llength $list_choice_title]} {incr j 1} { # set varequal [$doc createElement varequal] @@ -564,7 +564,8 @@ # set or [$doc createElement or] $and appendChild $or - set list_choice_title $choice_title + set list_choice_title [list $choice_title] + for {set j 0} {$j < [llength $list_choice_title]} {incr j 1} { # set varequal [$doc createElement varequal] @@ -628,7 +629,9 @@ set i 0 # [info exists tb__display_id] because for fib item choice_correct_answer_p is null if { $choice_correct_answer_p == "t" || [info exists tb__display_id] } { - set list_choice_title $choice_title + + set list_choice_title [list $choice_title] + set length_list_choice_title [llength $list_choice_title] if {![info exists tb__display_id]} { Index: openacs-4/packages/assessment-portlet/assessment-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/assessment-portlet.info,v diff -u -r1.4 -r1.5 --- openacs-4/packages/assessment-portlet/assessment-portlet.info 15 May 2007 20:14:18 -0000 1.4 +++ openacs-4/packages/assessment-portlet/assessment-portlet.info 7 Oct 2007 22:36:54 -0000 1.5 @@ -7,11 +7,11 @@ f t - + Jose Pablo Escobedo Del Cid - 2007-04-22 + 2007-09-08 - + Index: openacs-4/packages/assessment-portlet/www/assessment-portlet-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/assessment-portlet-oracle.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/assessment-portlet/www/assessment-portlet-oracle.xql 15 May 2007 20:14:19 -0000 1.5 +++ openacs-4/packages/assessment-portlet/www/assessment-portlet-oracle.xql 7 Oct 2007 22:36:55 -0000 1.6 @@ -5,13 +5,27 @@ - select cr.item_id as assessment_id, cr.title, cr.description, a.password, + select * from (select cr.item_id as assessment_id, cr.title, cr.description, a.password, to_char(a.start_time, 'YYYY-MM-DD HH24:MI:SS') as start_time, to_char(a.end_time, 'YYYY-MM-DD HH24:MI:SS') as end_time, to_char(sysdate, 'YYYY-MM-DD HH24:MI:SS') as cur_time, cf.package_id, p.instance_name as community_name, - sc.node_id as comm_node_id, sa.node_id as as_node_id, - acs_permission__permission_p(a.assessment_id,:user_id,'admin') as admin_p + sc.node_id as comm_node_id, sa.node_id as as_node_id, a.anonymous_p, + acs_permission.permission_p(a.assessment_id,:user_id,'admin') as admin_p, + (select count(*) from as_sessions s1, + cr_revisions cr1 where + s1.assessment_id=cr1.revision_id + and cr1.item_id=cr.item_id + and s1.subject_id=:user_id + and completed_datetime is null) as in_progress_p, + (select count(*) from as_sessions s1, + cr_revisions cr1 where + s1.assessment_id=cr1.revision_id + and cr1.item_id=cr.item_id + and s1.subject_id=:user_id + and completed_datetime is not null) as completed_p, + a.number_tries + from as_assessments a, cr_revisions cr, cr_items ci, cr_folders cf, site_nodes sa, site_nodes sc, apm_packages p where a.assessment_id = cr.revision_id @@ -31,7 +45,53 @@ and ppm.privilege = 'read' and ppm.party_id = :user_id) order by lower(p.instance_name), lower(cr.title) +) q where (q.completed_p < q.number_tries) or (q.number_tries=0 or q.number_tries is null) + + +select * from (select ass.*, sc.node_id as comm_node_id, sa.node_id as as_node_id, p.instance_name as community_name, +acs_permission.permission_p(ass.assessment_id,:user_id,'admin') as admin_p, + (select count(*) from as_sessions s1, + cr_revisions cr1 where + s1.assessment_id=cr1.revision_id and + cr1.item_id=ass.assessment_id + and s1.subject_id=:user_id + and completed_datetime is null) as in_progress_p, + (select count(*) from as_sessions s1, + cr_revisions cr1 where + s1.assessment_id=cr1.revision_id + and cr1.item_id=ass.assessment_id + and s1.subject_id=:user_id + and completed_datetime is not null) as completed_p + + + from + (select cr.item_id as assessment_id, cr.title, cr.description, cf.package_id, + a1.number_tries, a1.end_time + from as_assessments a, cr_revisions cr, cr_items ci, cr_folders cf, + as_assessments a1, + ( select distinct s.assessment_id + from as_sessions s + where s.subject_id = :user_id + and s.completed_datetime is not null) s + where a.assessment_id = cr.revision_id -- + and cf.package_id in ([join $list_of_package_ids ", "]) + and cr.item_id = ci.item_id + and ci.parent_id = cf.folder_id + and s.assessment_id = a.assessment_id + and a1.assessment_id = ci.latest_revision + ) ass, +site_nodes sa, site_nodes sc, apm_packages p +where sa.object_id = ass.package_id +and sc.node_id = sa.parent_id +and p.package_id = sc.object_id +order by lower(p.instance_name), lower(ass.title) +) q + where (q.number_tries is not null and q.number_tries >0 and q.completed_p >= q.number_tries) or (q.end_time is not null and q.end_time < current_timestamp) + + + + Index: openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql,v diff -u -r1.12 -r1.13 --- openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql 15 May 2007 20:14:19 -0000 1.12 +++ openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql 7 Oct 2007 22:36:55 -0000 1.13 @@ -51,4 +51,48 @@ + + +select * from (select ass.*, sc.node_id as comm_node_id, sa.node_id as as_node_id, p.instance_name as community_name, +acs_permission__permission_p(ass.assessment_id,:user_id,'admin') as admin_p, + (select count(*) from as_sessions s1, + cr_revisions cr1 where + s1.assessment_id=cr1.revision_id and + cr1.item_id=ass.assessment_id + and s1.subject_id=:user_id + and completed_datetime is null) as in_progress_p, + (select count(*) from as_sessions s1, + cr_revisions cr1 where + s1.assessment_id=cr1.revision_id + and cr1.item_id=ass.assessment_id + and s1.subject_id=:user_id + and completed_datetime is not null) as completed_p + + + from + (select cr.item_id as assessment_id, cr.title, cr.description, cf.package_id, + a1.number_tries, a1.end_time + from as_assessments a, cr_revisions cr, cr_items ci, cr_folders cf, + as_assessments a1, + ( select distinct s.assessment_id + from as_sessions s + where s.subject_id = :user_id + and s.completed_datetime is not null) s + where a.assessment_id = cr.revision_id -- + and cf.package_id in ([join $list_of_package_ids ", "]) + and cr.item_id = ci.item_id + and ci.parent_id = cf.folder_id + and s.assessment_id = a.assessment_id + and a1.assessment_id = ci.latest_revision + ) ass, +site_nodes sa, site_nodes sc, apm_packages p +where sa.object_id = ass.package_id +and sc.node_id = sa.parent_id +and p.package_id = sc.object_id +order by lower(p.instance_name), lower(ass.title) +) q + where (q.number_tries is not null and q.number_tries >0 and q.completed_p >= q.number_tries) or (q.end_time is not null and q.end_time < current_timestamp) + + + Fisheye: Tag 1.9 refers to a dead (removed) revision in file `openacs-4/packages/assessment-portlet/www/assessment-portlet.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/bm-portlet/bm-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bm-portlet/bm-portlet.info,v diff -u -r1.14 -r1.15 --- openacs-4/packages/bm-portlet/bm-portlet.info 15 May 2007 20:14:19 -0000 1.14 +++ openacs-4/packages/bm-portlet/bm-portlet.info 7 Oct 2007 22:36:55 -0000 1.15 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - + - + Index: openacs-4/packages/calendar/calendar.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/calendar.info,v diff -u -r1.35 -r1.36 --- openacs-4/packages/calendar/calendar.info 27 Jun 2007 22:50:08 -0000 1.35 +++ openacs-4/packages/calendar/calendar.info 7 Oct 2007 22:36:55 -0000 1.36 @@ -27,6 +27,7 @@ + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/calendar/tcl/apm-callback-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/calendar/tcl/apm-callback-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/calendar/tcl/calendar-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.tcl,v diff -u -r1.30 -r1.31 --- openacs-4/packages/calendar/tcl/calendar-procs.tcl 15 May 2007 20:14:21 -0000 1.30 +++ openacs-4/packages/calendar/tcl/calendar-procs.tcl 7 Oct 2007 22:36:55 -0000 1.31 @@ -106,6 +106,8 @@ end; } ] + #removing inherited permissions + permission::set_not_inherit -object_id $calendar_id return $calendar_id Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.adp,v diff -u -r1.12 -r1.13 --- openacs-4/packages/calendar/www/cal-item-delete-confirm.adp 15 May 2007 20:14:21 -0000 1.12 +++ openacs-4/packages/calendar/www/cal-item-delete-confirm.adp 7 Oct 2007 22:36:55 -0000 1.13 @@ -4,6 +4,7 @@ + link Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl 25 Feb 2004 13:07:08 -0000 1.8 +++ openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl 7 Oct 2007 22:36:55 -0000 1.9 @@ -21,4 +21,17 @@ set cal_item(no_time_p) [dt_no_time_p -start_time $cal_item(start_time) -end_time $cal_item(end_time)] set date $cal_item(start_date) + +# To be replaced by a call to template::head API +if {![template::multirow exists link]} { + template::multirow create link rel type href title lang media +} +template::multirow append link \ + stylesheet \ + "text/css" \ + "/resources/calendar/calendar.css" \ + "" \ + en \ + "all" + ad_return_template Index: openacs-4/packages/calendar/www/cal-item-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.adp,v diff -u -r1.18 -r1.19 --- openacs-4/packages/calendar/www/cal-item-new.adp 15 May 2007 20:14:21 -0000 1.18 +++ openacs-4/packages/calendar/www/cal-item-new.adp 7 Oct 2007 22:36:55 -0000 1.19 @@ -13,8 +13,8 @@ +link - - Index: openacs-4/packages/calendar/www/cal-item-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v diff -u -r1.33 -r1.34 --- openacs-4/packages/calendar/www/cal-item-new.tcl 13 Aug 2007 05:11:26 -0000 1.33 +++ openacs-4/packages/calendar/www/cal-item-new.tcl 7 Oct 2007 22:36:55 -0000 1.34 @@ -21,12 +21,7 @@ set package_id [ad_conn package_id] set user_id [ad_conn user_id] -set js "" -if { [ns_queryget time_p] != 1 && [ns_queryget start_time] == "" } { - set js "disableTime('cal_item');" -} - if {![info exists item_type_id]} { set item_type_id "" } @@ -36,6 +31,17 @@ set calendar_list [calendar::calendar_list] set calendar_options [calendar::calendar_list -privilege create] +# To be replaced by a call to template::head API +if {![template::multirow exists link]} { + template::multirow create link rel type href title lang media +} +template::multirow append link \ + stylesheet \ + "text/css" \ + "/resources/calendar/calendar.css" \ + "" \ + en \ + "all" # TODO: Move into ad_form if { ![ad_form_new_p -key cal_item_id] } { @@ -49,10 +55,10 @@ } # TODO: Move into ad_form if { [exists_and_not_null cal_item_id] } { - set page_title "One calendar item" + set page_title [_ calendar.Calendar_Edit_Item] set ad_form_mode display } else { - set page_title "Add a calendar item" + set page_title [_ calendar.Calendar_Add_Item] set ad_form_mode edit } Index: openacs-4/packages/calendar/www/cal-item-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.adp,v diff -u -r1.29 -r1.30 --- openacs-4/packages/calendar/www/cal-item-view.adp 15 May 2007 20:14:21 -0000 1.29 +++ openacs-4/packages/calendar/www/cal-item-view.adp 7 Oct 2007 22:36:55 -0000 1.30 @@ -4,6 +4,7 @@ +link @cal_item_id@ Index: openacs-4/packages/calendar/www/cal-item-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.tcl,v diff -u -r1.19 -r1.20 --- openacs-4/packages/calendar/www/cal-item-view.tcl 15 May 2007 20:14:21 -0000 1.19 +++ openacs-4/packages/calendar/www/cal-item-view.tcl 7 Oct 2007 22:36:55 -0000 1.20 @@ -18,10 +18,6 @@ set write_p [permission::write_permission_p -object_id $cal_item_id -creation_user $cal_item(creation_user)] -if {[exists_and_not_null return_url]} { - set return_url [ad_urlencode $return_url] -} - # Attachments? if {$cal_item(n_attachments) > 0} { set item_attachments [attachments::get_attachments -object_id $cal_item(cal_item_id) -return_url [ad_return_url]] @@ -48,5 +44,17 @@ set cal_item_new_url [export_vars -base "cal-item-new" {cal_item_id return_url}] set cal_item_delete_url [export_vars -base "cal-item-delete" {cal_item_id return_url}] +# To be replaced by a call to template::head API +if {![template::multirow exists link]} { + template::multirow create link rel type href title lang media +} +template::multirow append link \ + stylesheet \ + "text/css" \ + "/resources/calendar/calendar.css" \ + "" \ + en \ + "all" + ad_return_template Index: openacs-4/packages/calendar/www/view-month-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.adp,v diff -u -r1.18 -r1.19 --- openacs-4/packages/calendar/www/view-month-display.adp 13 Aug 2007 06:37:57 -0000 1.18 +++ openacs-4/packages/calendar/www/view-month-display.adp 7 Oct 2007 22:36:55 -0000 1.19 @@ -48,7 +48,8 @@ @items.start_time@ @items.event_name@ - + + [@items.calendar_name@] Index: openacs-4/packages/calendar/www/view-month-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.tcl,v diff -u -r1.21 -r1.22 --- openacs-4/packages/calendar/www/view-month-display.tcl 15 May 2007 20:14:21 -0000 1.21 +++ openacs-4/packages/calendar/www/view-month-display.tcl 7 Oct 2007 22:36:55 -0000 1.22 @@ -22,9 +22,13 @@ set portlet_mode_p 1 } +if {![info exists return_url]} { + set return_url [ad_urlencode "../"] +} + if {[info exists portlet_mode_p] && $portlet_mode_p} { set page_num_urlvar "&page_num=$page_num" - set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=[ad_urlencode "../"]&action=edit&cal_item_id=\$item_id" + set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=$return_url&action=edit&cal_item_id=\$item_id" set prev_month_template "?view=month&date=\[ad_urlencode \$prev_month\]&page_num=$page_num" set next_month_template "?view=month&date=\[ad_urlencode \$next_month\]&page_num=$page_num" set url_stub_callback "calendar_portlet_display::get_url_stub" @@ -117,7 +121,8 @@ time_p \ add_url \ day_url \ - style_class + style_class \ + num_attachments # Calculate number of greyed days and then add them to the calendar mulitrow set greyed_days_before_month [expr [expr [dt_first_day_of_month $this_year $this_month]] -1 ] @@ -151,7 +156,8 @@ "" \ "" \ "" \ - "" + "" \ + "" } } @@ -209,7 +215,8 @@ 0 \ "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \ "?view=day&date=[dt_julian_to_ansi $current_day]&$page_num_urlvar" \ - "calendar-${system_type}Item" + "calendar-${system_type}Item" \ + $num_attachments } } @@ -251,7 +258,8 @@ $time_p \ "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \ "?view=day&date=[dt_julian_to_ansi $current_day]&$page_num_urlvar" \ - "calendar-${system_type}Item" + "calendar-${system_type}Item" \ + $num_attachments } if { !$exporting_p } { @@ -285,7 +293,8 @@ 0 \ "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \ "?view=day&date=[dt_julian_to_ansi $current_day]&$page_num_urlvar" \ - "" + "" \ + "" } # Add cells for remaining days outside the month @@ -312,7 +321,8 @@ "" \ "" \ "" \ - "" + "" \ + "" } } } Index: openacs-4/packages/calendar/www/view-one-day-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.adp,v diff -u -r1.20 -r1.21 --- openacs-4/packages/calendar/www/view-one-day-display.adp 15 May 2007 20:14:21 -0000 1.20 +++ openacs-4/packages/calendar/www/view-one-day-display.adp 7 Oct 2007 22:36:55 -0000 1.21 @@ -12,7 +12,7 @@ - @items.event_name@ + @items.event_name@ Index: openacs-4/packages/calendar/www/view-one-day-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v diff -u -r1.35 -r1.36 --- openacs-4/packages/calendar/www/view-one-day-display.tcl 15 May 2007 20:14:21 -0000 1.35 +++ openacs-4/packages/calendar/www/view-one-day-display.tcl 7 Oct 2007 22:36:55 -0000 1.36 @@ -16,7 +16,7 @@ set hour_height_sep 3 set hour_height_units px set bump_right_base 0 -set bump_right_delta 35 +set bump_right_delta 155 set bump_right_units px if {[info exists url_stub_callback]} { @@ -83,7 +83,8 @@ end_time \ top \ height \ - style + style \ + num_attachments set previous_intervals [list] @@ -134,7 +135,8 @@ $pretty_end_time \ 0 \ 0 \ - "left: ${bump_right_base}${bump_right_units};" + "left: ${bump_right_base}${bump_right_units};" \ + $num_attachments incr bump_right_base $bump_right_delta } @@ -216,7 +218,8 @@ $pretty_end_time \ $top \ $height \ - "left: ${bump_right}${bump_right_units};" + "left: ${bump_right}${bump_right_units};" \ + $num_attachments lappend previous_intervals $start_seconds $end_seconds } Index: openacs-4/packages/calendar/www/view-week-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.adp,v diff -u -r1.15 -r1.16 --- openacs-4/packages/calendar/www/view-week-display.adp 13 Aug 2007 06:37:57 -0000 1.15 +++ openacs-4/packages/calendar/www/view-week-display.adp 7 Oct 2007 22:36:55 -0000 1.16 @@ -33,7 +33,7 @@ - @items.event_name@ + @items.event_name@ Index: openacs-4/packages/calendar/www/view-week-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.tcl,v diff -u -r1.19 -r1.20 --- openacs-4/packages/calendar/www/view-week-display.tcl 15 May 2007 20:14:21 -0000 1.19 +++ openacs-4/packages/calendar/www/view-week-display.tcl 7 Oct 2007 22:36:55 -0000 1.20 @@ -101,7 +101,8 @@ style_class \ top \ height \ - left + left \ + num_attachments # Convert date from user timezone to system timezone set first_weekday_of_the_week_tz [lc_time_conn_to_system "$first_weekday_of_the_week 00:00:00"] @@ -263,7 +264,8 @@ "calendar-Item" \ $top \ $height \ - $left + $left \ + $num_attachments set current_weekday $day_of_week Index: openacs-4/packages/calendar/www/view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v diff -u -r1.30 -r1.31 --- openacs-4/packages/calendar/www/view.adp 15 May 2007 20:14:21 -0000 1.30 +++ openacs-4/packages/calendar/www/view.adp 7 Oct 2007 22:36:55 -0000 1.31 @@ -3,6 +3,7 @@ +link @@ -18,7 +19,9 @@ - @notification_chunk;noquote@ + + @notification_chunk;noquote@ + Index: openacs-4/packages/calendar/www/view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.tcl,v diff -u -r1.24 -r1.25 --- openacs-4/packages/calendar/www/view.tcl 15 May 2007 20:14:21 -0000 1.24 +++ openacs-4/packages/calendar/www/view.tcl 7 Oct 2007 22:36:55 -0000 1.25 @@ -53,6 +53,7 @@ set ansi_day [string trimleft [lindex $ansi_list 2] "0"] set end_date [dt_julian_to_ansi [expr [dt_ansi_to_julian $ansi_year $ansi_month $ansi_day ] + $period_days]] } +set calendar_personal_p [calendar::personal_p -calendar_id [lindex [lindex [calendar::calendar_list -package_id $package_id ] 0] 1] ] set notification_chunk [notification::display::request_widget \ -type calendar_notif \ @@ -61,5 +62,16 @@ -url [ad_conn url] \ ] +# To be replaced by a call to template::head API +if {![template::multirow exists link]} { + template::multirow create link rel type href title lang media +} +template::multirow append link \ + stylesheet \ + "text/css" \ + "/resources/calendar/calendar.css" \ + "" \ + en \ + "all" ad_return_template Index: openacs-4/packages/calendar/www/views-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/views-oracle.xql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/calendar/www/views-oracle.xql 15 May 2007 20:14:21 -0000 1.6 +++ openacs-4/packages/calendar/www/views-oracle.xql 7 Oct 2007 22:36:55 -0000 1.7 @@ -20,7 +20,8 @@ e.event_id as item_id, (select type from cal_item_types where item_type_id= ci.item_type_id) as item_type, cals.calendar_id, - cals.calendar_name + cals.calendar_name, + (select count(1) from attachments where object_id=e.event_id) as num_attachments $additional_select_clause from cal_items ci, acs_events e, @@ -55,7 +56,8 @@ e.event_id as item_id, (select type from cal_item_types where item_type_id= ci.item_type_id) as item_type, cals.calendar_id, - cals.calendar_name + cals.calendar_name, + (select count(1) from attachments where object_id=e.event_id) as num_attachments $additional_select_clause from cal_items ci, acs_events e, Index: openacs-4/packages/calendar/www/views-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/views-postgresql.xql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/calendar/www/views-postgresql.xql 15 May 2007 20:14:21 -0000 1.6 +++ openacs-4/packages/calendar/www/views-postgresql.xql 7 Oct 2007 22:36:55 -0000 1.7 @@ -19,7 +19,8 @@ e.event_id as item_id, cit.type as item_type, cals.calendar_id, - cals.calendar_name + cals.calendar_name, + (select count(1) from attachments where object_id=e.event_id) as num_attachments $additional_select_clause from acs_activities a, acs_events e, @@ -56,7 +57,8 @@ e.event_id as item_id, (select type from cal_item_types where item_type_id= ci.item_type_id) as item_type, cals.calendar_id, - cals.calendar_name + cals.calendar_name, + (select count(1) from attachments where object_id=e.event_id) as num_attachments $additional_select_clause from cal_items ci, acs_events e, Index: openacs-4/packages/calendar/www/resources/images/attach.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/resources/images/attach.png,v diff -u -r1.1 -r1.2 Binary files differ Index: openacs-4/packages/calendar-portlet/calendar-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/calendar-portlet.info,v diff -u -r1.23 -r1.24 --- openacs-4/packages/calendar-portlet/calendar-portlet.info 15 May 2007 20:14:22 -0000 1.23 +++ openacs-4/packages/calendar-portlet/calendar-portlet.info 7 Oct 2007 22:36:56 -0000 1.24 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - + - + Index: openacs-4/packages/categories/tcl/categories-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/categories-procs.tcl,v diff -u -r1.23 -r1.24 --- openacs-4/packages/categories/tcl/categories-procs.tcl 6 Oct 2007 13:51:43 -0000 1.23 +++ openacs-4/packages/categories/tcl/categories-procs.tcl 7 Oct 2007 22:36:56 -0000 1.24 @@ -217,7 +217,22 @@ return $result } +ad_proc -public category::get_mapped_categories_multirow { + {-locale ""} + {-multirow mapped_categories} + object_id +} { + Returns multirow with: tree_id, tree_name, category_id, category_name + @param object_id object of which we want to know the mapped categories. + @return multirow with tree and category information + @author Peter Kreuzinger (peter.kreuzinger@wu-wien.ac.at) +} { + if { $locale == ""} {set locale [ad_conn locale]} + upvar $multirow mapped_categories + db_multirow mapped_categories select {} +} + ad_proc -public category::get_id { name {locale en_US} @@ -339,7 +354,46 @@ } return $result } +ad_proc -public category::get_children { + -category_id:required +} { + Returns the category ids of the direct children of the given category + @param category_id category_id + @return list of category ids of the children of the supplied category_id + @author Peter Kreuzinger (peter.kreuzinger@wu-wien.ac.at) +} { + set result [list] + set child_categories [db_list get_children_ids ""] + foreach category_id $child_categories { + lappend result $category_id + } + if {$result eq ""} {set result 0} + return $result +} + +ad_proc -public category::count_children { + {-category_id:required} +} { + counts all direct sub categories +} { + return [db_string select {}] +} + +ad_proc -public category::get_parent { + -category_id:required +} { + Returns the category id of the parent category + + @param category_id category_id + @return category id of the parent category + @author Peter Kreuzinger (peter.kreuzinger@wu-wien.ac.at) +} { + set result [db_list get_parent_id ""] + if {$result eq "{}"} {set result 0} + return $result +} + ad_proc -public category::get_tree { category_id } { @@ -376,6 +430,48 @@ return [list $category_id [category::get_name $category_id $locale] $tree_id [category_tree::get_name $tree_id $locale]] } +ad_proc -public category::get_objects { + -category_id + {-object_type ""} + {-content_type ""} + {-include_children:boolean} +} { + Returns a list of objects which are mapped to this category_id + + @param category_id CategoryID of the category we want to get the objects for + @param object_type Limit the search for objects of this object type + @param content_type Limit the search for objects of this content_type + @param include_children Include child categories' objects as well. Not yet implemented + + @author malte () + @creation-date Wed May 30 06:28:25 CEST 2007 +} { + set join_clause "" + set where_clause "" + if {$content_type ne ""} { + set join_clause ", cr_items i" + set where_clause "and i.item_id = com.object_id and i.content_type = :content_type" + } elseif {$object_type ne ""} { + set join_clause ", acs_objects o" + set where_clause "and o.object_id = com.object_id and o.object_type = :object_type" + } + return [db_list get_objects {}] +} + +ad_proc -public category::get_id_by_object_title { + title +} { + Gets the id of a category given an object title (object_type=category). + This is highly useful as the category object title will not change if you change the + name (label) of the category, so you can access the category even if the label has changed + + @param title object title of the category to retrieve + @return the category id or empty string it no category was found + @author Peter Kreuzinger (peter.kreuzinger@wu-wien.ac.at) +} { + return [db_string get_category_id {} -default ""] +} + ad_proc -public category::get_object_context { object_id } { Returns the object name and url to be used in a context bar. Index: openacs-4/packages/categories/tcl/categories-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/Attic/categories-procs.xql,v diff -u -r1.8 -r1.9 --- openacs-4/packages/categories/tcl/categories-procs.xql 23 Mar 2005 22:44:56 -0000 1.8 +++ openacs-4/packages/categories/tcl/categories-procs.xql 7 Oct 2007 22:36:56 -0000 1.9 @@ -1,6 +1,35 @@ + + + select count(*) + from categories + where parent_id=:category_id + + + + + + + select category_id + from categories + where parent_id = :category_id + + + + + + + + select parent_id + from categories + where category_id = :category_id + limit 1 + + + + @@ -74,6 +103,22 @@ + + + + select co.tree_id, aot.title, c.category_id, ao.title + from category_object_map_tree co, categories c, category_translations ct, acs_objects ao, acs_objects aot + where co.object_id = :object_id + and co.category_id = c.category_id + and c.category_id = ao.object_id + and c.category_id = ct.category_id + and aot.object_id = co.tree_id + and ct.locale = :locale + order by aot.title, ao.title + + + + SELECT category_object_map.category_id @@ -84,6 +129,24 @@ + + + SELECT com.object_id + FROM category_object_map com $join_clause + WHERE com.category_id = :category_id $where_clause + + + + + + + select object_id + from acs_objects + where title = :title + and object_type = 'category' + + + Index: openacs-4/packages/categories/tcl/category-trees-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-trees-procs.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/categories/tcl/category-trees-procs.tcl 6 Oct 2007 13:51:43 -0000 1.22 +++ openacs-4/packages/categories/tcl/category-trees-procs.tcl 7 Oct 2007 22:36:56 -0000 1.23 @@ -26,6 +26,21 @@ return [array get tree] } + ad_proc -public get_categories { + {-tree_id:required} + } { + returns the main categories of a given tree + } { + set locale [ad_conn locale] + set result [list] + set categories [db_list get_categories ""] + foreach category_id $categories { + lappend result $category_id + } + return $result + + } + ad_proc -public map { -tree_id:required -object_id:required @@ -216,7 +231,38 @@ return $result } + ad_proc -public get_trees { object_id } { + Get the category trees mapped to an object. + @param object_id object to get the mapped category trees. + @return tcl list of tree_ids + @author Peter Kreuzinger (peter.kreuzinger@wu-wien.ac.at) + } { + set result [list] + + db_foreach get_trees "" { + lappend result $tree_id + } + + return $result + } + + ad_proc -public get_id_by_object_title { + {-title} + } { + Gets the id of a category_tree given an object title (object_type=category). + This is highly useful as the category_tree object title will not change if you change the + name (label) of the category_tree, so you can access the category_tree even if the label has changed. + Why would you want this? E.g. if you have the category widget and want to get only one specific tree + displayed and not all of them. + + @param title object title of the category to retrieve + @return the category_tree_id or empty string it no category was found + @author Malte Sussdorff (malte.sussdorff@cognovis.de) + } { + return [db_string get_tree_id {} -default ""] + } + ad_proc -public get_mapped_trees_from_object_list { object_id_list {locale ""}} { Get the category trees mapped to a list of objects. Index: openacs-4/packages/categories/tcl/category-trees-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/Attic/category-trees-procs.xql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/categories/tcl/category-trees-procs.xql 28 Aug 2007 16:30:03 -0000 1.9 +++ openacs-4/packages/categories/tcl/category-trees-procs.xql 7 Oct 2007 22:36:56 -0000 1.10 @@ -11,7 +11,17 @@ - + + + select c.category_id as category_id from categories c, category_translations ct + where parent_id is null + and tree_id = :tree_id + and c.category_id = ct.category_id + and locale = :locale + order by name + + + @@ -36,6 +46,16 @@ + + + + select object_id + from acs_objects + where title = :title + and object_type = 'category_tree' + + + @@ -59,8 +79,16 @@ + + + + select distinct tree_id + from category_object_map_tree + where object_id = :object_id + + + - Index: openacs-4/packages/categories/tcl/widget-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/widget-procs.tcl,v diff -u -r1.20 -r1.21 --- openacs-4/packages/categories/tcl/widget-procs.tcl 28 Aug 2007 16:30:03 -0000 1.20 +++ openacs-4/packages/categories/tcl/widget-procs.tcl 7 Oct 2007 22:36:56 -0000 1.21 @@ -14,9 +14,24 @@ namespace eval template::data::transform {} namespace eval template::data::validate {} -ad_proc -public template::widget::category { element_reference tag_attributes } { - # author: Timo Hentschel (timo@timohentschel.de) - +ad_proc -public template::widget::category { + element_reference + tag_attributes +} { + Display the category widget. This has a multitude of options: + + value: Values should be a list of two items: the object_id being viewed and the object_id which the trees are mapped to. + This will get the mapped trees (if no value provided defaults to package_id) and the mapped categories for the object_id. If you + do not provide a value, the following options are used: + category_application_id> + category_object_id + category_tree_id + category_subtree_id + category_assign_single_p + category_require_category_p + + @author: Timo Hentschel (timo@timohentschel.de) +} { upvar $element_reference element if { [info exists element(html)] } { Index: openacs-4/packages/dotlrn/dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v diff -u -r1.126 -r1.127 --- openacs-4/packages/dotlrn/dotlrn.info 15 May 2007 20:14:24 -0000 1.126 +++ openacs-4/packages/dotlrn/dotlrn.info 7 Oct 2007 22:36:56 -0000 1.127 @@ -7,19 +7,19 @@ f f - + OpenACS A Course Management System - 2007-04-22 + 2007-09-08 OpenACS Course Management - + - - + + @@ -31,6 +31,7 @@ + @@ -71,6 +72,7 @@ + Index: openacs-4/packages/dotlrn/install.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/install.xml,v diff -u -r1.15 -r1.16 --- openacs-4/packages/dotlrn/install.xml 15 May 2007 20:14:24 -0000 1.15 +++ openacs-4/packages/dotlrn/install.xml 7 Oct 2007 22:36:56 -0000 1.16 @@ -25,9 +25,17 @@ + + + + + + + + Index: openacs-4/packages/dotlrn/lib/member-email-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/lib/member-email-confirm.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/lib/member-email-confirm.tcl 15 May 2007 20:14:25 -0000 1.2 +++ openacs-4/packages/dotlrn/lib/member-email-confirm.tcl 7 Oct 2007 22:36:56 -0000 1.3 @@ -21,7 +21,7 @@ -form { {from_addr:text {label "\#dotlrn.From\#"}} {subject:text {label "\#dotlrn.Subject\#"}} - {email:richtext {label "\#dotlrn.Email_1\#"}} + {email:richtext {label "\#dotlrn.Email_1\#"} {html {rows 20 cols 80 style width:100%}}} {btn_ok:text(submit) {label "[_ dotlrn.OK_Send_Email]"}} {btn_cancel:text(submit) {label "[_ dotlrn.Cancel_Dont_Send_email]"}} } -on_request { Index: openacs-4/packages/dotlrn/lib/member-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/lib/member-email.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/lib/member-email.tcl 15 Dec 2006 22:45:22 -0000 1.3 +++ openacs-4/packages/dotlrn/lib/member-email.tcl 7 Oct 2007 22:36:56 -0000 1.4 @@ -70,7 +70,7 @@ ad_form -extend -name "member_email" -form { {from_addr:text {label "From Address"} {html {size 40}}} {subject:text {label "Subject"} {html {size 40}}} - {email:richtext,optional {label "Message"} {html {rows 30 cols 80 wrap soft}} {htmlarea_p 0}} + {email:richtext,optional {label "Message"} {html {rows 30 cols 80}} {htmlarea_p 0}} {community_id:text(hidden) {value $community_id}} {type:text(hidden) {value $type}} {enabled_p:text(hidden) {value $type}} Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v diff -u -r1.199 -r1.200 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 21 Jun 2007 19:04:56 -0000 1.199 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 7 Oct 2007 22:36:56 -0000 1.200 @@ -231,6 +231,7 @@ set non_member_portal_id [portal::create \ -name "$pretty_name Non-Member Portal" \ -default_page_name [dotlrn::parameter -name non_member_page_name] \ + -layout_name [dotlrn::parameter -name non_member_layout_name] \ -context_id $community_id \ $user_id \ ] @@ -239,6 +240,7 @@ set admin_portal_id [portal::create \ -name "$pretty_name Administration Portal" \ -default_page_name [dotlrn::parameter -name admin_page_name] \ + -layout_name [dotlrn::parameter -name admin_layout_name] \ -context_id $community_id \ $user_id \ ] @@ -1035,13 +1037,22 @@ {-package_id ""} } { Returns the community id depending on the package_id - we're at, or the package_id passed in + we're at, or the package_id passed in. + + If no community_id found, return empty_string + + @param package_id PackageID for which to search the community_id for + @return community_id of the community where the package is mounted, empty string if not found } { if {[empty_string_p $package_id]} { set package_id [site_node_closest_ancestor_package -default [ad_conn package_id] dotlrn] } - return [util_memoize "dotlrn_community::get_community_id_not_cached -package_id $package_id"] + if {$package_id ne ""} { + return [util_memoize "dotlrn_community::get_community_id_not_cached -package_id $package_id"] + } else { + return "" + } } ad_proc -private get_community_id_not_cached { Index: openacs-4/packages/dotlrn/www/clone.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/clone.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/dotlrn/www/clone.tcl 8 Aug 2006 21:26:23 -0000 1.8 +++ openacs-4/packages/dotlrn/www/clone.tcl 7 Oct 2007 22:36:56 -0000 1.9 @@ -75,7 +75,7 @@ -label [_ dotlrn.Description] \ -datatype text \ -widget textarea \ - -html {rows 5 cols 60 wrap soft} \ + -html {rows 5 cols 60} \ -optional \ -value "[_ dotlrn.A_copy_of] $community_name" Index: openacs-4/packages/dotlrn/www/community-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/dotlrn/www/community-edit.tcl 15 Dec 2006 22:45:22 -0000 1.14 +++ openacs-4/packages/dotlrn/www/community-edit.tcl 7 Oct 2007 22:36:56 -0000 1.15 @@ -39,7 +39,7 @@ {description:text(textarea),optional {label "#dotlrn.Description#"} - {html {rows 5 cols 60 wrap soft}} + {html {rows 5 cols 60}} {help_text "[_ dotlrn.lt_do_not_use_p_tags]"} } Index: openacs-4/packages/dotlrn/www/member-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-email.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/member-email.tcl 8 Aug 2006 21:26:24 -0000 1.2 +++ openacs-4/packages/dotlrn/www/member-email.tcl 7 Oct 2007 22:36:56 -0000 1.3 @@ -24,7 +24,7 @@ {email_id:key} {from_addr:text {label "From Address"} {html {size 40}}} {subject:text {label "Subject"} {html {size 40}}} - {email:richtext,optional {label "Message"} {html {rows 30 cols 80 wrap soft}} {htmlarea_p 1}} + {email:richtext,optional {label "Message"} {html {rows 30 cols 80}}} } -on_request { set from_addr [cc_email_from_party [ad_conn user_id]] @@ -53,4 +53,4 @@ ad_returnredirect "one-community-admin" ad_script_abort -} \ No newline at end of file +} Index: openacs-4/packages/dotlrn/www/members.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.adp,v diff -u -r1.24 -r1.25 --- openacs-4/packages/dotlrn/www/members.adp 8 Aug 2006 21:26:24 -0000 1.24 +++ openacs-4/packages/dotlrn/www/members.adp 7 Oct 2007 22:36:56 -0000 1.25 @@ -42,10 +42,13 @@ -#dotlrn.Membership_Requests# + + + #dotlrn.Membership_Requests# + + + - - Index: openacs-4/packages/dotlrn/www/members.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v diff -u -r1.26 -r1.27 --- openacs-4/packages/dotlrn/www/members.tcl 4 Oct 2007 16:07:05 -0000 1.26 +++ openacs-4/packages/dotlrn/www/members.tcl 7 Oct 2007 22:36:56 -0000 1.27 @@ -31,6 +31,8 @@ set context [list [list "one-community-admin" [_ dotlrn.Admin]] [_ dotlrn.Manage_Members]] set community_id [dotlrn_community::get_community_id] set spam_p [dotlrn::user_can_spam_community_p -user_id [ad_get_user_id] -community_id $community_id] +set approval_policy_p [string eq [group::join_policy -group_id $community_id] "needs approval"] + set referer [ns_conn url] set return_url "[ns_conn url]?[ns_conn query]" @@ -73,23 +75,22 @@ # Actions for Removing Members according to their role set rel_types [dotlrn_community::get_roles -community_id $community_id] +set bulk_actions "" +set bulk_actions_export_vars "" +set actions "" + if {$admin_p} { - set bulk_actions [list "[_ dotlrn.User_Admin_Page]" "member-add-3" "[_ dotlrn.User_Admin_Page]" "[_ dotlrn.Drop_Membership]" "deregister" "[_ dotlrn.Drop_Membership]"] - set bulk_actions_export_vars [list "user_id" "rel_type" "referer" "reset"] + set bulk_actions [list "[_ dotlrn.Drop_Membership]" "deregister" "[_ dotlrn.Drop_Membership]"] + set bulk_actions_export_vars [list "user_id" "referer" "reset"] set actions [list "CSV" "members?csv=yes" "[_ dotlrn.Comma_Separated_Values]"] foreach role $rel_types { # lappend actions "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" "members?reset=1&reltype=[lindex $role 0]" "[lang::util::localize [lindex $role 2]]" lappend actions "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" "member-confirm?reset=1&reltype=[lindex $role 0]" "[lang::util::localize [lindex $role 2]]" } - -} else { - set bulk_actions "" - set actions "" - set bulk_actions_export_vars "" } -# Build the list-builder list -template::list::create -name members -multirow members -key user_id -actions $actions -bulk_actions $bulk_actions -bulk_action_export_vars $bulk_actions_export_vars -elements { +# Set the elements list +set elm_list { portrait { label "" html "align right" @@ -125,24 +126,31 @@ } role { label "[_ dotlrn.Role]" html "align left" - } action { + } +} + +if {$admin_p} { + lappend elm_list {action} { label "[_ dotlrn.Actions]" html "align left" display_template { - + #dotlrn.Drop_Membership# | #dotlrn.User_Admin_Page# } } - } -orderby { +} + +# Build the list-builder list +template::list::create -name members -multirow members -key user_id -actions $actions -bulk_actions $bulk_actions -bulk_action_export_vars $bulk_actions_export_vars -elements $elm_list -orderby { last_name {orderby last_name} first_names {orderby first_names} email {orderby email} role {orderby role} - } -selected_format csv -formats { +} -selected_format csv -formats { csv { output csv } - } +} set orderby [template::list::orderby_clause -name "members" -orderby] @@ -160,18 +168,18 @@ template::list::write_output -name members } -# Bulk action User Admin Page -# Depending on the community_type, we have allowable rel_types -set rel_types [dotlrn_community::get_roles -community_id $community_id] -set selection "" -foreach role $rel_types { - append selection "[lang::util::localize [lindex $role 2]]" -} -append selection "" -set size [multirow size members] -if { $size > 0 } { - multirow append members "" "" "" "" "" $selection -} +# # Bulk action User Admin Page +# # Depending on the community_type, we have allowable rel_types +# set rel_types [dotlrn_community::get_roles -community_id $community_id] +# set selection "" +# foreach role $rel_types { +# append selection "[lang::util::localize [lindex $role 2]]" +# } +# append selection "" +# set size [multirow size members] +# if { $size > 0 } { +# multirow append members "" "" "" "" "" $selection +# } set user_ids "" db_multirow -extend { member_url pending_user_referer } pending_users select_pending_users {} { Index: openacs-4/packages/dotlrn/www/spam.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v diff -u -r1.26 -r1.27 --- openacs-4/packages/dotlrn/www/spam.tcl 15 May 2007 20:14:25 -0000 1.26 +++ openacs-4/packages/dotlrn/www/spam.tcl 7 Oct 2007 22:36:56 -0000 1.27 @@ -123,7 +123,7 @@ -label [_ dotlrn.Message] \ -datatype text \ -widget textarea \ - -html {rows 10 cols 80 wrap soft} + -html {rows 10 cols 80} element create spam_message format \ 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.30 -r1.31 --- openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 28 Sep 2007 13:07:32 -0000 1.30 +++ openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 7 Oct 2007 22:36:56 -0000 1.31 @@ -118,7 +118,7 @@ } if {${add_instructor}} { - set community_id $class_instance_id + set community_id $class_instance_id ad_returnredirect "add-instructor?[export_url_vars community_id referer]" ad_script_abort } 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.18 -r1.19 --- openacs-4/packages/dotlrn/www/admin/class-new.tcl 8 Aug 2006 21:26:28 -0000 1.18 +++ openacs-4/packages/dotlrn/www/admin/class-new.tcl 7 Oct 2007 22:36:56 -0000 1.19 @@ -56,7 +56,7 @@ -label [_ dotlrn.Description] \ -datatype text \ -widget textarea \ - -html {rows 5 cols 60 wrap soft} \ + -html {rows 5 cols 60} \ -optional element create add_class subject_key \ Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl 8 Aug 2006 21:26:28 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl 7 Oct 2007 22:36:56 -0000 1.12 @@ -55,7 +55,7 @@ } if {![exists_and_not_null referer]} { - set referer "classes?[export_vars department_key]" + set referer "classes" } set query select_classes @@ -82,7 +82,7 @@ set actions "" if { $can_create } { - set actions [list "[_ dotlrn.new_class_1]" "[export_vars -base "class-new" -url { department_key referer }]"] + set actions [list "[_ dotlrn.new_class_1]" "[export_vars -base "class-new" -url { department_key referer }]" "[_ dotlrn.new_class_1]"] } template::list::create \ @@ -117,18 +117,14 @@ label "[_ dotlrn.Actions]" display_template { - \[ - [_ dotlrn.new_class_instance] + [_ dotlrn.new_class_instance] \] - - \[ - [_ dotlrn.lt_Delete_class] + [_ dotlrn.lt_Delete_class] \] - } } 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.20 -r1.21 --- openacs-4/packages/dotlrn/www/admin/club-new.tcl 8 Aug 2006 21:26:28 -0000 1.20 +++ openacs-4/packages/dotlrn/www/admin/club-new.tcl 7 Oct 2007 22:36:56 -0000 1.21 @@ -42,7 +42,7 @@ {description:text(textarea),optional {label "#dotlrn.Description#"} - {html {rows 5 cols 60 wrap soft}} + {html {rows 5 cols 60}} {help_text "[_ dotlrn.lt_do_not_use_p_tags]"} } Index: openacs-4/packages/dotlrn/www/admin/community-type.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/community-type.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/admin/community-type.tcl 28 Jul 2004 07:24:12 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/community-type.tcl 7 Oct 2007 22:36:56 -0000 1.2 @@ -42,7 +42,7 @@ ad_form -extend -name "new_community_type" -form { {pretty_name:text {label "[_ dotlrn.Pretty_Name]"} {html {size 60 maxlength 100}}} - {description:text(textarea),optional {label "[_ dotlrn.Description]"} {html {rows 5 cols 60 wrap soft}}} + {description:text(textarea),optional {label "[_ dotlrn.Description]"} {html {rows 5 cols 60}}} } -validate { {community_type { ![dotlrn_community::type_exists $community_type] || Index: openacs-4/packages/dotlrn/www/admin/department-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-edit.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/admin/department-edit.tcl 8 Aug 2006 21:26:28 -0000 1.9 +++ openacs-4/packages/dotlrn/www/admin/department-edit.tcl 7 Oct 2007 22:36:56 -0000 1.10 @@ -57,7 +57,7 @@ -label "[_ dotlrn.Description]" \ -datatype text \ -widget textarea \ - -html {rows 5 cols 60 wrap soft} \ + -html {rows 5 cols 60} \ -optional element create edit_department external_url \ Index: openacs-4/packages/dotlrn/www/admin/department-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-new.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/admin/department-new.tcl 8 Aug 2006 21:26:28 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/department-new.tcl 7 Oct 2007 22:36:56 -0000 1.12 @@ -45,7 +45,7 @@ -label "[_ dotlrn.Description]" \ -datatype text \ -widget textarea \ - -html {rows 5 cols 60 wrap soft} \ + -html {rows 5 cols 60} \ -optional element create add_department external_url \ Index: openacs-4/packages/dotlrn/www/admin/users-spam.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-spam.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/dotlrn/www/admin/users-spam.tcl 8 Aug 2006 21:26:28 -0000 1.6 +++ openacs-4/packages/dotlrn/www/admin/users-spam.tcl 7 Oct 2007 22:36:56 -0000 1.7 @@ -71,7 +71,7 @@ -label [_ dotlrn.Message] \ -datatype text \ -widget textarea \ - -html {rows 10 cols 80 wrap soft} + -html {rows 10 cols 80} element create spam_message referer \ -label [_ dotlrn.Referer] \ Index: openacs-4/packages/dotlrn-assessment/dotlrn-assessment.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-assessment/dotlrn-assessment.info,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn-assessment/dotlrn-assessment.info 15 May 2007 20:14:26 -0000 1.3 +++ openacs-4/packages/dotlrn-assessment/dotlrn-assessment.info 7 Oct 2007 22:36:57 -0000 1.4 @@ -7,13 +7,13 @@ f t - + Jose Pablo Escobedo Del Cid - 2007-04-22 + 2007-09-08 - - - + + + Index: openacs-4/packages/dotlrn-bm/dotlrn-bm.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bm/dotlrn-bm.info,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn-bm/dotlrn-bm.info 15 May 2007 20:14:26 -0000 1.11 +++ openacs-4/packages/dotlrn-bm/dotlrn-bm.info 7 Oct 2007 22:36:57 -0000 1.12 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info,v diff -u -r1.17 -r1.18 --- openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info 15 May 2007 20:14:26 -0000 1.17 +++ openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info 7 Oct 2007 22:36:57 -0000 1.18 @@ -7,15 +7,15 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - - + + + + Index: openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info,v diff -u -r1.18 -r1.19 --- openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info 15 May 2007 20:14:27 -0000 1.18 +++ openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info 7 Oct 2007 22:36:57 -0000 1.19 @@ -7,15 +7,15 @@ f t - + OpenACS Helper routines for dotLRN applets - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-evaluation/dotlrn-evaluation.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-evaluation/dotlrn-evaluation.info,v diff -u -r1.6 -r1.7 --- openacs-4/packages/dotlrn-evaluation/dotlrn-evaluation.info 15 May 2007 20:14:27 -0000 1.6 +++ openacs-4/packages/dotlrn-evaluation/dotlrn-evaluation.info 7 Oct 2007 22:36:57 -0000 1.7 @@ -7,13 +7,13 @@ f t - + Jose Pablo Escobedo Del Cid - 2007-04-22 + 2007-09-08 - - - + + + Index: openacs-4/packages/dotlrn-faq/dotlrn-faq.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-faq/dotlrn-faq.info,v diff -u -r1.17 -r1.18 --- openacs-4/packages/dotlrn-faq/dotlrn-faq.info 15 May 2007 20:14:28 -0000 1.17 +++ openacs-4/packages/dotlrn-faq/dotlrn-faq.info 7 Oct 2007 22:36:57 -0000 1.18 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-forums/dotlrn-forums.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/dotlrn-forums.info,v diff -u -r1.15 -r1.16 --- openacs-4/packages/dotlrn-forums/dotlrn-forums.info 15 May 2007 20:14:28 -0000 1.15 +++ openacs-4/packages/dotlrn-forums/dotlrn-forums.info 7 Oct 2007 22:36:57 -0000 1.16 @@ -7,15 +7,15 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS 0 - - - + + + Index: openacs-4/packages/dotlrn-fs/dotlrn-fs.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/dotlrn-fs.info,v diff -u -r1.29 -r1.30 --- openacs-4/packages/dotlrn-fs/dotlrn-fs.info 15 May 2007 20:14:29 -0000 1.29 +++ openacs-4/packages/dotlrn-fs/dotlrn-fs.info 7 Oct 2007 22:36:58 -0000 1.30 @@ -7,15 +7,15 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - + + - + Index: openacs-4/packages/dotlrn-homework/dotlrn-homework.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/dotlrn-homework.info,v diff -u -r1.10 -r1.11 --- openacs-4/packages/dotlrn-homework/dotlrn-homework.info 15 May 2007 20:14:30 -0000 1.10 +++ openacs-4/packages/dotlrn-homework/dotlrn-homework.info 7 Oct 2007 22:36:58 -0000 1.11 @@ -7,16 +7,16 @@ f f - + Don Baccus Provides a homework assignment dropboxes for dotLRN classes. - 2007-04-22 + 2007-09-08 furfly.net, LLC - - - - + + + + Index: openacs-4/packages/dotlrn-homework/www/file-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file-add.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn-homework/www/file-add.tcl 8 Aug 2006 21:26:36 -0000 1.4 +++ openacs-4/packages/dotlrn-homework/www/file-add.tcl 7 Oct 2007 22:36:58 -0000 1.5 @@ -52,7 +52,7 @@ ad_form -extend -name homework_form -form { {description:text(textarea),optional {label "[_ dotlrn-homework.Description]"} - {html {rows 5 cols 50 wrap physical}}} + {html {rows 5 cols 50}}} } -validate { {upload_file { [file size [template::util::file::get_property tmp_filename $upload_file]] <= [ad_parameter "MaximumFileSize"] } Index: openacs-4/packages/dotlrn-homework/www/version-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/version-add.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn-homework/www/version-add.tcl 20 Apr 2004 21:13:31 -0000 1.3 +++ openacs-4/packages/dotlrn-homework/www/version-add.tcl 7 Oct 2007 22:36:58 -0000 1.4 @@ -31,7 +31,7 @@ file_id:key {upload_file:file {label "[_ dotlrn-homework.lt_version_filename]"}} {description:text(textarea),optional {label "[_ dotlrn-homework.lt_version_notes]"} - {html {rows 5 cols 50 wrap physical}}} + {html {rows 5 cols 50}}} } -edit_request { } -validate { {upload_file Index: openacs-4/packages/dotlrn-news/dotlrn-news.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news/dotlrn-news.info,v diff -u -r1.13 -r1.14 --- openacs-4/packages/dotlrn-news/dotlrn-news.info 15 May 2007 20:14:30 -0000 1.13 +++ openacs-4/packages/dotlrn-news/dotlrn-news.info 7 Oct 2007 22:36:58 -0000 1.14 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-photo-album/dotlrn-photo-album.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-photo-album/dotlrn-photo-album.info,v diff -u -r1.6 -r1.7 --- openacs-4/packages/dotlrn-photo-album/dotlrn-photo-album.info 15 May 2007 20:14:31 -0000 1.6 +++ openacs-4/packages/dotlrn-photo-album/dotlrn-photo-album.info 7 Oct 2007 22:36:58 -0000 1.7 @@ -7,15 +7,15 @@ f t - + Jeff Davis Xarg - 2007-04-22 + 2007-09-08 - - + + - + Index: openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info,v diff -u -r1.22 -r1.23 --- openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info 15 May 2007 20:14:31 -0000 1.22 +++ openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info 7 Oct 2007 22:36:58 -0000 1.23 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-random-photo/dotlrn-random-photo.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-random-photo/dotlrn-random-photo.info,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn-random-photo/dotlrn-random-photo.info 15 May 2007 20:14:32 -0000 1.4 +++ openacs-4/packages/dotlrn-random-photo/dotlrn-random-photo.info 7 Oct 2007 22:36:58 -0000 1.5 @@ -7,12 +7,12 @@ f f - + Gerardo Morales - 2007-04-22 + 2007-09-08 - - + + Index: openacs-4/packages/dotlrn-static/dotlrn-static.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-static/dotlrn-static.info,v diff -u -r1.14 -r1.15 --- openacs-4/packages/dotlrn-static/dotlrn-static.info 15 May 2007 20:14:32 -0000 1.14 +++ openacs-4/packages/dotlrn-static/dotlrn-static.info 7 Oct 2007 22:36:58 -0000 1.15 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-survey/dotlrn-survey.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-survey/dotlrn-survey.info,v diff -u -r1.8 -r1.9 --- openacs-4/packages/dotlrn-survey/dotlrn-survey.info 15 May 2007 20:14:32 -0000 1.8 +++ openacs-4/packages/dotlrn-survey/dotlrn-survey.info 7 Oct 2007 22:36:59 -0000 1.9 @@ -7,15 +7,15 @@ f t - + dave bauer dotLRN applet for Survey package dotLRN applet for Survey package - 2007-04-22 + 2007-09-08 - - - + + + Index: openacs-4/packages/dotlrn-syllabus/dotlrn-syllabus.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/dotlrn-syllabus.info,v diff -u -r1.10 -r1.11 --- openacs-4/packages/dotlrn-syllabus/dotlrn-syllabus.info 15 May 2007 20:14:32 -0000 1.10 +++ openacs-4/packages/dotlrn-syllabus/dotlrn-syllabus.info 7 Oct 2007 22:36:59 -0000 1.11 @@ -7,14 +7,14 @@ f f - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - + - + Index: openacs-4/packages/dotlrn-weblogger/dotlrn-weblogger.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-weblogger/dotlrn-weblogger.info,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotlrn-weblogger/dotlrn-weblogger.info 15 May 2007 20:14:33 -0000 1.9 +++ openacs-4/packages/dotlrn-weblogger/dotlrn-weblogger.info 7 Oct 2007 22:36:59 -0000 1.10 @@ -7,14 +7,14 @@ f t - + Simon Carstensen - 2007-04-22 + 2007-09-08 Collaboraid - - - + + + Index: openacs-4/packages/evaluation/evaluation.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/evaluation.info,v diff -u -r1.28 -r1.29 --- openacs-4/packages/evaluation/evaluation.info 27 Jun 2007 22:56:48 -0000 1.28 +++ openacs-4/packages/evaluation/evaluation.info 7 Oct 2007 22:36:59 -0000 1.29 @@ -10,7 +10,8 @@ Jose Pablo Escobedo Del Cid This package allows the users (professors and students) to use the system to submit and grade the tasks. - 2007-06-15 + 2007-09-08 + This package allows the professors and TAs to assign tasks to the students and to grade them, and to the students to upload their answers and see their grades. 0 #evaluation.Evaluations# Index: openacs-4/packages/evaluation/www/evaluation-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/evaluation-view.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation/www/evaluation-view.tcl 8 Aug 2006 21:26:41 -0000 1.5 +++ openacs-4/packages/evaluation/www/evaluation-view.tcl 7 Oct 2007 22:36:59 -0000 1.6 @@ -116,7 +116,7 @@ } {comments:text(textarea) {label "[_ evaluation.Comments_1]"} - {html {rows 4 cols 40 wrap soft}} + {html {rows 4 cols 40}} {value $comments} } {evaluation_date:date,to_sql(linear_date),from_sql(sql_date) Index: openacs-4/packages/evaluation/www/task-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/evaluation/www/task-view.tcl 8 Aug 2006 21:26:41 -0000 1.14 +++ openacs-4/packages/evaluation/www/task-view.tcl 7 Oct 2007 22:36:59 -0000 1.15 @@ -79,7 +79,7 @@ {description:richtext,optional {label "[_ evaluation.lt_Assignments_Descripti]"} - {html {rows 4 cols 40 wrap soft}} + {html {rows 4 cols 40}} } {due_date:date,to_sql(linear_date),from_sql(sql_date) Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl 8 Aug 2006 21:26:42 -0000 1.12 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl 7 Oct 2007 22:36:59 -0000 1.13 @@ -37,7 +37,7 @@ } ] \ edit_reason \ [list label "[_ evaluation.Edit_Reason_]" \ - display_template { } \ + display_template { } \ ] \ show_student_p \ [list label "[_ evaluation.lt_Allow_the_students_br]" \ Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 8 Aug 2006 21:26:42 -0000 1.22 +++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 7 Oct 2007 22:36:59 -0000 1.23 @@ -257,7 +257,7 @@ display_template { $max_grade max} ] lappend elements comments \ [list label "[_ evaluation.Comments]" \ - display_template { } \ + display_template { } \ ] lappend elements show_answer \ [list label "[_ evaluation.see_grades]" \ @@ -347,7 +347,7 @@ display_template { $max_grade max.}] lappend elements comments \ [list label "[_ evaluation.Comments]" \ - display_template { } \ + display_template { } \ ] lappend elements show_answer \ [list label "[_ evaluation.see_grades]" \ @@ -447,7 +447,7 @@ display_template { $max_grade max.}] lappend elements comments \ [list label "[_ evaluation.Comments]" \ - display_template { } \ + display_template { } \ ] lappend elements show_answer \ [list label "[_ evaluation.see_grades]" \ Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl,v diff -u -r1.29 -r1.30 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 15 Dec 2006 22:45:31 -0000 1.29 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 7 Oct 2007 22:36:59 -0000 1.30 @@ -197,7 +197,7 @@ {description:richtext,optional {label "[_ evaluation.lt_Assignments_Descripti]"} - {html {rows 4 cols 40 wrap soft}} + {html {rows 4 cols 40}} } {due_date:date,to_sql(linear_date),from_sql(sql_date),optional Index: openacs-4/packages/evaluation/www/view/evaluation-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/evaluation-view.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/view/evaluation-view.tcl 8 Aug 2006 21:26:43 -0000 1.2 +++ openacs-4/packages/evaluation/www/view/evaluation-view.tcl 7 Oct 2007 22:37:00 -0000 1.3 @@ -113,7 +113,7 @@ } {comments:text(textarea) {label "[_ evaluation.Comments_1]"} - {html {rows 4 cols 40 wrap soft}} + {html {rows 4 cols 40}} {value $comments} } {evaluation_date:date,to_sql(linear_date),from_sql(sql_date) Index: openacs-4/packages/evaluation/www/view/task-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/task-view.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/view/task-view.tcl 8 Aug 2006 21:26:43 -0000 1.2 +++ openacs-4/packages/evaluation/www/view/task-view.tcl 7 Oct 2007 22:37:00 -0000 1.3 @@ -79,7 +79,7 @@ {description:richtext,optional {label "[_ evaluation.lt_Assignments_Descripti]"} - {html {rows 4 cols 40 wrap soft}} + {html {rows 4 cols 40}} } {due_date:date,to_sql(linear_date),from_sql(sql_date) Index: openacs-4/packages/evaluation-portlet/evaluation-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/evaluation-portlet.info,v diff -u -r1.9 -r1.10 --- openacs-4/packages/evaluation-portlet/evaluation-portlet.info 15 May 2007 20:14:33 -0000 1.9 +++ openacs-4/packages/evaluation-portlet/evaluation-portlet.info 7 Oct 2007 22:37:00 -0000 1.10 @@ -7,12 +7,12 @@ f t - + Jose Pablo Escobedo Del Cid - 2007-03-27 + 2007-09-08 - - + + Index: openacs-4/packages/faq/faq.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/faq.info,v diff -u -r1.21 -r1.22 --- openacs-4/packages/faq/faq.info 27 Jun 2007 22:51:41 -0000 1.21 +++ openacs-4/packages/faq/faq.info 7 Oct 2007 22:37:00 -0000 1.22 @@ -12,14 +12,14 @@ Jennie Kim Housman Elizabeth Wirth Manage simple and categorized Question and Answer style FAQs with WYSIWYG and notification functionalities. - 2007-06-15 + 2007-07-11 Ybos Corporation Handles frequently asked questions Q&A presentation. Can be one Q&A per page or all presented flat. Straightforward application with room for improvement. Support for notification as well as WYSIQYG Editor and Categories - both optional. Category trees are displayed flat. No multiple filters. 2 #faq.FAQs# - + Index: openacs-4/packages/faq/sql/postgresql/faq-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/sql/postgresql/faq-create.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/faq/sql/postgresql/faq-create.sql 1 Apr 2004 22:52:46 -0000 1.5 +++ openacs-4/packages/faq/sql/postgresql/faq-create.sql 7 Oct 2007 22:37:00 -0000 1.6 @@ -142,9 +142,4 @@ \i faq-package-create.sql - - - - - - +\i faq-sc-create.sql Index: openacs-4/packages/faq/sql/postgresql/faq-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/sql/postgresql/faq-drop.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/faq/sql/postgresql/faq-drop.sql 17 May 2003 10:33:37 -0000 1.3 +++ openacs-4/packages/faq/sql/postgresql/faq-drop.sql 7 Oct 2007 22:37:00 -0000 1.4 @@ -2,6 +2,15 @@ -- @author wirth@ybos.net --openacs port @samir.symphinity.com +--drop triggers +drop trigger faq_sc__itrg on faq_q_and_as; +drop trigger faq_sc__dtrg on faq_q_and_as; +drop trigger faq_sc__utrg on faq_q_and_as; + +drop function faq_sc__itrg () +drop function faq_sc__dtrg () +drop function faq_sc__utrg () + --drop functions drop function faq__new_q_and_a (integer,integer,varchar,varchar,integer,varchar,timestamptz,integer,varchar,integer); drop function faq__delete_q_and_a (integer); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/faq/sql/postgresql/faq-sc-create.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/faq/sql/postgresql/upgrade/upgrade-5.2.0d4-5.2.0d5.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/faq-portlet/faq-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/faq-portlet.info,v diff -u -r1.21 -r1.22 --- openacs-4/packages/faq-portlet/faq-portlet.info 15 May 2007 20:14:35 -0000 1.21 +++ openacs-4/packages/faq-portlet/faq-portlet.info 7 Oct 2007 22:37:00 -0000 1.22 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - + - + Index: openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl 30 Jan 2007 14:05:24 -0000 1.7 +++ openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl 7 Oct 2007 22:37:00 -0000 1.8 @@ -109,6 +109,15 @@ return "/file/$item_id/$name" } +ad_proc -public -callback search::url -impl file_storage_object { + -object_id:required +} { + Return the URL to the file_storage_object +} { + set item_id [content::revision::item_id -revision_id $object_id] + set name [db_string item "select name from cr_items where item_id = :item_id" -default ""] + return "[ad_url]/file/$item_id/$name" +} ad_proc -public -callback datamanager::copy_folder -impl datamanager { -object_id:required Index: openacs-4/packages/forums/lib/message/post.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/post.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/forums/lib/message/post.tcl 6 Jul 2007 12:13:25 -0000 1.16 +++ openacs-4/packages/forums/lib/message/post.tcl 7 Oct 2007 22:37:01 -0000 1.17 @@ -37,7 +37,7 @@ {label "[_ forums.Subject]"} } {message_body:richtext(richtext) - {html {rows 20 cols 60 wrap soft}} + {html {rows 20 cols 60}} {label "[_ forums.Body]"} } {forum_id:integer(hidden) Index: openacs-4/packages/forums/lib/message/thread-chunk-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk-oracle.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/forums/lib/message/thread-chunk-oracle.xql 15 Mar 2005 20:06:45 -0000 1.4 +++ openacs-4/packages/forums/lib/message/thread-chunk-oracle.xql 7 Oct 2007 22:37:01 -0000 1.5 @@ -28,7 +28,7 @@ state, user_id, parent_id - from $table_name + from $table_name t where forum_id = :forum_id and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey) order by $order_by @@ -48,7 +48,7 @@ state, user_id, parent_id - from $table_name + from $table_name t where forum_id = :forum_id and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey) order by $order_by Index: openacs-4/packages/forums/lib/message/thread-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/forums/lib/message/thread-chunk.tcl 15 May 2007 20:14:39 -0000 1.6 +++ openacs-4/packages/forums/lib/message/thread-chunk.tcl 7 Oct 2007 22:37:01 -0000 1.7 @@ -90,6 +90,7 @@ db_multirow -extend { posting_date_pretty direct_url number parent_number parent_direct_url reply_p viewed_p open_p} responses $query {} { set open_p t set tree_level [min [expr {$tree_level - $message(tree_level)}] 10] + set posting_date_ansi [lc_time_system_to_conn $posting_date_ansi] set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"] set direct_url "$direct_url_base\#$message_id" set number [expr [lsearch $message_id_list $message_id] + 1] Index: openacs-4/packages/forums/tcl/form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/form-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/forums/tcl/form-procs.tcl 15 May 2007 20:14:40 -0000 1.8 +++ openacs-4/packages/forums/tcl/form-procs.tcl 7 Oct 2007 22:37:01 -0000 1.9 @@ -39,7 +39,7 @@ -label [_ forums.Body] \ -datatype richtext \ -widget richtext \ - -html {rows 20 cols 60 wrap soft style {width:100%}} \ + -html {rows 20 cols 60 style {width:100%}} \ $optional_switch } @@ -102,7 +102,7 @@ } { template::element create $form_name ${prefix}to_email \ -label [_ forums.Email] \ - -datatype text \ + -datatype email \ -widget text \ -html {size 60} @@ -116,7 +116,7 @@ -label [_ forums.Your_Note] \ -datatype text \ -widget textarea \ - -html {cols 80 rows 10 wrap hard} + -html {cols 80 rows 10} } ad_proc -public forums::form::search { @@ -155,7 +155,7 @@ -label [_ forums.Charter] \ -datatype richtext \ -widget richtext \ - -html {cols 60 rows 10 wrap soft} \ + -html {cols 60 rows 10} \ -validate { {expr [string length $value] <= 4000 } {#forums.charter_max_chars#} } \ -optional Index: openacs-4/packages/forums/tcl/forums-callback-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/Attic/forums-callback-procs-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/forums/tcl/forums-callback-procs-oracle.xql 28 Jan 2006 15:39:03 -0000 1.1 +++ openacs-4/packages/forums/tcl/forums-callback-procs-oracle.xql 7 Oct 2007 22:37:01 -0000 1.2 @@ -35,9 +35,8 @@ select subject, content, format from forums_messages - where message_id=:message_id --- lets just get the message instead of the whole thread --- replace with a connect by + start with message_id=:message_id + connect by prior message_id = parent_id Index: openacs-4/packages/forums/tcl/forums-callback-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/Attic/forums-callback-procs-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/forums/tcl/forums-callback-procs-postgresql.xql 28 Jan 2006 15:39:03 -0000 1.1 +++ openacs-4/packages/forums/tcl/forums-callback-procs-postgresql.xql 7 Oct 2007 22:37:01 -0000 1.2 @@ -35,9 +35,9 @@ select subject, content, format from forums_messages - where message_id=:message_id --- lets just get the message instead of the whole thread --- replace with a connect by + where message_id=:message_id or (tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey)) + and forum_id=:forum_id + order by tree_sortkey Index: openacs-4/packages/forums/www/message-email.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-email.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/forums/www/message-email.adp 8 Aug 2006 21:26:53 -0000 1.10 +++ openacs-4/packages/forums/www/message-email.adp 7 Oct 2007 22:37:01 -0000 1.11 @@ -2,13 +2,15 @@ #forums.Email_Message# @message.forum_name;noquote@ - @message.subject;noquote@ @context;noquote@ - - - - - + + + + + + link + #forums.lt_Email_a_copy_of_the_f# Index: openacs-4/packages/forums/www/message-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-email.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/forums/www/message-email.tcl 15 Mar 2005 20:06:45 -0000 1.13 +++ openacs-4/packages/forums/www/message-email.tcl 7 Oct 2007 22:37:01 -0000 1.14 @@ -53,4 +53,48 @@ lappend context [list "./message-view?message_id=$message(message_id)" "$message(subject)"] lappend context [_ forums.Email_to_a_friend] +if {![template::multirow exists link]} { + template::multirow create link rel type href title lang media +} + +template::multirow append link \ + stylesheet \ + text/css \ + /resources/forums/forums.css \ + "" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/flat.css \ + "flat" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/flat-collapse.css \ + "flat-collapse" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/collapse.css \ + "collapse" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/expand.css \ + "expand" \ + [ad_conn language] \ + all + ad_return_template Index: openacs-4/packages/forums/www/message-post-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post-confirm.adp,v diff -u -r1.15 -r1.16 --- openacs-4/packages/forums/www/message-post-confirm.adp 8 Aug 2006 21:26:53 -0000 1.15 +++ openacs-4/packages/forums/www/message-post-confirm.adp 7 Oct 2007 22:37:01 -0000 1.16 @@ -2,13 +2,15 @@ #forums.Confirm_Post_to_Forum# @forum.name;noquote@ @context;noquote@ - - - - - + + + + + + link + @context;noquote@ message.subject - - - - - + + + + + + link + @message_id@ - - - - - - - + + + + + + + - @dynamic_script;noquote@ + + + +link +script + @page_title;noquote@ Index: openacs-4/packages/forums/www/message-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v diff -u -r1.37 -r1.38 --- openacs-4/packages/forums/www/message-view.tcl 15 Jun 2007 11:53:51 -0000 1.37 +++ openacs-4/packages/forums/www/message-view.tcl 7 Oct 2007 22:37:01 -0000 1.38 @@ -101,8 +101,6 @@ set thread_url [export_vars -base forum-view { { forum_id $message(forum_id) } }] set dynamic_script " - - " if {$forum(presentation_type) eq "flat"} { set display_mode flat } -set page_title "#forums.Thread_title#" \ No newline at end of file +# stylesheets +if {![template::multirow exists link]} { + template::multirow create link rel type href title lang media +} + +template::multirow append link \ + stylesheet \ + text/css \ + /resources/forums/forums.css \ + "" \ + [ad_conn language] \ + all + +template::multirow append link \ + stylesheet \ + text/css \ + /resources/forums/print.css \ + "" \ + [ad_conn language] \ + print + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/flat.css \ + "flat" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/flat-collapse.css \ + "flat-collapse" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/collapse.css \ + "collapse" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/expand.css \ + "expand" \ + [ad_conn language] \ + all + +# js scripts +if {![template::multirow exists script]} { + template::multirow create script type src charset defer content +} + +template::multirow append script \ + "text/javascript" \ + "/resources/forums/forums.js" + +template::multirow append script \ + "text/javascript" \ + "/resources/forums/dynamic-comments.js" + +template::multirow append script \ + "text/javascript" \ + "" \ + "" \ + "" \ + $dynamic_script + +set page_title "#forums.Thread_title#" Index: openacs-4/packages/forums/www/moderate/message-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/forums/www/moderate/message-delete.adp 8 Aug 2006 21:26:53 -0000 1.10 +++ openacs-4/packages/forums/www/moderate/message-delete.adp 7 Oct 2007 22:37:01 -0000 1.11 @@ -2,16 +2,12 @@ #forums.Confirm_Delete# @message.subject;noquote@ #forums.delete# - + - + + +link +script + Index: openacs-4/packages/forums/www/moderate/message-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/forums/www/moderate/message-delete.tcl 17 Dec 2003 15:45:31 -0000 1.10 +++ openacs-4/packages/forums/www/moderate/message-delete.tcl 7 Oct 2007 22:37:01 -0000 1.11 @@ -18,4 +18,43 @@ # Select the stuff forum::message::get -message_id $message_id -array message +set dynamic_script " + +" +# stylesheets +if {![template::multirow exists link]} { + template::multirow create link rel type href title lang media +} + +template::multirow append link \ + stylesheet \ + text/css \ + /resources/forums/forums.css \ + "" \ + [ad_conn language] \ + all + +# js scripts +if {![template::multirow exists script]} { + template::multirow create script type src charset defer content +} + +template::multirow append script \ + "text/javascript" \ + "/resources/forums/forums.js" + +template::multirow append script \ + "text/javascript" \ + "" \ + "" \ + "" \ + $dynamic_script + ad_return_template Index: openacs-4/packages/forums-portlet/forums-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/forums-portlet.info,v diff -u -r1.12 -r1.13 --- openacs-4/packages/forums-portlet/forums-portlet.info 15 May 2007 20:14:41 -0000 1.12 +++ openacs-4/packages/forums-portlet/forums-portlet.info 7 Oct 2007 22:37:01 -0000 1.13 @@ -7,15 +7,15 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS 0 - + - + Index: openacs-4/packages/fs-portlet/fs-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/fs-portlet.info,v diff -u -r1.21 -r1.22 --- openacs-4/packages/fs-portlet/fs-portlet.info 15 May 2007 20:14:41 -0000 1.21 +++ openacs-4/packages/fs-portlet/fs-portlet.info 7 Oct 2007 22:37:01 -0000 1.22 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - + - + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/catalog/imsld.es_GT.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/lib/choice-select.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/lib/imsld-master.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/lib/imsld-master.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/sql/postgresql/upgrade/upgrade-1.1d-1.2d.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/admin/monitor/properties-frame.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/resources/imsld.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/resources/imsld.js'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/imsld/www/resources/viewed.ico =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/resources/viewed.ico,v diff -u -r1.1 -r1.2 Binary files differ Index: openacs-4/packages/lars-blogger/lars-blogger.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/lars-blogger.info,v diff -u -r1.43 -r1.44 --- openacs-4/packages/lars-blogger/lars-blogger.info 15 May 2007 20:14:42 -0000 1.43 +++ openacs-4/packages/lars-blogger/lars-blogger.info 7 Oct 2007 22:37:02 -0000 1.44 @@ -7,15 +7,15 @@ f f - + Lars Pind Individual or collaborative web logs. - 2007-04-22 + 2007-09-08 OpenACS Weblog creation and management with notifications, RSS, trackpack, technorati, blogroll, pings, archives, draft and published entries, includable templates for presenting on other pages, and permissioning for multiple users. 0 - + Index: openacs-4/packages/new-portal/new-portal.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/new-portal.info,v diff -u -r1.30 -r1.31 --- openacs-4/packages/new-portal/new-portal.info 15 May 2007 20:14:46 -0000 1.30 +++ openacs-4/packages/new-portal/new-portal.info 7 Oct 2007 22:37:02 -0000 1.31 @@ -8,14 +8,14 @@ t portal - + OpenACS Portals. - 2007-04-22 + 2007-09-08 OpenACS New Portal Package aka NPP. Portals are used to aggregate content from different sources within a single page. Props to Ian Baker for "Portal". - + Index: openacs-4/packages/new-portal/sql/oracle/api-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/api-create.sql,v diff -u -r1.43 -r1.44 --- openacs-4/packages/new-portal/sql/oracle/api-create.sql 15 May 2007 20:14:47 -0000 1.43 +++ openacs-4/packages/new-portal/sql/oracle/api-create.sql 7 Oct 2007 22:37:02 -0000 1.44 @@ -267,7 +267,8 @@ -- now insert the pages from the portal template for page in (select * from portal_pages - where portal_id = portal.new.template_id) + where portal_id = portal.new.template_id + order by sort_key) loop v_page_id := portal_page.new( Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/sql/oracle/upgrade/upgrade-2.3.1d1-2.3.1d2.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/new-portal/sql/postgresql/api-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/postgresql/api-create.sql,v diff -u -r1.15 -r1.16 --- openacs-4/packages/new-portal/sql/postgresql/api-create.sql 15 May 2007 20:14:47 -0000 1.15 +++ openacs-4/packages/new-portal/sql/postgresql/api-create.sql 7 Oct 2007 22:37:03 -0000 1.16 @@ -132,7 +132,7 @@ select define_function_args('portal__new','portal_id,name,theme_id,layout_id,template_id,default_page_name,default_accesskey,object_type;portal,creation_date,creation_user,creation_ip,context_id'); -create function portal__new (integer,varchar,integer,integer,integer,varchar,varchar,varchar,timestamptz,integer,varchar,integer) +create or replace function portal__new (integer,varchar,integer,integer,integer,varchar,varchar,varchar,timestamptz,integer,varchar,integer) returns integer as ' declare p_portal_id alias for $1; @@ -226,6 +226,7 @@ for v_page in select * from portal_pages where portal_id = p_template_id + order by sort_key loop v_page_id := portal_page__new( Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/sql/postgresql/upgrade/upgrade-2.3.1d1-2.3.1d2.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v diff -u -r1.182 -r1.183 --- openacs-4/packages/new-portal/tcl/portal-procs.tcl 13 Aug 2007 06:10:27 -0000 1.182 +++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 7 Oct 2007 22:37:03 -0000 1.183 @@ -145,7 +145,11 @@ set page_name_list [list $default_page_name] set page_accesskey_list [list $default_accesskey] - set layout_name_list [list "#new-portal.simple_2column_layout_name#"] + if { [string eq $layout_name ""] } { + set layout_name_list [list "#new-portal.simple_2column_layout_name#"] + } else { + set layout_name_list [list $layout_name] + } if {![empty_string_p $csv_list]} { set page_name_and_layout_list [split [string trimright $csv_list ";"] ";"] Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/tcl/test/new-portal-test-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/news-portlet/news-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/news-portlet.info,v diff -u -r1.19 -r1.20 --- openacs-4/packages/news-portlet/news-portlet.info 15 May 2007 20:14:50 -0000 1.19 +++ openacs-4/packages/news-portlet/news-portlet.info 7 Oct 2007 22:37:03 -0000 1.20 @@ -7,13 +7,13 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - + + Index: openacs-4/packages/photo-album/www/album-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-add.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/photo-album/www/album-add.tcl 18 Nov 2003 22:59:03 -0000 1.4 +++ openacs-4/packages/photo-album/www/album-add.tcl 7 Oct 2007 22:37:03 -0000 1.5 @@ -40,7 +40,7 @@ template::element create album_add description -html { size 50 } \ -label "[_ photo-album._Album]" -datatype text -optional -template::element create album_add story -html {cols 50 rows 4 wrap soft} \ +template::element create album_add story -html {cols 50 rows 4} \ -label "[_ photo-album._Album_1]" -datatype text -widget textarea -optional if { [template::form is_request album_add] } { Index: openacs-4/packages/photo-album/www/album-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-edit.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/photo-album/www/album-edit.tcl 18 Nov 2003 22:59:03 -0000 1.4 +++ openacs-4/packages/photo-album/www/album-edit.tcl 7 Oct 2007 22:37:03 -0000 1.5 @@ -47,7 +47,7 @@ template::element create edit_album description -html { size 50} \ -label "[_ photo-album._Album]" -datatype text -optional -template::element create edit_album story -html { cols 50 rows 4 wrap soft } \ +template::element create edit_album story -html { cols 50 rows 4 } \ -label "[_ photo-album._Album_1]" -datatype text -widget textarea -optional Index: openacs-4/packages/photo-album/www/photo-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-add.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/photo-album/www/photo-add.tcl 29 Jun 2004 10:18:45 -0000 1.6 +++ openacs-4/packages/photo-album/www/photo-add.tcl 7 Oct 2007 22:37:03 -0000 1.7 @@ -44,7 +44,7 @@ element create photo_upload description -html { size 50} \ -label "[_ photo-album._Photo]" -optional -help_text "[_ photo-album.lt_OPTIONAL_Displayed_wh]" -datatype text -element create photo_upload story -html { cols 50 rows 4 wrap soft } \ +element create photo_upload story -html { cols 50 rows 4 } \ -label "[_ photo-album._Photo_1]" -optional -help_text "[_ photo-album.OPTIONAL]" -datatype text -widget textarea element set_properties photo_upload album_id -value $album_id Index: openacs-4/packages/photo-album/www/photo-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-edit.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/photo-album/www/photo-edit.tcl 18 Nov 2003 22:59:03 -0000 1.4 +++ openacs-4/packages/photo-album/www/photo-edit.tcl 7 Oct 2007 22:37:03 -0000 1.5 @@ -59,7 +59,7 @@ template::element create edit_photo description -html { size 50} \ -label "<#_Description#>" -help_text "Displayed when viewing the photo" -optional -datatype text -template::element create edit_photo story -html { cols 50 rows 4 wrap soft } \ +template::element create edit_photo story -html { cols 50 rows 4 } \ -label "<#_Story#>" -optional -datatype text -help_text "Displayed when viewing the photo" -widget textarea template::element create edit_photo submit_b -widget submit \ Index: openacs-4/packages/photo-album-portlet/photo-album-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album-portlet/photo-album-portlet.info,v diff -u -r1.7 -r1.8 --- openacs-4/packages/photo-album-portlet/photo-album-portlet.info 15 May 2007 20:14:52 -0000 1.7 +++ openacs-4/packages/photo-album-portlet/photo-album-portlet.info 7 Oct 2007 22:37:04 -0000 1.8 @@ -7,13 +7,13 @@ f t - + Jeff Davis Xarg - 2007-04-22 - + 2007-09-08 + - + Index: openacs-4/packages/profile-provider/profile-provider.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/profile-provider/profile-provider.info,v diff -u -r1.11 -r1.12 --- openacs-4/packages/profile-provider/profile-provider.info 15 May 2007 20:14:52 -0000 1.11 +++ openacs-4/packages/profile-provider/profile-provider.info 7 Oct 2007 22:37:04 -0000 1.12 @@ -7,12 +7,12 @@ f t - + OpenACS OpenACS - 2007-04-22 + 2007-09-08 - + Index: openacs-4/packages/random-photo-portlet/random-photo-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/random-photo-portlet/random-photo-portlet.info,v diff -u -r1.5 -r1.6 --- openacs-4/packages/random-photo-portlet/random-photo-portlet.info 15 May 2007 20:14:52 -0000 1.5 +++ openacs-4/packages/random-photo-portlet/random-photo-portlet.info 7 Oct 2007 22:37:04 -0000 1.6 @@ -7,12 +7,12 @@ f f - + Gerardo Morales - 2007-04-22 + 2007-09-08 - - + + Index: openacs-4/packages/static-portlet/static-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/static-portlet.info,v diff -u -r1.20 -r1.21 --- openacs-4/packages/static-portlet/static-portlet.info 15 May 2007 20:14:53 -0000 1.20 +++ openacs-4/packages/static-portlet/static-portlet.info 7 Oct 2007 22:37:04 -0000 1.21 @@ -7,14 +7,14 @@ f f - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/static-portlet/www/element.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/element.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/static-portlet/www/element.tcl 15 Dec 2006 22:45:43 -0000 1.15 +++ openacs-4/packages/static-portlet/www/element.tcl 7 Oct 2007 22:37:04 -0000 1.16 @@ -53,7 +53,7 @@ ad_form -name static_element -form { element_content_id:key {pretty_name:text(text) {label "[_ static-portlet.Name]"} {html {size 60}}} - {content:richtext(richtext) {label "[_ static-portlet.Content]"} {html {rows 15 cols 80 wrap soft}}} + {content:richtext(richtext) {label "[_ static-portlet.Content]"} {html {rows 15 cols 80}}} } if {[lsearch $templates $type] >= 0} { Index: openacs-4/packages/survey-portlet/survey-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey-portlet/survey-portlet.info,v diff -u -r1.8 -r1.9 --- openacs-4/packages/survey-portlet/survey-portlet.info 15 May 2007 20:14:54 -0000 1.8 +++ openacs-4/packages/survey-portlet/survey-portlet.info 7 Oct 2007 22:37:04 -0000 1.9 @@ -7,14 +7,14 @@ f t - + dave bauer Survey package portlet for new-portal - 2007-04-22 + 2007-09-08 Survey package portlet for new-portal - - + + Index: openacs-4/packages/theme-selva/theme-selva.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/theme-selva.info,v diff -u -r1.18 -r1.19 --- openacs-4/packages/theme-selva/theme-selva.info 15 May 2007 20:14:54 -0000 1.18 +++ openacs-4/packages/theme-selva/theme-selva.info 7 Oct 2007 22:37:04 -0000 1.19 @@ -8,14 +8,14 @@ f theme-selva - + Rafael Calvo - 2007-04-22 + 2007-09-08 0 - - + + Index: openacs-4/packages/theme-zen/theme-zen.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/theme-zen.info,v diff -u -r1.2 -r1.3 --- openacs-4/packages/theme-zen/theme-zen.info 15 May 2007 20:14:55 -0000 1.2 +++ openacs-4/packages/theme-zen/theme-zen.info 7 Oct 2007 22:37:05 -0000 1.3 @@ -8,14 +8,14 @@ t theme-zen - + Rafael Calvo - 2007-04-22 + 2007-09-08 0 - - + + @@ -28,6 +28,7 @@ + Index: openacs-4/packages/theme-zen/lib/lrn-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/theme-zen/lib/lrn-master.adp 15 May 2007 20:14:55 -0000 1.2 +++ openacs-4/packages/theme-zen/lib/lrn-master.adp 7 Oct 2007 22:37:05 -0000 1.3 @@ -16,7 +16,9 @@ #theme-zen.skip_to_main_content# - + + + Index: openacs-4/packages/theme-zen/lib/lrn-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/theme-zen/lib/lrn-master.tcl 7 Jun 2007 14:26:33 -0000 1.3 +++ openacs-4/packages/theme-zen/lib/lrn-master.tcl 7 Oct 2007 22:37:05 -0000 1.4 @@ -18,6 +18,14 @@ set system_url "" } +# Logo +array set attributes [parameter::get_from_package_key -package_key "theme-zen" -parameter logoImageAttributes] +set img_attrib "" +foreach name [array names attributes] { + append img_attrib " $name=\"$attributes($name)\"" +} + + # Get user information set sw_admin_p [acs_user::site_wide_admin_p -user_id $untrusted_user_id] if { $untrusted_user_id != 0 } { Index: openacs-4/packages/theme-zen/tcl/navigation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/tcl/navigation-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/theme-zen/tcl/navigation-procs.tcl 15 May 2007 20:14:56 -0000 1.2 +++ openacs-4/packages/theme-zen/tcl/navigation-procs.tcl 7 Oct 2007 22:37:05 -0000 1.3 @@ -30,60 +30,68 @@ namespace eval zen { ad_proc -public portal_navbar { - + } { - A helper procedure that generates the Navbar, ie the tabs, - for dotlrn. It is called from the zen-master template. + A helper procedure that generates the Navbar, ie the tabs, + for dotlrn. It is called from the zen-master template. } { - set current_url [ad_conn url] + set current_url [ad_conn url] set dotlrn_url [dotlrn::get_url] - # Set up some basic stuff - set community_id [dotlrn_community::get_community_id] + # Set up some basic stuff + set community_id [dotlrn_community::get_community_id] - # Get user information - set sw_admin_p 0 - set user_id [ad_conn user_id] - set untrusted_user_id [ad_conn untrusted_user_id] - if { $untrusted_user_id != 0 } { - set user_name [person::name -person_id $untrusted_user_id] - set pvt_home_url [ad_pvt_home] - set pvt_home_name [_ acs-subsite.Your_Account] - set logout_url [ad_get_logout_url] - - # Site-wide admin link - set admin_url {} - - set sw_admin_p [acs_user::site_wide_admin_p -user_id $untrusted_user_id] - - if { $sw_admin_p } { - set admin_url "/acs-admin/" - set locale_admin_url "/acs-lang/admin" - set dotlrn_admin_url "${dotlrn_url}/admin/" - } else { - set subsite_admin_p [permission::permission_p \ - -object_id [subsite::get_element -element object_id] \ - -privilege admin \ - -party_id $untrusted_user_id] - - if { $subsite_admin_p } { - set admin_url "[subsite::get_element -element url]admin/" - } - } - } else { - set login_url [ad_get_login_url -return] - set user_name {} - } - - set navbar "" + # Get user information + set sw_admin_p 0 + set dotlrn_admin_p 0 + set user_id [ad_conn user_id] + set untrusted_user_id [ad_conn untrusted_user_id] + if { $untrusted_user_id != 0 } { + set user_name [person::name -person_id $untrusted_user_id] + set pvt_home_url [ad_pvt_home] + set pvt_home_name [_ acs-subsite.Your_Account] + set logout_url [ad_get_logout_url] + + # Site-wide admin link + set admin_url {} + set dotlrn_admin_url "" + + set sw_admin_p [acs_user::site_wide_admin_p -user_id $untrusted_user_id] + set dotlrn_admin_p [permission::permission_p \ + -party_id $user_id \ + -object_id [dotlrn::get_package_id] \ + -privilege admin] + if { $dotlrn_admin_p } { + set dotlrn_admin_url "${dotlrn_url}/admin/" + } + + if { $sw_admin_p } { + set admin_url "/acs-admin/" + set locale_admin_url "/acs-lang/admin" + } else { + set subsite_admin_p [permission::permission_p \ + -object_id [subsite::get_element -element object_id] \ + -privilege admin \ + -party_id $untrusted_user_id] + + if { $subsite_admin_p } { + set admin_url "[subsite::get_element -element url]admin/" + } + } + } else { + set login_url [ad_get_login_url -return] + set user_name {} + } + + set navbar "" - set tabs_list [list] + set tabs_list [list] set which_tab_selected -1 set which_tab 0 set home_tab -1 - foreach {url name accesskey} [parameter::get_from_package_key -package_key "theme-zen" -parameter "AdditionalNavbarTabs" -default ""] { - lappend tabs_list [list $url $name $accesskey] + foreach {url name accesskey} [parameter::get_from_package_key -package_key "theme-zen" -parameter "AdditionalNavbarTabs" -default ""] { + lappend tabs_list [list $url $name $accesskey] if { $current_url == $url || $current_url == "$dotlrn_url/index" && $name eq "#dotlrn.Home#" } { set which_tab_selected $which_tab @@ -92,17 +100,17 @@ set home_tab $which_tab } incr which_tab - } + } - if { $sw_admin_p } { - lappend tabs_list [list $dotlrn_admin_url #dotlrn.Administration# #dotlrn.Administration_Accesskey#] + if { $dotlrn_admin_p } { + lappend tabs_list [list $dotlrn_admin_url #dotlrn.Administration# #dotlrn.Administration_Accesskey#] if { [string first $dotlrn_admin_url $current_url] != -1 } { set which_tab_selected $which_tab } incr which_tab - } + } - if { [exists_and_not_null community_id] } { + if { [exists_and_not_null community_id] } { set type [dotlrn_community::get_community_type_from_community_id $community_id] if { $type eq "dotlrn_community" || $type eq "dotlrn_pers_community" } { set community_message_key "#dotlrn.subcommunities_pretty_name#" @@ -115,16 +123,16 @@ set community_access_key #dotlrn.dotlrn_class_instance_access_key# } - if { ![parameter::get_from_package_key -package_key "theme-zen" -parameter "GenericCommunityTab" -default "0"] } { - # show title of the community instead of community type - # pretty name - set community_message_key [dotlrn_community::get_community_name $community_id] - } + if { ![parameter::get_from_package_key -package_key "theme-zen" -parameter "GenericCommunityTab" -default "0"] } { + # show title of the community instead of community type + # pretty name + set community_message_key [dotlrn_community::get_community_name $community_id] + } - lappend tabs_list [list [dotlrn_community::get_community_url $community_id] $community_message_key $community_access_key] + lappend tabs_list [list [dotlrn_community::get_community_url $community_id] $community_message_key $community_access_key] set which_tab_selected $which_tab incr which_tab - } + } # DRB: If we haven't found a tab to select, use the previous value if one # exists, otherwise don't select any tab. Don't write to the database for @@ -133,37 +141,37 @@ if { $which_tab_selected == -1 } { set which_tab_selected [ad_get_client_property dotlrn which_tab_selected] } else { - ad_set_client_property -persistent f dotlrn which_tab_selected $which_tab_selected + ad_set_client_property -persistent f dotlrn which_tab_selected $which_tab_selected } # DRB: Let the subnavbar proc know whether or not the home tab has been selected. - ad_set_client_property -persistent f dotlrn home_tab_selected_p \ + ad_set_client_property -persistent f dotlrn home_tab_selected_p \ [expr { $which_tab_selected == $home_tab }] - ns_log Debug "TABS" $tabs_list + ns_log Debug "TABS" $tabs_list # DRB: don't understand how the access keys were named in mark's template... set which_tab 0 - foreach tab_entry $tabs_list { + foreach tab_entry $tabs_list { foreach {url name accesskey} $tab_entry {} - if { $which_tab == $which_tab_selected } { - append navbar "\n[lang::util::localize $name]" - } else { - append navbar "\n[lang::util::localize $name]" - } - incr which_tab - } - - append navbar "\n" + if { $which_tab == $which_tab_selected } { + append navbar "\n[lang::util::localize $name]" + } else { + append navbar "\n[lang::util::localize $name]" + } + incr which_tab + } + + append navbar "\n" } ad_proc -public portal_subnavbar { {-user_id:required} {-control_panel_text:required} - {-link_all 0} + {-link_all 0} {-pre_html ""} {-post_html ""} } { @@ -175,7 +183,7 @@ set dotlrn_url [dotlrn::get_url] set community_id [dotlrn_community::get_community_id] set control_panel_name control-panel - set control_panel_url "$dotlrn_url/$control_panel_name" + set control_panel_url "$dotlrn_url/$control_panel_name" if { $community_id eq "" } { # We are not under a dotlrn community. However we could be @@ -184,7 +192,7 @@ set link "[dotlrn::get_url]/" if {[dotlrn::user_p -user_id $user_id] && - [ad_get_client_property dotlrn home_tab_selected_p] } { + [ad_get_client_property dotlrn home_tab_selected_p] } { # this user is a dotlrn user, we've selected the home tab, # show their personal portal subnavbar, including the control panel link set portal_id [dotlrn::get_portal_id -user_id $user_id] @@ -203,9 +211,9 @@ # some defaults set text [dotlrn_community::get_community_header_name $community_id] set control_panel_name one-community-admin - # link is important : it sets the options_set value, which will be used later to select the current page + # link is important : it sets the options_set value, which will be used later to select the current page set link [dotlrn_community::get_community_url $community_id] - set control_panel_url "$link/$control_panel_name" + set control_panel_url "$link/$control_panel_name" # figure out what this privs this user has on the community set admin_p [dotlrn::user_can_admin_community_p \ @@ -238,37 +246,37 @@ } #AG: This code belongs in the portal package, near portal::subnavbar. For display reasons we need to do this - #as a ul instead of a table, which portal::subnavbar returns. Obviously we shouldn't be letting display-level - #stuff decide where we put our code, but first we'll need to mod the portal package accordingly. + #as a ul instead of a table, which portal::subnavbar returns. Obviously we shouldn't be letting display-level + #stuff decide where we put our code, but first we'll need to mod the portal package accordingly. # DRB: the portal navbar stuff should return multirows which are then formatted by # the appropriate template, rather than include HTML as it does now. - if { [catch {set page_num [ad_get_client_property dotlrn page_num]}] || $page_num eq "" || ![string is integer $page_num] } { - set page_num [ns_queryget page_num] - #Strip out extra anchors and other crud. - #page_num will be empty_string for special pages like - #My Space and Control Panel - regsub -all {[^0-9]} $page_num {} page_num - } - - + if { [catch {set page_num [ad_get_client_property dotlrn page_num]}] || $page_num eq "" || ![string is integer $page_num] } { + set page_num [ns_queryget page_num] + #Strip out extra anchors and other crud. + #page_num will be empty_string for special pages like + #My Space and Control Panel + regsub -all {[^0-9]} $page_num {} page_num + } + + set subnavbar "" - db_foreach list_page_nums_select {} { - if {[string equal $page_num $sort_key]} { - append subnavbar "\n$pretty_name " - } else { - append subnavbar "\n$pretty_name " - } - } + db_foreach list_page_nums_select {} { + if {[string equal $page_num $sort_key]} { + append subnavbar "\n$pretty_name " + } else { + append subnavbar "\n$pretty_name " + } + } - if { $community_id ne "" && $admin_p } { - if {[string match "*/one-community-admin*" [ad_conn url]]} { - append subnavbar "\n[_ theme-zen.admin]" - } else { - append subnavbar "\n[_ theme-zen.admin]" - } - } + if { $community_id ne "" && $admin_p } { + if {[string match "*/one-community-admin*" [ad_conn url]]} { + append subnavbar "\n[_ theme-zen.admin]" + } else { + append subnavbar "\n[_ theme-zen.admin]" + } + } if { $subnavbar eq "" } { return "" Index: openacs-4/packages/theme-zen/www/admin/upgrade.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/admin/upgrade.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/theme-zen/www/admin/upgrade.tcl 15 May 2007 20:14:56 -0000 1.2 +++ openacs-4/packages/theme-zen/www/admin/upgrade.tcl 7 Oct 2007 22:37:05 -0000 1.3 @@ -41,6 +41,16 @@ -parameter DefaultMaster_p \ -value "/packages/theme-zen/lib/lrn-master" + parameter::set_default \ + -package_key dotlrn \ + -parameter non_member_layout_name \ + -value "#theme-zen.Zen_2_column#" + + parameter::set_default \ + -package_key dotlrn \ + -parameter admin_layout_name \ + -value "#theme-zen.Zen_2_column#" + # Poached from dotlrn's package instantiate callback. set site_template_id [db_string select_st_id {}] Index: openacs-4/packages/user-profile/user-profile.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/user-profile/user-profile.info,v diff -u -r1.11 -r1.12 --- openacs-4/packages/user-profile/user-profile.info 15 May 2007 20:15:01 -0000 1.11 +++ openacs-4/packages/user-profile/user-profile.info 7 Oct 2007 22:37:05 -0000 1.12 @@ -7,13 +7,13 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - + + Index: openacs-4/packages/weblogger-portlet/weblogger-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/weblogger-portlet.info,v diff -u -r1.8 -r1.9 --- openacs-4/packages/weblogger-portlet/weblogger-portlet.info 15 May 2007 20:15:01 -0000 1.8 +++ openacs-4/packages/weblogger-portlet/weblogger-portlet.info 7 Oct 2007 22:37:05 -0000 1.9 @@ -8,14 +8,14 @@ t weblogger-portlet - + Simon Carstensen - 2007-04-22 + 2007-09-08 Collaboraid - - - + + +
@count_all_users@ users in community, @count_complete@ complete responses, @count_incomplete@ incomplete responses
@items.event_name@
- @notification_chunk;noquote@ + + @notification_chunk;noquote@ +
Index: openacs-4/packages/calendar/www/view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.tcl,v diff -u -r1.24 -r1.25 --- openacs-4/packages/calendar/www/view.tcl 15 May 2007 20:14:21 -0000 1.24 +++ openacs-4/packages/calendar/www/view.tcl 7 Oct 2007 22:36:55 -0000 1.25 @@ -53,6 +53,7 @@ set ansi_day [string trimleft [lindex $ansi_list 2] "0"] set end_date [dt_julian_to_ansi [expr [dt_ansi_to_julian $ansi_year $ansi_month $ansi_day ] + $period_days]] } +set calendar_personal_p [calendar::personal_p -calendar_id [lindex [lindex [calendar::calendar_list -package_id $package_id ] 0] 1] ] set notification_chunk [notification::display::request_widget \ -type calendar_notif \ @@ -61,5 +62,16 @@ -url [ad_conn url] \ ] +# To be replaced by a call to template::head API +if {![template::multirow exists link]} { + template::multirow create link rel type href title lang media +} +template::multirow append link \ + stylesheet \ + "text/css" \ + "/resources/calendar/calendar.css" \ + "" \ + en \ + "all" ad_return_template Index: openacs-4/packages/calendar/www/views-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/views-oracle.xql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/calendar/www/views-oracle.xql 15 May 2007 20:14:21 -0000 1.6 +++ openacs-4/packages/calendar/www/views-oracle.xql 7 Oct 2007 22:36:55 -0000 1.7 @@ -20,7 +20,8 @@ e.event_id as item_id, (select type from cal_item_types where item_type_id= ci.item_type_id) as item_type, cals.calendar_id, - cals.calendar_name + cals.calendar_name, + (select count(1) from attachments where object_id=e.event_id) as num_attachments $additional_select_clause from cal_items ci, acs_events e, @@ -55,7 +56,8 @@ e.event_id as item_id, (select type from cal_item_types where item_type_id= ci.item_type_id) as item_type, cals.calendar_id, - cals.calendar_name + cals.calendar_name, + (select count(1) from attachments where object_id=e.event_id) as num_attachments $additional_select_clause from cal_items ci, acs_events e, Index: openacs-4/packages/calendar/www/views-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/views-postgresql.xql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/calendar/www/views-postgresql.xql 15 May 2007 20:14:21 -0000 1.6 +++ openacs-4/packages/calendar/www/views-postgresql.xql 7 Oct 2007 22:36:55 -0000 1.7 @@ -19,7 +19,8 @@ e.event_id as item_id, cit.type as item_type, cals.calendar_id, - cals.calendar_name + cals.calendar_name, + (select count(1) from attachments where object_id=e.event_id) as num_attachments $additional_select_clause from acs_activities a, acs_events e, @@ -56,7 +57,8 @@ e.event_id as item_id, (select type from cal_item_types where item_type_id= ci.item_type_id) as item_type, cals.calendar_id, - cals.calendar_name + cals.calendar_name, + (select count(1) from attachments where object_id=e.event_id) as num_attachments $additional_select_clause from cal_items ci, acs_events e, Index: openacs-4/packages/calendar/www/resources/images/attach.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/resources/images/attach.png,v diff -u -r1.1 -r1.2 Binary files differ Index: openacs-4/packages/calendar-portlet/calendar-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/calendar-portlet.info,v diff -u -r1.23 -r1.24 --- openacs-4/packages/calendar-portlet/calendar-portlet.info 15 May 2007 20:14:22 -0000 1.23 +++ openacs-4/packages/calendar-portlet/calendar-portlet.info 7 Oct 2007 22:36:56 -0000 1.24 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - + - + Index: openacs-4/packages/categories/tcl/categories-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/categories-procs.tcl,v diff -u -r1.23 -r1.24 --- openacs-4/packages/categories/tcl/categories-procs.tcl 6 Oct 2007 13:51:43 -0000 1.23 +++ openacs-4/packages/categories/tcl/categories-procs.tcl 7 Oct 2007 22:36:56 -0000 1.24 @@ -217,7 +217,22 @@ return $result } +ad_proc -public category::get_mapped_categories_multirow { + {-locale ""} + {-multirow mapped_categories} + object_id +} { + Returns multirow with: tree_id, tree_name, category_id, category_name + @param object_id object of which we want to know the mapped categories. + @return multirow with tree and category information + @author Peter Kreuzinger (peter.kreuzinger@wu-wien.ac.at) +} { + if { $locale == ""} {set locale [ad_conn locale]} + upvar $multirow mapped_categories + db_multirow mapped_categories select {} +} + ad_proc -public category::get_id { name {locale en_US} @@ -339,7 +354,46 @@ } return $result } +ad_proc -public category::get_children { + -category_id:required +} { + Returns the category ids of the direct children of the given category + @param category_id category_id + @return list of category ids of the children of the supplied category_id + @author Peter Kreuzinger (peter.kreuzinger@wu-wien.ac.at) +} { + set result [list] + set child_categories [db_list get_children_ids ""] + foreach category_id $child_categories { + lappend result $category_id + } + if {$result eq ""} {set result 0} + return $result +} + +ad_proc -public category::count_children { + {-category_id:required} +} { + counts all direct sub categories +} { + return [db_string select {}] +} + +ad_proc -public category::get_parent { + -category_id:required +} { + Returns the category id of the parent category + + @param category_id category_id + @return category id of the parent category + @author Peter Kreuzinger (peter.kreuzinger@wu-wien.ac.at) +} { + set result [db_list get_parent_id ""] + if {$result eq "{}"} {set result 0} + return $result +} + ad_proc -public category::get_tree { category_id } { @@ -376,6 +430,48 @@ return [list $category_id [category::get_name $category_id $locale] $tree_id [category_tree::get_name $tree_id $locale]] } +ad_proc -public category::get_objects { + -category_id + {-object_type ""} + {-content_type ""} + {-include_children:boolean} +} { + Returns a list of objects which are mapped to this category_id + + @param category_id CategoryID of the category we want to get the objects for + @param object_type Limit the search for objects of this object type + @param content_type Limit the search for objects of this content_type + @param include_children Include child categories' objects as well. Not yet implemented + + @author malte () + @creation-date Wed May 30 06:28:25 CEST 2007 +} { + set join_clause "" + set where_clause "" + if {$content_type ne ""} { + set join_clause ", cr_items i" + set where_clause "and i.item_id = com.object_id and i.content_type = :content_type" + } elseif {$object_type ne ""} { + set join_clause ", acs_objects o" + set where_clause "and o.object_id = com.object_id and o.object_type = :object_type" + } + return [db_list get_objects {}] +} + +ad_proc -public category::get_id_by_object_title { + title +} { + Gets the id of a category given an object title (object_type=category). + This is highly useful as the category object title will not change if you change the + name (label) of the category, so you can access the category even if the label has changed + + @param title object title of the category to retrieve + @return the category id or empty string it no category was found + @author Peter Kreuzinger (peter.kreuzinger@wu-wien.ac.at) +} { + return [db_string get_category_id {} -default ""] +} + ad_proc -public category::get_object_context { object_id } { Returns the object name and url to be used in a context bar. Index: openacs-4/packages/categories/tcl/categories-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/Attic/categories-procs.xql,v diff -u -r1.8 -r1.9 --- openacs-4/packages/categories/tcl/categories-procs.xql 23 Mar 2005 22:44:56 -0000 1.8 +++ openacs-4/packages/categories/tcl/categories-procs.xql 7 Oct 2007 22:36:56 -0000 1.9 @@ -1,6 +1,35 @@ + + + select count(*) + from categories + where parent_id=:category_id + + + + + + + select category_id + from categories + where parent_id = :category_id + + + + + + + + select parent_id + from categories + where category_id = :category_id + limit 1 + + + + @@ -74,6 +103,22 @@ + + + + select co.tree_id, aot.title, c.category_id, ao.title + from category_object_map_tree co, categories c, category_translations ct, acs_objects ao, acs_objects aot + where co.object_id = :object_id + and co.category_id = c.category_id + and c.category_id = ao.object_id + and c.category_id = ct.category_id + and aot.object_id = co.tree_id + and ct.locale = :locale + order by aot.title, ao.title + + + + SELECT category_object_map.category_id @@ -84,6 +129,24 @@ + + + SELECT com.object_id + FROM category_object_map com $join_clause + WHERE com.category_id = :category_id $where_clause + + + + + + + select object_id + from acs_objects + where title = :title + and object_type = 'category' + + + Index: openacs-4/packages/categories/tcl/category-trees-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-trees-procs.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/categories/tcl/category-trees-procs.tcl 6 Oct 2007 13:51:43 -0000 1.22 +++ openacs-4/packages/categories/tcl/category-trees-procs.tcl 7 Oct 2007 22:36:56 -0000 1.23 @@ -26,6 +26,21 @@ return [array get tree] } + ad_proc -public get_categories { + {-tree_id:required} + } { + returns the main categories of a given tree + } { + set locale [ad_conn locale] + set result [list] + set categories [db_list get_categories ""] + foreach category_id $categories { + lappend result $category_id + } + return $result + + } + ad_proc -public map { -tree_id:required -object_id:required @@ -216,7 +231,38 @@ return $result } + ad_proc -public get_trees { object_id } { + Get the category trees mapped to an object. + @param object_id object to get the mapped category trees. + @return tcl list of tree_ids + @author Peter Kreuzinger (peter.kreuzinger@wu-wien.ac.at) + } { + set result [list] + + db_foreach get_trees "" { + lappend result $tree_id + } + + return $result + } + + ad_proc -public get_id_by_object_title { + {-title} + } { + Gets the id of a category_tree given an object title (object_type=category). + This is highly useful as the category_tree object title will not change if you change the + name (label) of the category_tree, so you can access the category_tree even if the label has changed. + Why would you want this? E.g. if you have the category widget and want to get only one specific tree + displayed and not all of them. + + @param title object title of the category to retrieve + @return the category_tree_id or empty string it no category was found + @author Malte Sussdorff (malte.sussdorff@cognovis.de) + } { + return [db_string get_tree_id {} -default ""] + } + ad_proc -public get_mapped_trees_from_object_list { object_id_list {locale ""}} { Get the category trees mapped to a list of objects. Index: openacs-4/packages/categories/tcl/category-trees-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/Attic/category-trees-procs.xql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/categories/tcl/category-trees-procs.xql 28 Aug 2007 16:30:03 -0000 1.9 +++ openacs-4/packages/categories/tcl/category-trees-procs.xql 7 Oct 2007 22:36:56 -0000 1.10 @@ -11,7 +11,17 @@ - + + + select c.category_id as category_id from categories c, category_translations ct + where parent_id is null + and tree_id = :tree_id + and c.category_id = ct.category_id + and locale = :locale + order by name + + + @@ -36,6 +46,16 @@ + + + + select object_id + from acs_objects + where title = :title + and object_type = 'category_tree' + + + @@ -59,8 +79,16 @@ + + + + select distinct tree_id + from category_object_map_tree + where object_id = :object_id + + + - Index: openacs-4/packages/categories/tcl/widget-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/widget-procs.tcl,v diff -u -r1.20 -r1.21 --- openacs-4/packages/categories/tcl/widget-procs.tcl 28 Aug 2007 16:30:03 -0000 1.20 +++ openacs-4/packages/categories/tcl/widget-procs.tcl 7 Oct 2007 22:36:56 -0000 1.21 @@ -14,9 +14,24 @@ namespace eval template::data::transform {} namespace eval template::data::validate {} -ad_proc -public template::widget::category { element_reference tag_attributes } { - # author: Timo Hentschel (timo@timohentschel.de) - +ad_proc -public template::widget::category { + element_reference + tag_attributes +} { + Display the category widget. This has a multitude of options: + + value: Values should be a list of two items: the object_id being viewed and the object_id which the trees are mapped to. + This will get the mapped trees (if no value provided defaults to package_id) and the mapped categories for the object_id. If you + do not provide a value, the following options are used: + category_application_id> + category_object_id + category_tree_id + category_subtree_id + category_assign_single_p + category_require_category_p + + @author: Timo Hentschel (timo@timohentschel.de) +} { upvar $element_reference element if { [info exists element(html)] } { Index: openacs-4/packages/dotlrn/dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v diff -u -r1.126 -r1.127 --- openacs-4/packages/dotlrn/dotlrn.info 15 May 2007 20:14:24 -0000 1.126 +++ openacs-4/packages/dotlrn/dotlrn.info 7 Oct 2007 22:36:56 -0000 1.127 @@ -7,19 +7,19 @@ f f - + OpenACS A Course Management System - 2007-04-22 + 2007-09-08 OpenACS Course Management - + - - + + @@ -31,6 +31,7 @@ + @@ -71,6 +72,7 @@ + Index: openacs-4/packages/dotlrn/install.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/install.xml,v diff -u -r1.15 -r1.16 --- openacs-4/packages/dotlrn/install.xml 15 May 2007 20:14:24 -0000 1.15 +++ openacs-4/packages/dotlrn/install.xml 7 Oct 2007 22:36:56 -0000 1.16 @@ -25,9 +25,17 @@ + + + + + + + + Index: openacs-4/packages/dotlrn/lib/member-email-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/lib/member-email-confirm.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/lib/member-email-confirm.tcl 15 May 2007 20:14:25 -0000 1.2 +++ openacs-4/packages/dotlrn/lib/member-email-confirm.tcl 7 Oct 2007 22:36:56 -0000 1.3 @@ -21,7 +21,7 @@ -form { {from_addr:text {label "\#dotlrn.From\#"}} {subject:text {label "\#dotlrn.Subject\#"}} - {email:richtext {label "\#dotlrn.Email_1\#"}} + {email:richtext {label "\#dotlrn.Email_1\#"} {html {rows 20 cols 80 style width:100%}}} {btn_ok:text(submit) {label "[_ dotlrn.OK_Send_Email]"}} {btn_cancel:text(submit) {label "[_ dotlrn.Cancel_Dont_Send_email]"}} } -on_request { Index: openacs-4/packages/dotlrn/lib/member-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/lib/member-email.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/lib/member-email.tcl 15 Dec 2006 22:45:22 -0000 1.3 +++ openacs-4/packages/dotlrn/lib/member-email.tcl 7 Oct 2007 22:36:56 -0000 1.4 @@ -70,7 +70,7 @@ ad_form -extend -name "member_email" -form { {from_addr:text {label "From Address"} {html {size 40}}} {subject:text {label "Subject"} {html {size 40}}} - {email:richtext,optional {label "Message"} {html {rows 30 cols 80 wrap soft}} {htmlarea_p 0}} + {email:richtext,optional {label "Message"} {html {rows 30 cols 80}} {htmlarea_p 0}} {community_id:text(hidden) {value $community_id}} {type:text(hidden) {value $type}} {enabled_p:text(hidden) {value $type}} Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v diff -u -r1.199 -r1.200 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 21 Jun 2007 19:04:56 -0000 1.199 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 7 Oct 2007 22:36:56 -0000 1.200 @@ -231,6 +231,7 @@ set non_member_portal_id [portal::create \ -name "$pretty_name Non-Member Portal" \ -default_page_name [dotlrn::parameter -name non_member_page_name] \ + -layout_name [dotlrn::parameter -name non_member_layout_name] \ -context_id $community_id \ $user_id \ ] @@ -239,6 +240,7 @@ set admin_portal_id [portal::create \ -name "$pretty_name Administration Portal" \ -default_page_name [dotlrn::parameter -name admin_page_name] \ + -layout_name [dotlrn::parameter -name admin_layout_name] \ -context_id $community_id \ $user_id \ ] @@ -1035,13 +1037,22 @@ {-package_id ""} } { Returns the community id depending on the package_id - we're at, or the package_id passed in + we're at, or the package_id passed in. + + If no community_id found, return empty_string + + @param package_id PackageID for which to search the community_id for + @return community_id of the community where the package is mounted, empty string if not found } { if {[empty_string_p $package_id]} { set package_id [site_node_closest_ancestor_package -default [ad_conn package_id] dotlrn] } - return [util_memoize "dotlrn_community::get_community_id_not_cached -package_id $package_id"] + if {$package_id ne ""} { + return [util_memoize "dotlrn_community::get_community_id_not_cached -package_id $package_id"] + } else { + return "" + } } ad_proc -private get_community_id_not_cached { Index: openacs-4/packages/dotlrn/www/clone.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/clone.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/dotlrn/www/clone.tcl 8 Aug 2006 21:26:23 -0000 1.8 +++ openacs-4/packages/dotlrn/www/clone.tcl 7 Oct 2007 22:36:56 -0000 1.9 @@ -75,7 +75,7 @@ -label [_ dotlrn.Description] \ -datatype text \ -widget textarea \ - -html {rows 5 cols 60 wrap soft} \ + -html {rows 5 cols 60} \ -optional \ -value "[_ dotlrn.A_copy_of] $community_name" Index: openacs-4/packages/dotlrn/www/community-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/dotlrn/www/community-edit.tcl 15 Dec 2006 22:45:22 -0000 1.14 +++ openacs-4/packages/dotlrn/www/community-edit.tcl 7 Oct 2007 22:36:56 -0000 1.15 @@ -39,7 +39,7 @@ {description:text(textarea),optional {label "#dotlrn.Description#"} - {html {rows 5 cols 60 wrap soft}} + {html {rows 5 cols 60}} {help_text "[_ dotlrn.lt_do_not_use_p_tags]"} } Index: openacs-4/packages/dotlrn/www/member-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-email.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/member-email.tcl 8 Aug 2006 21:26:24 -0000 1.2 +++ openacs-4/packages/dotlrn/www/member-email.tcl 7 Oct 2007 22:36:56 -0000 1.3 @@ -24,7 +24,7 @@ {email_id:key} {from_addr:text {label "From Address"} {html {size 40}}} {subject:text {label "Subject"} {html {size 40}}} - {email:richtext,optional {label "Message"} {html {rows 30 cols 80 wrap soft}} {htmlarea_p 1}} + {email:richtext,optional {label "Message"} {html {rows 30 cols 80}}} } -on_request { set from_addr [cc_email_from_party [ad_conn user_id]] @@ -53,4 +53,4 @@ ad_returnredirect "one-community-admin" ad_script_abort -} \ No newline at end of file +} Index: openacs-4/packages/dotlrn/www/members.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.adp,v diff -u -r1.24 -r1.25 --- openacs-4/packages/dotlrn/www/members.adp 8 Aug 2006 21:26:24 -0000 1.24 +++ openacs-4/packages/dotlrn/www/members.adp 7 Oct 2007 22:36:56 -0000 1.25 @@ -42,10 +42,13 @@ -#dotlrn.Membership_Requests# + + + #dotlrn.Membership_Requests# + + + - - Index: openacs-4/packages/dotlrn/www/members.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v diff -u -r1.26 -r1.27 --- openacs-4/packages/dotlrn/www/members.tcl 4 Oct 2007 16:07:05 -0000 1.26 +++ openacs-4/packages/dotlrn/www/members.tcl 7 Oct 2007 22:36:56 -0000 1.27 @@ -31,6 +31,8 @@ set context [list [list "one-community-admin" [_ dotlrn.Admin]] [_ dotlrn.Manage_Members]] set community_id [dotlrn_community::get_community_id] set spam_p [dotlrn::user_can_spam_community_p -user_id [ad_get_user_id] -community_id $community_id] +set approval_policy_p [string eq [group::join_policy -group_id $community_id] "needs approval"] + set referer [ns_conn url] set return_url "[ns_conn url]?[ns_conn query]" @@ -73,23 +75,22 @@ # Actions for Removing Members according to their role set rel_types [dotlrn_community::get_roles -community_id $community_id] +set bulk_actions "" +set bulk_actions_export_vars "" +set actions "" + if {$admin_p} { - set bulk_actions [list "[_ dotlrn.User_Admin_Page]" "member-add-3" "[_ dotlrn.User_Admin_Page]" "[_ dotlrn.Drop_Membership]" "deregister" "[_ dotlrn.Drop_Membership]"] - set bulk_actions_export_vars [list "user_id" "rel_type" "referer" "reset"] + set bulk_actions [list "[_ dotlrn.Drop_Membership]" "deregister" "[_ dotlrn.Drop_Membership]"] + set bulk_actions_export_vars [list "user_id" "referer" "reset"] set actions [list "CSV" "members?csv=yes" "[_ dotlrn.Comma_Separated_Values]"] foreach role $rel_types { # lappend actions "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" "members?reset=1&reltype=[lindex $role 0]" "[lang::util::localize [lindex $role 2]]" lappend actions "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" "member-confirm?reset=1&reltype=[lindex $role 0]" "[lang::util::localize [lindex $role 2]]" } - -} else { - set bulk_actions "" - set actions "" - set bulk_actions_export_vars "" } -# Build the list-builder list -template::list::create -name members -multirow members -key user_id -actions $actions -bulk_actions $bulk_actions -bulk_action_export_vars $bulk_actions_export_vars -elements { +# Set the elements list +set elm_list { portrait { label "" html "align right" @@ -125,24 +126,31 @@ } role { label "[_ dotlrn.Role]" html "align left" - } action { + } +} + +if {$admin_p} { + lappend elm_list {action} { label "[_ dotlrn.Actions]" html "align left" display_template { - + #dotlrn.Drop_Membership# | #dotlrn.User_Admin_Page# } } - } -orderby { +} + +# Build the list-builder list +template::list::create -name members -multirow members -key user_id -actions $actions -bulk_actions $bulk_actions -bulk_action_export_vars $bulk_actions_export_vars -elements $elm_list -orderby { last_name {orderby last_name} first_names {orderby first_names} email {orderby email} role {orderby role} - } -selected_format csv -formats { +} -selected_format csv -formats { csv { output csv } - } +} set orderby [template::list::orderby_clause -name "members" -orderby] @@ -160,18 +168,18 @@ template::list::write_output -name members } -# Bulk action User Admin Page -# Depending on the community_type, we have allowable rel_types -set rel_types [dotlrn_community::get_roles -community_id $community_id] -set selection "" -foreach role $rel_types { - append selection "[lang::util::localize [lindex $role 2]]" -} -append selection "" -set size [multirow size members] -if { $size > 0 } { - multirow append members "" "" "" "" "" $selection -} +# # Bulk action User Admin Page +# # Depending on the community_type, we have allowable rel_types +# set rel_types [dotlrn_community::get_roles -community_id $community_id] +# set selection "" +# foreach role $rel_types { +# append selection "[lang::util::localize [lindex $role 2]]" +# } +# append selection "" +# set size [multirow size members] +# if { $size > 0 } { +# multirow append members "" "" "" "" "" $selection +# } set user_ids "" db_multirow -extend { member_url pending_user_referer } pending_users select_pending_users {} { Index: openacs-4/packages/dotlrn/www/spam.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v diff -u -r1.26 -r1.27 --- openacs-4/packages/dotlrn/www/spam.tcl 15 May 2007 20:14:25 -0000 1.26 +++ openacs-4/packages/dotlrn/www/spam.tcl 7 Oct 2007 22:36:56 -0000 1.27 @@ -123,7 +123,7 @@ -label [_ dotlrn.Message] \ -datatype text \ -widget textarea \ - -html {rows 10 cols 80 wrap soft} + -html {rows 10 cols 80} element create spam_message format \ 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.30 -r1.31 --- openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 28 Sep 2007 13:07:32 -0000 1.30 +++ openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 7 Oct 2007 22:36:56 -0000 1.31 @@ -118,7 +118,7 @@ } if {${add_instructor}} { - set community_id $class_instance_id + set community_id $class_instance_id ad_returnredirect "add-instructor?[export_url_vars community_id referer]" ad_script_abort } 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.18 -r1.19 --- openacs-4/packages/dotlrn/www/admin/class-new.tcl 8 Aug 2006 21:26:28 -0000 1.18 +++ openacs-4/packages/dotlrn/www/admin/class-new.tcl 7 Oct 2007 22:36:56 -0000 1.19 @@ -56,7 +56,7 @@ -label [_ dotlrn.Description] \ -datatype text \ -widget textarea \ - -html {rows 5 cols 60 wrap soft} \ + -html {rows 5 cols 60} \ -optional element create add_class subject_key \ Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl 8 Aug 2006 21:26:28 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl 7 Oct 2007 22:36:56 -0000 1.12 @@ -55,7 +55,7 @@ } if {![exists_and_not_null referer]} { - set referer "classes?[export_vars department_key]" + set referer "classes" } set query select_classes @@ -82,7 +82,7 @@ set actions "" if { $can_create } { - set actions [list "[_ dotlrn.new_class_1]" "[export_vars -base "class-new" -url { department_key referer }]"] + set actions [list "[_ dotlrn.new_class_1]" "[export_vars -base "class-new" -url { department_key referer }]" "[_ dotlrn.new_class_1]"] } template::list::create \ @@ -117,18 +117,14 @@ label "[_ dotlrn.Actions]" display_template { - \[ - [_ dotlrn.new_class_instance] + [_ dotlrn.new_class_instance] \] - - \[ - [_ dotlrn.lt_Delete_class] + [_ dotlrn.lt_Delete_class] \] - } } 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.20 -r1.21 --- openacs-4/packages/dotlrn/www/admin/club-new.tcl 8 Aug 2006 21:26:28 -0000 1.20 +++ openacs-4/packages/dotlrn/www/admin/club-new.tcl 7 Oct 2007 22:36:56 -0000 1.21 @@ -42,7 +42,7 @@ {description:text(textarea),optional {label "#dotlrn.Description#"} - {html {rows 5 cols 60 wrap soft}} + {html {rows 5 cols 60}} {help_text "[_ dotlrn.lt_do_not_use_p_tags]"} } Index: openacs-4/packages/dotlrn/www/admin/community-type.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/community-type.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/admin/community-type.tcl 28 Jul 2004 07:24:12 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/community-type.tcl 7 Oct 2007 22:36:56 -0000 1.2 @@ -42,7 +42,7 @@ ad_form -extend -name "new_community_type" -form { {pretty_name:text {label "[_ dotlrn.Pretty_Name]"} {html {size 60 maxlength 100}}} - {description:text(textarea),optional {label "[_ dotlrn.Description]"} {html {rows 5 cols 60 wrap soft}}} + {description:text(textarea),optional {label "[_ dotlrn.Description]"} {html {rows 5 cols 60}}} } -validate { {community_type { ![dotlrn_community::type_exists $community_type] || Index: openacs-4/packages/dotlrn/www/admin/department-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-edit.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/admin/department-edit.tcl 8 Aug 2006 21:26:28 -0000 1.9 +++ openacs-4/packages/dotlrn/www/admin/department-edit.tcl 7 Oct 2007 22:36:56 -0000 1.10 @@ -57,7 +57,7 @@ -label "[_ dotlrn.Description]" \ -datatype text \ -widget textarea \ - -html {rows 5 cols 60 wrap soft} \ + -html {rows 5 cols 60} \ -optional element create edit_department external_url \ Index: openacs-4/packages/dotlrn/www/admin/department-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-new.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/admin/department-new.tcl 8 Aug 2006 21:26:28 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/department-new.tcl 7 Oct 2007 22:36:56 -0000 1.12 @@ -45,7 +45,7 @@ -label "[_ dotlrn.Description]" \ -datatype text \ -widget textarea \ - -html {rows 5 cols 60 wrap soft} \ + -html {rows 5 cols 60} \ -optional element create add_department external_url \ Index: openacs-4/packages/dotlrn/www/admin/users-spam.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-spam.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/dotlrn/www/admin/users-spam.tcl 8 Aug 2006 21:26:28 -0000 1.6 +++ openacs-4/packages/dotlrn/www/admin/users-spam.tcl 7 Oct 2007 22:36:56 -0000 1.7 @@ -71,7 +71,7 @@ -label [_ dotlrn.Message] \ -datatype text \ -widget textarea \ - -html {rows 10 cols 80 wrap soft} + -html {rows 10 cols 80} element create spam_message referer \ -label [_ dotlrn.Referer] \ Index: openacs-4/packages/dotlrn-assessment/dotlrn-assessment.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-assessment/dotlrn-assessment.info,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn-assessment/dotlrn-assessment.info 15 May 2007 20:14:26 -0000 1.3 +++ openacs-4/packages/dotlrn-assessment/dotlrn-assessment.info 7 Oct 2007 22:36:57 -0000 1.4 @@ -7,13 +7,13 @@ f t - + Jose Pablo Escobedo Del Cid - 2007-04-22 + 2007-09-08 - - - + + + Index: openacs-4/packages/dotlrn-bm/dotlrn-bm.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bm/dotlrn-bm.info,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn-bm/dotlrn-bm.info 15 May 2007 20:14:26 -0000 1.11 +++ openacs-4/packages/dotlrn-bm/dotlrn-bm.info 7 Oct 2007 22:36:57 -0000 1.12 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info,v diff -u -r1.17 -r1.18 --- openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info 15 May 2007 20:14:26 -0000 1.17 +++ openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info 7 Oct 2007 22:36:57 -0000 1.18 @@ -7,15 +7,15 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - - + + + + Index: openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info,v diff -u -r1.18 -r1.19 --- openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info 15 May 2007 20:14:27 -0000 1.18 +++ openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info 7 Oct 2007 22:36:57 -0000 1.19 @@ -7,15 +7,15 @@ f t - + OpenACS Helper routines for dotLRN applets - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-evaluation/dotlrn-evaluation.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-evaluation/dotlrn-evaluation.info,v diff -u -r1.6 -r1.7 --- openacs-4/packages/dotlrn-evaluation/dotlrn-evaluation.info 15 May 2007 20:14:27 -0000 1.6 +++ openacs-4/packages/dotlrn-evaluation/dotlrn-evaluation.info 7 Oct 2007 22:36:57 -0000 1.7 @@ -7,13 +7,13 @@ f t - + Jose Pablo Escobedo Del Cid - 2007-04-22 + 2007-09-08 - - - + + + Index: openacs-4/packages/dotlrn-faq/dotlrn-faq.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-faq/dotlrn-faq.info,v diff -u -r1.17 -r1.18 --- openacs-4/packages/dotlrn-faq/dotlrn-faq.info 15 May 2007 20:14:28 -0000 1.17 +++ openacs-4/packages/dotlrn-faq/dotlrn-faq.info 7 Oct 2007 22:36:57 -0000 1.18 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-forums/dotlrn-forums.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/dotlrn-forums.info,v diff -u -r1.15 -r1.16 --- openacs-4/packages/dotlrn-forums/dotlrn-forums.info 15 May 2007 20:14:28 -0000 1.15 +++ openacs-4/packages/dotlrn-forums/dotlrn-forums.info 7 Oct 2007 22:36:57 -0000 1.16 @@ -7,15 +7,15 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS 0 - - - + + + Index: openacs-4/packages/dotlrn-fs/dotlrn-fs.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/dotlrn-fs.info,v diff -u -r1.29 -r1.30 --- openacs-4/packages/dotlrn-fs/dotlrn-fs.info 15 May 2007 20:14:29 -0000 1.29 +++ openacs-4/packages/dotlrn-fs/dotlrn-fs.info 7 Oct 2007 22:36:58 -0000 1.30 @@ -7,15 +7,15 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - + + - + Index: openacs-4/packages/dotlrn-homework/dotlrn-homework.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/dotlrn-homework.info,v diff -u -r1.10 -r1.11 --- openacs-4/packages/dotlrn-homework/dotlrn-homework.info 15 May 2007 20:14:30 -0000 1.10 +++ openacs-4/packages/dotlrn-homework/dotlrn-homework.info 7 Oct 2007 22:36:58 -0000 1.11 @@ -7,16 +7,16 @@ f f - + Don Baccus Provides a homework assignment dropboxes for dotLRN classes. - 2007-04-22 + 2007-09-08 furfly.net, LLC - - - - + + + + Index: openacs-4/packages/dotlrn-homework/www/file-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file-add.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn-homework/www/file-add.tcl 8 Aug 2006 21:26:36 -0000 1.4 +++ openacs-4/packages/dotlrn-homework/www/file-add.tcl 7 Oct 2007 22:36:58 -0000 1.5 @@ -52,7 +52,7 @@ ad_form -extend -name homework_form -form { {description:text(textarea),optional {label "[_ dotlrn-homework.Description]"} - {html {rows 5 cols 50 wrap physical}}} + {html {rows 5 cols 50}}} } -validate { {upload_file { [file size [template::util::file::get_property tmp_filename $upload_file]] <= [ad_parameter "MaximumFileSize"] } Index: openacs-4/packages/dotlrn-homework/www/version-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/version-add.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn-homework/www/version-add.tcl 20 Apr 2004 21:13:31 -0000 1.3 +++ openacs-4/packages/dotlrn-homework/www/version-add.tcl 7 Oct 2007 22:36:58 -0000 1.4 @@ -31,7 +31,7 @@ file_id:key {upload_file:file {label "[_ dotlrn-homework.lt_version_filename]"}} {description:text(textarea),optional {label "[_ dotlrn-homework.lt_version_notes]"} - {html {rows 5 cols 50 wrap physical}}} + {html {rows 5 cols 50}}} } -edit_request { } -validate { {upload_file Index: openacs-4/packages/dotlrn-news/dotlrn-news.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news/dotlrn-news.info,v diff -u -r1.13 -r1.14 --- openacs-4/packages/dotlrn-news/dotlrn-news.info 15 May 2007 20:14:30 -0000 1.13 +++ openacs-4/packages/dotlrn-news/dotlrn-news.info 7 Oct 2007 22:36:58 -0000 1.14 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-photo-album/dotlrn-photo-album.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-photo-album/dotlrn-photo-album.info,v diff -u -r1.6 -r1.7 --- openacs-4/packages/dotlrn-photo-album/dotlrn-photo-album.info 15 May 2007 20:14:31 -0000 1.6 +++ openacs-4/packages/dotlrn-photo-album/dotlrn-photo-album.info 7 Oct 2007 22:36:58 -0000 1.7 @@ -7,15 +7,15 @@ f t - + Jeff Davis Xarg - 2007-04-22 + 2007-09-08 - - + + - + Index: openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info,v diff -u -r1.22 -r1.23 --- openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info 15 May 2007 20:14:31 -0000 1.22 +++ openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info 7 Oct 2007 22:36:58 -0000 1.23 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-random-photo/dotlrn-random-photo.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-random-photo/dotlrn-random-photo.info,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn-random-photo/dotlrn-random-photo.info 15 May 2007 20:14:32 -0000 1.4 +++ openacs-4/packages/dotlrn-random-photo/dotlrn-random-photo.info 7 Oct 2007 22:36:58 -0000 1.5 @@ -7,12 +7,12 @@ f f - + Gerardo Morales - 2007-04-22 + 2007-09-08 - - + + Index: openacs-4/packages/dotlrn-static/dotlrn-static.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-static/dotlrn-static.info,v diff -u -r1.14 -r1.15 --- openacs-4/packages/dotlrn-static/dotlrn-static.info 15 May 2007 20:14:32 -0000 1.14 +++ openacs-4/packages/dotlrn-static/dotlrn-static.info 7 Oct 2007 22:36:58 -0000 1.15 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-survey/dotlrn-survey.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-survey/dotlrn-survey.info,v diff -u -r1.8 -r1.9 --- openacs-4/packages/dotlrn-survey/dotlrn-survey.info 15 May 2007 20:14:32 -0000 1.8 +++ openacs-4/packages/dotlrn-survey/dotlrn-survey.info 7 Oct 2007 22:36:59 -0000 1.9 @@ -7,15 +7,15 @@ f t - + dave bauer dotLRN applet for Survey package dotLRN applet for Survey package - 2007-04-22 + 2007-09-08 - - - + + + Index: openacs-4/packages/dotlrn-syllabus/dotlrn-syllabus.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/dotlrn-syllabus.info,v diff -u -r1.10 -r1.11 --- openacs-4/packages/dotlrn-syllabus/dotlrn-syllabus.info 15 May 2007 20:14:32 -0000 1.10 +++ openacs-4/packages/dotlrn-syllabus/dotlrn-syllabus.info 7 Oct 2007 22:36:59 -0000 1.11 @@ -7,14 +7,14 @@ f f - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - + - + Index: openacs-4/packages/dotlrn-weblogger/dotlrn-weblogger.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-weblogger/dotlrn-weblogger.info,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotlrn-weblogger/dotlrn-weblogger.info 15 May 2007 20:14:33 -0000 1.9 +++ openacs-4/packages/dotlrn-weblogger/dotlrn-weblogger.info 7 Oct 2007 22:36:59 -0000 1.10 @@ -7,14 +7,14 @@ f t - + Simon Carstensen - 2007-04-22 + 2007-09-08 Collaboraid - - - + + + Index: openacs-4/packages/evaluation/evaluation.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/evaluation.info,v diff -u -r1.28 -r1.29 --- openacs-4/packages/evaluation/evaluation.info 27 Jun 2007 22:56:48 -0000 1.28 +++ openacs-4/packages/evaluation/evaluation.info 7 Oct 2007 22:36:59 -0000 1.29 @@ -10,7 +10,8 @@ Jose Pablo Escobedo Del Cid This package allows the users (professors and students) to use the system to submit and grade the tasks. - 2007-06-15 + 2007-09-08 + This package allows the professors and TAs to assign tasks to the students and to grade them, and to the students to upload their answers and see their grades. 0 #evaluation.Evaluations# Index: openacs-4/packages/evaluation/www/evaluation-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/evaluation-view.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation/www/evaluation-view.tcl 8 Aug 2006 21:26:41 -0000 1.5 +++ openacs-4/packages/evaluation/www/evaluation-view.tcl 7 Oct 2007 22:36:59 -0000 1.6 @@ -116,7 +116,7 @@ } {comments:text(textarea) {label "[_ evaluation.Comments_1]"} - {html {rows 4 cols 40 wrap soft}} + {html {rows 4 cols 40}} {value $comments} } {evaluation_date:date,to_sql(linear_date),from_sql(sql_date) Index: openacs-4/packages/evaluation/www/task-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/evaluation/www/task-view.tcl 8 Aug 2006 21:26:41 -0000 1.14 +++ openacs-4/packages/evaluation/www/task-view.tcl 7 Oct 2007 22:36:59 -0000 1.15 @@ -79,7 +79,7 @@ {description:richtext,optional {label "[_ evaluation.lt_Assignments_Descripti]"} - {html {rows 4 cols 40 wrap soft}} + {html {rows 4 cols 40}} } {due_date:date,to_sql(linear_date),from_sql(sql_date) Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl 8 Aug 2006 21:26:42 -0000 1.12 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl 7 Oct 2007 22:36:59 -0000 1.13 @@ -37,7 +37,7 @@ } ] \ edit_reason \ [list label "[_ evaluation.Edit_Reason_]" \ - display_template { } \ + display_template { } \ ] \ show_student_p \ [list label "[_ evaluation.lt_Allow_the_students_br]" \ Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 8 Aug 2006 21:26:42 -0000 1.22 +++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 7 Oct 2007 22:36:59 -0000 1.23 @@ -257,7 +257,7 @@ display_template { $max_grade max} ] lappend elements comments \ [list label "[_ evaluation.Comments]" \ - display_template { } \ + display_template { } \ ] lappend elements show_answer \ [list label "[_ evaluation.see_grades]" \ @@ -347,7 +347,7 @@ display_template { $max_grade max.}] lappend elements comments \ [list label "[_ evaluation.Comments]" \ - display_template { } \ + display_template { } \ ] lappend elements show_answer \ [list label "[_ evaluation.see_grades]" \ @@ -447,7 +447,7 @@ display_template { $max_grade max.}] lappend elements comments \ [list label "[_ evaluation.Comments]" \ - display_template { } \ + display_template { } \ ] lappend elements show_answer \ [list label "[_ evaluation.see_grades]" \ Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl,v diff -u -r1.29 -r1.30 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 15 Dec 2006 22:45:31 -0000 1.29 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 7 Oct 2007 22:36:59 -0000 1.30 @@ -197,7 +197,7 @@ {description:richtext,optional {label "[_ evaluation.lt_Assignments_Descripti]"} - {html {rows 4 cols 40 wrap soft}} + {html {rows 4 cols 40}} } {due_date:date,to_sql(linear_date),from_sql(sql_date),optional Index: openacs-4/packages/evaluation/www/view/evaluation-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/evaluation-view.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/view/evaluation-view.tcl 8 Aug 2006 21:26:43 -0000 1.2 +++ openacs-4/packages/evaluation/www/view/evaluation-view.tcl 7 Oct 2007 22:37:00 -0000 1.3 @@ -113,7 +113,7 @@ } {comments:text(textarea) {label "[_ evaluation.Comments_1]"} - {html {rows 4 cols 40 wrap soft}} + {html {rows 4 cols 40}} {value $comments} } {evaluation_date:date,to_sql(linear_date),from_sql(sql_date) Index: openacs-4/packages/evaluation/www/view/task-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/task-view.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/view/task-view.tcl 8 Aug 2006 21:26:43 -0000 1.2 +++ openacs-4/packages/evaluation/www/view/task-view.tcl 7 Oct 2007 22:37:00 -0000 1.3 @@ -79,7 +79,7 @@ {description:richtext,optional {label "[_ evaluation.lt_Assignments_Descripti]"} - {html {rows 4 cols 40 wrap soft}} + {html {rows 4 cols 40}} } {due_date:date,to_sql(linear_date),from_sql(sql_date) Index: openacs-4/packages/evaluation-portlet/evaluation-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/evaluation-portlet.info,v diff -u -r1.9 -r1.10 --- openacs-4/packages/evaluation-portlet/evaluation-portlet.info 15 May 2007 20:14:33 -0000 1.9 +++ openacs-4/packages/evaluation-portlet/evaluation-portlet.info 7 Oct 2007 22:37:00 -0000 1.10 @@ -7,12 +7,12 @@ f t - + Jose Pablo Escobedo Del Cid - 2007-03-27 + 2007-09-08 - - + + Index: openacs-4/packages/faq/faq.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/faq.info,v diff -u -r1.21 -r1.22 --- openacs-4/packages/faq/faq.info 27 Jun 2007 22:51:41 -0000 1.21 +++ openacs-4/packages/faq/faq.info 7 Oct 2007 22:37:00 -0000 1.22 @@ -12,14 +12,14 @@ Jennie Kim Housman Elizabeth Wirth Manage simple and categorized Question and Answer style FAQs with WYSIWYG and notification functionalities. - 2007-06-15 + 2007-07-11 Ybos Corporation Handles frequently asked questions Q&A presentation. Can be one Q&A per page or all presented flat. Straightforward application with room for improvement. Support for notification as well as WYSIQYG Editor and Categories - both optional. Category trees are displayed flat. No multiple filters. 2 #faq.FAQs# - + Index: openacs-4/packages/faq/sql/postgresql/faq-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/sql/postgresql/faq-create.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/faq/sql/postgresql/faq-create.sql 1 Apr 2004 22:52:46 -0000 1.5 +++ openacs-4/packages/faq/sql/postgresql/faq-create.sql 7 Oct 2007 22:37:00 -0000 1.6 @@ -142,9 +142,4 @@ \i faq-package-create.sql - - - - - - +\i faq-sc-create.sql Index: openacs-4/packages/faq/sql/postgresql/faq-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/sql/postgresql/faq-drop.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/faq/sql/postgresql/faq-drop.sql 17 May 2003 10:33:37 -0000 1.3 +++ openacs-4/packages/faq/sql/postgresql/faq-drop.sql 7 Oct 2007 22:37:00 -0000 1.4 @@ -2,6 +2,15 @@ -- @author wirth@ybos.net --openacs port @samir.symphinity.com +--drop triggers +drop trigger faq_sc__itrg on faq_q_and_as; +drop trigger faq_sc__dtrg on faq_q_and_as; +drop trigger faq_sc__utrg on faq_q_and_as; + +drop function faq_sc__itrg () +drop function faq_sc__dtrg () +drop function faq_sc__utrg () + --drop functions drop function faq__new_q_and_a (integer,integer,varchar,varchar,integer,varchar,timestamptz,integer,varchar,integer); drop function faq__delete_q_and_a (integer); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/faq/sql/postgresql/faq-sc-create.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/faq/sql/postgresql/upgrade/upgrade-5.2.0d4-5.2.0d5.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/faq-portlet/faq-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/faq-portlet.info,v diff -u -r1.21 -r1.22 --- openacs-4/packages/faq-portlet/faq-portlet.info 15 May 2007 20:14:35 -0000 1.21 +++ openacs-4/packages/faq-portlet/faq-portlet.info 7 Oct 2007 22:37:00 -0000 1.22 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - + - + Index: openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl 30 Jan 2007 14:05:24 -0000 1.7 +++ openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl 7 Oct 2007 22:37:00 -0000 1.8 @@ -109,6 +109,15 @@ return "/file/$item_id/$name" } +ad_proc -public -callback search::url -impl file_storage_object { + -object_id:required +} { + Return the URL to the file_storage_object +} { + set item_id [content::revision::item_id -revision_id $object_id] + set name [db_string item "select name from cr_items where item_id = :item_id" -default ""] + return "[ad_url]/file/$item_id/$name" +} ad_proc -public -callback datamanager::copy_folder -impl datamanager { -object_id:required Index: openacs-4/packages/forums/lib/message/post.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/post.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/forums/lib/message/post.tcl 6 Jul 2007 12:13:25 -0000 1.16 +++ openacs-4/packages/forums/lib/message/post.tcl 7 Oct 2007 22:37:01 -0000 1.17 @@ -37,7 +37,7 @@ {label "[_ forums.Subject]"} } {message_body:richtext(richtext) - {html {rows 20 cols 60 wrap soft}} + {html {rows 20 cols 60}} {label "[_ forums.Body]"} } {forum_id:integer(hidden) Index: openacs-4/packages/forums/lib/message/thread-chunk-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk-oracle.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/forums/lib/message/thread-chunk-oracle.xql 15 Mar 2005 20:06:45 -0000 1.4 +++ openacs-4/packages/forums/lib/message/thread-chunk-oracle.xql 7 Oct 2007 22:37:01 -0000 1.5 @@ -28,7 +28,7 @@ state, user_id, parent_id - from $table_name + from $table_name t where forum_id = :forum_id and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey) order by $order_by @@ -48,7 +48,7 @@ state, user_id, parent_id - from $table_name + from $table_name t where forum_id = :forum_id and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey) order by $order_by Index: openacs-4/packages/forums/lib/message/thread-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/forums/lib/message/thread-chunk.tcl 15 May 2007 20:14:39 -0000 1.6 +++ openacs-4/packages/forums/lib/message/thread-chunk.tcl 7 Oct 2007 22:37:01 -0000 1.7 @@ -90,6 +90,7 @@ db_multirow -extend { posting_date_pretty direct_url number parent_number parent_direct_url reply_p viewed_p open_p} responses $query {} { set open_p t set tree_level [min [expr {$tree_level - $message(tree_level)}] 10] + set posting_date_ansi [lc_time_system_to_conn $posting_date_ansi] set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"] set direct_url "$direct_url_base\#$message_id" set number [expr [lsearch $message_id_list $message_id] + 1] Index: openacs-4/packages/forums/tcl/form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/form-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/forums/tcl/form-procs.tcl 15 May 2007 20:14:40 -0000 1.8 +++ openacs-4/packages/forums/tcl/form-procs.tcl 7 Oct 2007 22:37:01 -0000 1.9 @@ -39,7 +39,7 @@ -label [_ forums.Body] \ -datatype richtext \ -widget richtext \ - -html {rows 20 cols 60 wrap soft style {width:100%}} \ + -html {rows 20 cols 60 style {width:100%}} \ $optional_switch } @@ -102,7 +102,7 @@ } { template::element create $form_name ${prefix}to_email \ -label [_ forums.Email] \ - -datatype text \ + -datatype email \ -widget text \ -html {size 60} @@ -116,7 +116,7 @@ -label [_ forums.Your_Note] \ -datatype text \ -widget textarea \ - -html {cols 80 rows 10 wrap hard} + -html {cols 80 rows 10} } ad_proc -public forums::form::search { @@ -155,7 +155,7 @@ -label [_ forums.Charter] \ -datatype richtext \ -widget richtext \ - -html {cols 60 rows 10 wrap soft} \ + -html {cols 60 rows 10} \ -validate { {expr [string length $value] <= 4000 } {#forums.charter_max_chars#} } \ -optional Index: openacs-4/packages/forums/tcl/forums-callback-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/Attic/forums-callback-procs-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/forums/tcl/forums-callback-procs-oracle.xql 28 Jan 2006 15:39:03 -0000 1.1 +++ openacs-4/packages/forums/tcl/forums-callback-procs-oracle.xql 7 Oct 2007 22:37:01 -0000 1.2 @@ -35,9 +35,8 @@ select subject, content, format from forums_messages - where message_id=:message_id --- lets just get the message instead of the whole thread --- replace with a connect by + start with message_id=:message_id + connect by prior message_id = parent_id Index: openacs-4/packages/forums/tcl/forums-callback-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/Attic/forums-callback-procs-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/forums/tcl/forums-callback-procs-postgresql.xql 28 Jan 2006 15:39:03 -0000 1.1 +++ openacs-4/packages/forums/tcl/forums-callback-procs-postgresql.xql 7 Oct 2007 22:37:01 -0000 1.2 @@ -35,9 +35,9 @@ select subject, content, format from forums_messages - where message_id=:message_id --- lets just get the message instead of the whole thread --- replace with a connect by + where message_id=:message_id or (tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey)) + and forum_id=:forum_id + order by tree_sortkey Index: openacs-4/packages/forums/www/message-email.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-email.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/forums/www/message-email.adp 8 Aug 2006 21:26:53 -0000 1.10 +++ openacs-4/packages/forums/www/message-email.adp 7 Oct 2007 22:37:01 -0000 1.11 @@ -2,13 +2,15 @@ #forums.Email_Message# @message.forum_name;noquote@ - @message.subject;noquote@ @context;noquote@ - - - - - + + + + + + link + #forums.lt_Email_a_copy_of_the_f# Index: openacs-4/packages/forums/www/message-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-email.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/forums/www/message-email.tcl 15 Mar 2005 20:06:45 -0000 1.13 +++ openacs-4/packages/forums/www/message-email.tcl 7 Oct 2007 22:37:01 -0000 1.14 @@ -53,4 +53,48 @@ lappend context [list "./message-view?message_id=$message(message_id)" "$message(subject)"] lappend context [_ forums.Email_to_a_friend] +if {![template::multirow exists link]} { + template::multirow create link rel type href title lang media +} + +template::multirow append link \ + stylesheet \ + text/css \ + /resources/forums/forums.css \ + "" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/flat.css \ + "flat" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/flat-collapse.css \ + "flat-collapse" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/collapse.css \ + "collapse" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/expand.css \ + "expand" \ + [ad_conn language] \ + all + ad_return_template Index: openacs-4/packages/forums/www/message-post-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post-confirm.adp,v diff -u -r1.15 -r1.16 --- openacs-4/packages/forums/www/message-post-confirm.adp 8 Aug 2006 21:26:53 -0000 1.15 +++ openacs-4/packages/forums/www/message-post-confirm.adp 7 Oct 2007 22:37:01 -0000 1.16 @@ -2,13 +2,15 @@ #forums.Confirm_Post_to_Forum# @forum.name;noquote@ @context;noquote@ - - - - - + + + + + + link + @context;noquote@ message.subject - - - - - + + + + + + link + @message_id@ - - - - - - - + + + + + + + - @dynamic_script;noquote@ + + + +link +script + @page_title;noquote@ Index: openacs-4/packages/forums/www/message-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v diff -u -r1.37 -r1.38 --- openacs-4/packages/forums/www/message-view.tcl 15 Jun 2007 11:53:51 -0000 1.37 +++ openacs-4/packages/forums/www/message-view.tcl 7 Oct 2007 22:37:01 -0000 1.38 @@ -101,8 +101,6 @@ set thread_url [export_vars -base forum-view { { forum_id $message(forum_id) } }] set dynamic_script " - - " if {$forum(presentation_type) eq "flat"} { set display_mode flat } -set page_title "#forums.Thread_title#" \ No newline at end of file +# stylesheets +if {![template::multirow exists link]} { + template::multirow create link rel type href title lang media +} + +template::multirow append link \ + stylesheet \ + text/css \ + /resources/forums/forums.css \ + "" \ + [ad_conn language] \ + all + +template::multirow append link \ + stylesheet \ + text/css \ + /resources/forums/print.css \ + "" \ + [ad_conn language] \ + print + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/flat.css \ + "flat" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/flat-collapse.css \ + "flat-collapse" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/collapse.css \ + "collapse" \ + [ad_conn language] \ + all + +template::multirow append link \ + "alternate stylesheet" \ + text/css \ + /resources/forums/expand.css \ + "expand" \ + [ad_conn language] \ + all + +# js scripts +if {![template::multirow exists script]} { + template::multirow create script type src charset defer content +} + +template::multirow append script \ + "text/javascript" \ + "/resources/forums/forums.js" + +template::multirow append script \ + "text/javascript" \ + "/resources/forums/dynamic-comments.js" + +template::multirow append script \ + "text/javascript" \ + "" \ + "" \ + "" \ + $dynamic_script + +set page_title "#forums.Thread_title#" Index: openacs-4/packages/forums/www/moderate/message-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/forums/www/moderate/message-delete.adp 8 Aug 2006 21:26:53 -0000 1.10 +++ openacs-4/packages/forums/www/moderate/message-delete.adp 7 Oct 2007 22:37:01 -0000 1.11 @@ -2,16 +2,12 @@ #forums.Confirm_Delete# @message.subject;noquote@ #forums.delete# - + - + + +link +script + Index: openacs-4/packages/forums/www/moderate/message-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/forums/www/moderate/message-delete.tcl 17 Dec 2003 15:45:31 -0000 1.10 +++ openacs-4/packages/forums/www/moderate/message-delete.tcl 7 Oct 2007 22:37:01 -0000 1.11 @@ -18,4 +18,43 @@ # Select the stuff forum::message::get -message_id $message_id -array message +set dynamic_script " + +" +# stylesheets +if {![template::multirow exists link]} { + template::multirow create link rel type href title lang media +} + +template::multirow append link \ + stylesheet \ + text/css \ + /resources/forums/forums.css \ + "" \ + [ad_conn language] \ + all + +# js scripts +if {![template::multirow exists script]} { + template::multirow create script type src charset defer content +} + +template::multirow append script \ + "text/javascript" \ + "/resources/forums/forums.js" + +template::multirow append script \ + "text/javascript" \ + "" \ + "" \ + "" \ + $dynamic_script + ad_return_template Index: openacs-4/packages/forums-portlet/forums-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/forums-portlet.info,v diff -u -r1.12 -r1.13 --- openacs-4/packages/forums-portlet/forums-portlet.info 15 May 2007 20:14:41 -0000 1.12 +++ openacs-4/packages/forums-portlet/forums-portlet.info 7 Oct 2007 22:37:01 -0000 1.13 @@ -7,15 +7,15 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS 0 - + - + Index: openacs-4/packages/fs-portlet/fs-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/fs-portlet.info,v diff -u -r1.21 -r1.22 --- openacs-4/packages/fs-portlet/fs-portlet.info 15 May 2007 20:14:41 -0000 1.21 +++ openacs-4/packages/fs-portlet/fs-portlet.info 7 Oct 2007 22:37:01 -0000 1.22 @@ -7,14 +7,14 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - + - + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/catalog/imsld.es_GT.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/lib/choice-select.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/lib/imsld-master.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/lib/imsld-master.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/sql/postgresql/upgrade/upgrade-1.1d-1.2d.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/admin/monitor/properties-frame.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/resources/imsld.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/resources/imsld.js'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/imsld/www/resources/viewed.ico =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/resources/viewed.ico,v diff -u -r1.1 -r1.2 Binary files differ Index: openacs-4/packages/lars-blogger/lars-blogger.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/lars-blogger.info,v diff -u -r1.43 -r1.44 --- openacs-4/packages/lars-blogger/lars-blogger.info 15 May 2007 20:14:42 -0000 1.43 +++ openacs-4/packages/lars-blogger/lars-blogger.info 7 Oct 2007 22:37:02 -0000 1.44 @@ -7,15 +7,15 @@ f f - + Lars Pind Individual or collaborative web logs. - 2007-04-22 + 2007-09-08 OpenACS Weblog creation and management with notifications, RSS, trackpack, technorati, blogroll, pings, archives, draft and published entries, includable templates for presenting on other pages, and permissioning for multiple users. 0 - + Index: openacs-4/packages/new-portal/new-portal.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/new-portal.info,v diff -u -r1.30 -r1.31 --- openacs-4/packages/new-portal/new-portal.info 15 May 2007 20:14:46 -0000 1.30 +++ openacs-4/packages/new-portal/new-portal.info 7 Oct 2007 22:37:02 -0000 1.31 @@ -8,14 +8,14 @@ t portal - + OpenACS Portals. - 2007-04-22 + 2007-09-08 OpenACS New Portal Package aka NPP. Portals are used to aggregate content from different sources within a single page. Props to Ian Baker for "Portal". - + Index: openacs-4/packages/new-portal/sql/oracle/api-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/api-create.sql,v diff -u -r1.43 -r1.44 --- openacs-4/packages/new-portal/sql/oracle/api-create.sql 15 May 2007 20:14:47 -0000 1.43 +++ openacs-4/packages/new-portal/sql/oracle/api-create.sql 7 Oct 2007 22:37:02 -0000 1.44 @@ -267,7 +267,8 @@ -- now insert the pages from the portal template for page in (select * from portal_pages - where portal_id = portal.new.template_id) + where portal_id = portal.new.template_id + order by sort_key) loop v_page_id := portal_page.new( Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/sql/oracle/upgrade/upgrade-2.3.1d1-2.3.1d2.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/new-portal/sql/postgresql/api-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/postgresql/api-create.sql,v diff -u -r1.15 -r1.16 --- openacs-4/packages/new-portal/sql/postgresql/api-create.sql 15 May 2007 20:14:47 -0000 1.15 +++ openacs-4/packages/new-portal/sql/postgresql/api-create.sql 7 Oct 2007 22:37:03 -0000 1.16 @@ -132,7 +132,7 @@ select define_function_args('portal__new','portal_id,name,theme_id,layout_id,template_id,default_page_name,default_accesskey,object_type;portal,creation_date,creation_user,creation_ip,context_id'); -create function portal__new (integer,varchar,integer,integer,integer,varchar,varchar,varchar,timestamptz,integer,varchar,integer) +create or replace function portal__new (integer,varchar,integer,integer,integer,varchar,varchar,varchar,timestamptz,integer,varchar,integer) returns integer as ' declare p_portal_id alias for $1; @@ -226,6 +226,7 @@ for v_page in select * from portal_pages where portal_id = p_template_id + order by sort_key loop v_page_id := portal_page__new( Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/sql/postgresql/upgrade/upgrade-2.3.1d1-2.3.1d2.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v diff -u -r1.182 -r1.183 --- openacs-4/packages/new-portal/tcl/portal-procs.tcl 13 Aug 2007 06:10:27 -0000 1.182 +++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 7 Oct 2007 22:37:03 -0000 1.183 @@ -145,7 +145,11 @@ set page_name_list [list $default_page_name] set page_accesskey_list [list $default_accesskey] - set layout_name_list [list "#new-portal.simple_2column_layout_name#"] + if { [string eq $layout_name ""] } { + set layout_name_list [list "#new-portal.simple_2column_layout_name#"] + } else { + set layout_name_list [list $layout_name] + } if {![empty_string_p $csv_list]} { set page_name_and_layout_list [split [string trimright $csv_list ";"] ";"] Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/tcl/test/new-portal-test-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/news-portlet/news-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/news-portlet.info,v diff -u -r1.19 -r1.20 --- openacs-4/packages/news-portlet/news-portlet.info 15 May 2007 20:14:50 -0000 1.19 +++ openacs-4/packages/news-portlet/news-portlet.info 7 Oct 2007 22:37:03 -0000 1.20 @@ -7,13 +7,13 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - + + Index: openacs-4/packages/photo-album/www/album-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-add.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/photo-album/www/album-add.tcl 18 Nov 2003 22:59:03 -0000 1.4 +++ openacs-4/packages/photo-album/www/album-add.tcl 7 Oct 2007 22:37:03 -0000 1.5 @@ -40,7 +40,7 @@ template::element create album_add description -html { size 50 } \ -label "[_ photo-album._Album]" -datatype text -optional -template::element create album_add story -html {cols 50 rows 4 wrap soft} \ +template::element create album_add story -html {cols 50 rows 4} \ -label "[_ photo-album._Album_1]" -datatype text -widget textarea -optional if { [template::form is_request album_add] } { Index: openacs-4/packages/photo-album/www/album-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-edit.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/photo-album/www/album-edit.tcl 18 Nov 2003 22:59:03 -0000 1.4 +++ openacs-4/packages/photo-album/www/album-edit.tcl 7 Oct 2007 22:37:03 -0000 1.5 @@ -47,7 +47,7 @@ template::element create edit_album description -html { size 50} \ -label "[_ photo-album._Album]" -datatype text -optional -template::element create edit_album story -html { cols 50 rows 4 wrap soft } \ +template::element create edit_album story -html { cols 50 rows 4 } \ -label "[_ photo-album._Album_1]" -datatype text -widget textarea -optional Index: openacs-4/packages/photo-album/www/photo-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-add.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/photo-album/www/photo-add.tcl 29 Jun 2004 10:18:45 -0000 1.6 +++ openacs-4/packages/photo-album/www/photo-add.tcl 7 Oct 2007 22:37:03 -0000 1.7 @@ -44,7 +44,7 @@ element create photo_upload description -html { size 50} \ -label "[_ photo-album._Photo]" -optional -help_text "[_ photo-album.lt_OPTIONAL_Displayed_wh]" -datatype text -element create photo_upload story -html { cols 50 rows 4 wrap soft } \ +element create photo_upload story -html { cols 50 rows 4 } \ -label "[_ photo-album._Photo_1]" -optional -help_text "[_ photo-album.OPTIONAL]" -datatype text -widget textarea element set_properties photo_upload album_id -value $album_id Index: openacs-4/packages/photo-album/www/photo-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-edit.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/photo-album/www/photo-edit.tcl 18 Nov 2003 22:59:03 -0000 1.4 +++ openacs-4/packages/photo-album/www/photo-edit.tcl 7 Oct 2007 22:37:03 -0000 1.5 @@ -59,7 +59,7 @@ template::element create edit_photo description -html { size 50} \ -label "<#_Description#>" -help_text "Displayed when viewing the photo" -optional -datatype text -template::element create edit_photo story -html { cols 50 rows 4 wrap soft } \ +template::element create edit_photo story -html { cols 50 rows 4 } \ -label "<#_Story#>" -optional -datatype text -help_text "Displayed when viewing the photo" -widget textarea template::element create edit_photo submit_b -widget submit \ Index: openacs-4/packages/photo-album-portlet/photo-album-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album-portlet/photo-album-portlet.info,v diff -u -r1.7 -r1.8 --- openacs-4/packages/photo-album-portlet/photo-album-portlet.info 15 May 2007 20:14:52 -0000 1.7 +++ openacs-4/packages/photo-album-portlet/photo-album-portlet.info 7 Oct 2007 22:37:04 -0000 1.8 @@ -7,13 +7,13 @@ f t - + Jeff Davis Xarg - 2007-04-22 - + 2007-09-08 + - + Index: openacs-4/packages/profile-provider/profile-provider.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/profile-provider/profile-provider.info,v diff -u -r1.11 -r1.12 --- openacs-4/packages/profile-provider/profile-provider.info 15 May 2007 20:14:52 -0000 1.11 +++ openacs-4/packages/profile-provider/profile-provider.info 7 Oct 2007 22:37:04 -0000 1.12 @@ -7,12 +7,12 @@ f t - + OpenACS OpenACS - 2007-04-22 + 2007-09-08 - + Index: openacs-4/packages/random-photo-portlet/random-photo-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/random-photo-portlet/random-photo-portlet.info,v diff -u -r1.5 -r1.6 --- openacs-4/packages/random-photo-portlet/random-photo-portlet.info 15 May 2007 20:14:52 -0000 1.5 +++ openacs-4/packages/random-photo-portlet/random-photo-portlet.info 7 Oct 2007 22:37:04 -0000 1.6 @@ -7,12 +7,12 @@ f f - + Gerardo Morales - 2007-04-22 + 2007-09-08 - - + + Index: openacs-4/packages/static-portlet/static-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/static-portlet.info,v diff -u -r1.20 -r1.21 --- openacs-4/packages/static-portlet/static-portlet.info 15 May 2007 20:14:53 -0000 1.20 +++ openacs-4/packages/static-portlet/static-portlet.info 7 Oct 2007 22:37:04 -0000 1.21 @@ -7,14 +7,14 @@ f f - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - - + + + Index: openacs-4/packages/static-portlet/www/element.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/element.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/static-portlet/www/element.tcl 15 Dec 2006 22:45:43 -0000 1.15 +++ openacs-4/packages/static-portlet/www/element.tcl 7 Oct 2007 22:37:04 -0000 1.16 @@ -53,7 +53,7 @@ ad_form -name static_element -form { element_content_id:key {pretty_name:text(text) {label "[_ static-portlet.Name]"} {html {size 60}}} - {content:richtext(richtext) {label "[_ static-portlet.Content]"} {html {rows 15 cols 80 wrap soft}}} + {content:richtext(richtext) {label "[_ static-portlet.Content]"} {html {rows 15 cols 80}}} } if {[lsearch $templates $type] >= 0} { Index: openacs-4/packages/survey-portlet/survey-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey-portlet/survey-portlet.info,v diff -u -r1.8 -r1.9 --- openacs-4/packages/survey-portlet/survey-portlet.info 15 May 2007 20:14:54 -0000 1.8 +++ openacs-4/packages/survey-portlet/survey-portlet.info 7 Oct 2007 22:37:04 -0000 1.9 @@ -7,14 +7,14 @@ f t - + dave bauer Survey package portlet for new-portal - 2007-04-22 + 2007-09-08 Survey package portlet for new-portal - - + + Index: openacs-4/packages/theme-selva/theme-selva.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/theme-selva.info,v diff -u -r1.18 -r1.19 --- openacs-4/packages/theme-selva/theme-selva.info 15 May 2007 20:14:54 -0000 1.18 +++ openacs-4/packages/theme-selva/theme-selva.info 7 Oct 2007 22:37:04 -0000 1.19 @@ -8,14 +8,14 @@ f theme-selva - + Rafael Calvo - 2007-04-22 + 2007-09-08 0 - - + + Index: openacs-4/packages/theme-zen/theme-zen.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/theme-zen.info,v diff -u -r1.2 -r1.3 --- openacs-4/packages/theme-zen/theme-zen.info 15 May 2007 20:14:55 -0000 1.2 +++ openacs-4/packages/theme-zen/theme-zen.info 7 Oct 2007 22:37:05 -0000 1.3 @@ -8,14 +8,14 @@ t theme-zen - + Rafael Calvo - 2007-04-22 + 2007-09-08 0 - - + + @@ -28,6 +28,7 @@ + Index: openacs-4/packages/theme-zen/lib/lrn-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/theme-zen/lib/lrn-master.adp 15 May 2007 20:14:55 -0000 1.2 +++ openacs-4/packages/theme-zen/lib/lrn-master.adp 7 Oct 2007 22:37:05 -0000 1.3 @@ -16,7 +16,9 @@ #theme-zen.skip_to_main_content# - + + + Index: openacs-4/packages/theme-zen/lib/lrn-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/theme-zen/lib/lrn-master.tcl 7 Jun 2007 14:26:33 -0000 1.3 +++ openacs-4/packages/theme-zen/lib/lrn-master.tcl 7 Oct 2007 22:37:05 -0000 1.4 @@ -18,6 +18,14 @@ set system_url "" } +# Logo +array set attributes [parameter::get_from_package_key -package_key "theme-zen" -parameter logoImageAttributes] +set img_attrib "" +foreach name [array names attributes] { + append img_attrib " $name=\"$attributes($name)\"" +} + + # Get user information set sw_admin_p [acs_user::site_wide_admin_p -user_id $untrusted_user_id] if { $untrusted_user_id != 0 } { Index: openacs-4/packages/theme-zen/tcl/navigation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/tcl/navigation-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/theme-zen/tcl/navigation-procs.tcl 15 May 2007 20:14:56 -0000 1.2 +++ openacs-4/packages/theme-zen/tcl/navigation-procs.tcl 7 Oct 2007 22:37:05 -0000 1.3 @@ -30,60 +30,68 @@ namespace eval zen { ad_proc -public portal_navbar { - + } { - A helper procedure that generates the Navbar, ie the tabs, - for dotlrn. It is called from the zen-master template. + A helper procedure that generates the Navbar, ie the tabs, + for dotlrn. It is called from the zen-master template. } { - set current_url [ad_conn url] + set current_url [ad_conn url] set dotlrn_url [dotlrn::get_url] - # Set up some basic stuff - set community_id [dotlrn_community::get_community_id] + # Set up some basic stuff + set community_id [dotlrn_community::get_community_id] - # Get user information - set sw_admin_p 0 - set user_id [ad_conn user_id] - set untrusted_user_id [ad_conn untrusted_user_id] - if { $untrusted_user_id != 0 } { - set user_name [person::name -person_id $untrusted_user_id] - set pvt_home_url [ad_pvt_home] - set pvt_home_name [_ acs-subsite.Your_Account] - set logout_url [ad_get_logout_url] - - # Site-wide admin link - set admin_url {} - - set sw_admin_p [acs_user::site_wide_admin_p -user_id $untrusted_user_id] - - if { $sw_admin_p } { - set admin_url "/acs-admin/" - set locale_admin_url "/acs-lang/admin" - set dotlrn_admin_url "${dotlrn_url}/admin/" - } else { - set subsite_admin_p [permission::permission_p \ - -object_id [subsite::get_element -element object_id] \ - -privilege admin \ - -party_id $untrusted_user_id] - - if { $subsite_admin_p } { - set admin_url "[subsite::get_element -element url]admin/" - } - } - } else { - set login_url [ad_get_login_url -return] - set user_name {} - } - - set navbar "" + # Get user information + set sw_admin_p 0 + set dotlrn_admin_p 0 + set user_id [ad_conn user_id] + set untrusted_user_id [ad_conn untrusted_user_id] + if { $untrusted_user_id != 0 } { + set user_name [person::name -person_id $untrusted_user_id] + set pvt_home_url [ad_pvt_home] + set pvt_home_name [_ acs-subsite.Your_Account] + set logout_url [ad_get_logout_url] + + # Site-wide admin link + set admin_url {} + set dotlrn_admin_url "" + + set sw_admin_p [acs_user::site_wide_admin_p -user_id $untrusted_user_id] + set dotlrn_admin_p [permission::permission_p \ + -party_id $user_id \ + -object_id [dotlrn::get_package_id] \ + -privilege admin] + if { $dotlrn_admin_p } { + set dotlrn_admin_url "${dotlrn_url}/admin/" + } + + if { $sw_admin_p } { + set admin_url "/acs-admin/" + set locale_admin_url "/acs-lang/admin" + } else { + set subsite_admin_p [permission::permission_p \ + -object_id [subsite::get_element -element object_id] \ + -privilege admin \ + -party_id $untrusted_user_id] + + if { $subsite_admin_p } { + set admin_url "[subsite::get_element -element url]admin/" + } + } + } else { + set login_url [ad_get_login_url -return] + set user_name {} + } + + set navbar "" - set tabs_list [list] + set tabs_list [list] set which_tab_selected -1 set which_tab 0 set home_tab -1 - foreach {url name accesskey} [parameter::get_from_package_key -package_key "theme-zen" -parameter "AdditionalNavbarTabs" -default ""] { - lappend tabs_list [list $url $name $accesskey] + foreach {url name accesskey} [parameter::get_from_package_key -package_key "theme-zen" -parameter "AdditionalNavbarTabs" -default ""] { + lappend tabs_list [list $url $name $accesskey] if { $current_url == $url || $current_url == "$dotlrn_url/index" && $name eq "#dotlrn.Home#" } { set which_tab_selected $which_tab @@ -92,17 +100,17 @@ set home_tab $which_tab } incr which_tab - } + } - if { $sw_admin_p } { - lappend tabs_list [list $dotlrn_admin_url #dotlrn.Administration# #dotlrn.Administration_Accesskey#] + if { $dotlrn_admin_p } { + lappend tabs_list [list $dotlrn_admin_url #dotlrn.Administration# #dotlrn.Administration_Accesskey#] if { [string first $dotlrn_admin_url $current_url] != -1 } { set which_tab_selected $which_tab } incr which_tab - } + } - if { [exists_and_not_null community_id] } { + if { [exists_and_not_null community_id] } { set type [dotlrn_community::get_community_type_from_community_id $community_id] if { $type eq "dotlrn_community" || $type eq "dotlrn_pers_community" } { set community_message_key "#dotlrn.subcommunities_pretty_name#" @@ -115,16 +123,16 @@ set community_access_key #dotlrn.dotlrn_class_instance_access_key# } - if { ![parameter::get_from_package_key -package_key "theme-zen" -parameter "GenericCommunityTab" -default "0"] } { - # show title of the community instead of community type - # pretty name - set community_message_key [dotlrn_community::get_community_name $community_id] - } + if { ![parameter::get_from_package_key -package_key "theme-zen" -parameter "GenericCommunityTab" -default "0"] } { + # show title of the community instead of community type + # pretty name + set community_message_key [dotlrn_community::get_community_name $community_id] + } - lappend tabs_list [list [dotlrn_community::get_community_url $community_id] $community_message_key $community_access_key] + lappend tabs_list [list [dotlrn_community::get_community_url $community_id] $community_message_key $community_access_key] set which_tab_selected $which_tab incr which_tab - } + } # DRB: If we haven't found a tab to select, use the previous value if one # exists, otherwise don't select any tab. Don't write to the database for @@ -133,37 +141,37 @@ if { $which_tab_selected == -1 } { set which_tab_selected [ad_get_client_property dotlrn which_tab_selected] } else { - ad_set_client_property -persistent f dotlrn which_tab_selected $which_tab_selected + ad_set_client_property -persistent f dotlrn which_tab_selected $which_tab_selected } # DRB: Let the subnavbar proc know whether or not the home tab has been selected. - ad_set_client_property -persistent f dotlrn home_tab_selected_p \ + ad_set_client_property -persistent f dotlrn home_tab_selected_p \ [expr { $which_tab_selected == $home_tab }] - ns_log Debug "TABS" $tabs_list + ns_log Debug "TABS" $tabs_list # DRB: don't understand how the access keys were named in mark's template... set which_tab 0 - foreach tab_entry $tabs_list { + foreach tab_entry $tabs_list { foreach {url name accesskey} $tab_entry {} - if { $which_tab == $which_tab_selected } { - append navbar "\n[lang::util::localize $name]" - } else { - append navbar "\n[lang::util::localize $name]" - } - incr which_tab - } - - append navbar "\n" + if { $which_tab == $which_tab_selected } { + append navbar "\n[lang::util::localize $name]" + } else { + append navbar "\n[lang::util::localize $name]" + } + incr which_tab + } + + append navbar "\n" } ad_proc -public portal_subnavbar { {-user_id:required} {-control_panel_text:required} - {-link_all 0} + {-link_all 0} {-pre_html ""} {-post_html ""} } { @@ -175,7 +183,7 @@ set dotlrn_url [dotlrn::get_url] set community_id [dotlrn_community::get_community_id] set control_panel_name control-panel - set control_panel_url "$dotlrn_url/$control_panel_name" + set control_panel_url "$dotlrn_url/$control_panel_name" if { $community_id eq "" } { # We are not under a dotlrn community. However we could be @@ -184,7 +192,7 @@ set link "[dotlrn::get_url]/" if {[dotlrn::user_p -user_id $user_id] && - [ad_get_client_property dotlrn home_tab_selected_p] } { + [ad_get_client_property dotlrn home_tab_selected_p] } { # this user is a dotlrn user, we've selected the home tab, # show their personal portal subnavbar, including the control panel link set portal_id [dotlrn::get_portal_id -user_id $user_id] @@ -203,9 +211,9 @@ # some defaults set text [dotlrn_community::get_community_header_name $community_id] set control_panel_name one-community-admin - # link is important : it sets the options_set value, which will be used later to select the current page + # link is important : it sets the options_set value, which will be used later to select the current page set link [dotlrn_community::get_community_url $community_id] - set control_panel_url "$link/$control_panel_name" + set control_panel_url "$link/$control_panel_name" # figure out what this privs this user has on the community set admin_p [dotlrn::user_can_admin_community_p \ @@ -238,37 +246,37 @@ } #AG: This code belongs in the portal package, near portal::subnavbar. For display reasons we need to do this - #as a ul instead of a table, which portal::subnavbar returns. Obviously we shouldn't be letting display-level - #stuff decide where we put our code, but first we'll need to mod the portal package accordingly. + #as a ul instead of a table, which portal::subnavbar returns. Obviously we shouldn't be letting display-level + #stuff decide where we put our code, but first we'll need to mod the portal package accordingly. # DRB: the portal navbar stuff should return multirows which are then formatted by # the appropriate template, rather than include HTML as it does now. - if { [catch {set page_num [ad_get_client_property dotlrn page_num]}] || $page_num eq "" || ![string is integer $page_num] } { - set page_num [ns_queryget page_num] - #Strip out extra anchors and other crud. - #page_num will be empty_string for special pages like - #My Space and Control Panel - regsub -all {[^0-9]} $page_num {} page_num - } - - + if { [catch {set page_num [ad_get_client_property dotlrn page_num]}] || $page_num eq "" || ![string is integer $page_num] } { + set page_num [ns_queryget page_num] + #Strip out extra anchors and other crud. + #page_num will be empty_string for special pages like + #My Space and Control Panel + regsub -all {[^0-9]} $page_num {} page_num + } + + set subnavbar "" - db_foreach list_page_nums_select {} { - if {[string equal $page_num $sort_key]} { - append subnavbar "\n$pretty_name " - } else { - append subnavbar "\n$pretty_name " - } - } + db_foreach list_page_nums_select {} { + if {[string equal $page_num $sort_key]} { + append subnavbar "\n$pretty_name " + } else { + append subnavbar "\n$pretty_name " + } + } - if { $community_id ne "" && $admin_p } { - if {[string match "*/one-community-admin*" [ad_conn url]]} { - append subnavbar "\n[_ theme-zen.admin]" - } else { - append subnavbar "\n[_ theme-zen.admin]" - } - } + if { $community_id ne "" && $admin_p } { + if {[string match "*/one-community-admin*" [ad_conn url]]} { + append subnavbar "\n[_ theme-zen.admin]" + } else { + append subnavbar "\n[_ theme-zen.admin]" + } + } if { $subnavbar eq "" } { return "" Index: openacs-4/packages/theme-zen/www/admin/upgrade.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/admin/upgrade.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/theme-zen/www/admin/upgrade.tcl 15 May 2007 20:14:56 -0000 1.2 +++ openacs-4/packages/theme-zen/www/admin/upgrade.tcl 7 Oct 2007 22:37:05 -0000 1.3 @@ -41,6 +41,16 @@ -parameter DefaultMaster_p \ -value "/packages/theme-zen/lib/lrn-master" + parameter::set_default \ + -package_key dotlrn \ + -parameter non_member_layout_name \ + -value "#theme-zen.Zen_2_column#" + + parameter::set_default \ + -package_key dotlrn \ + -parameter admin_layout_name \ + -value "#theme-zen.Zen_2_column#" + # Poached from dotlrn's package instantiate callback. set site_template_id [db_string select_st_id {}] Index: openacs-4/packages/user-profile/user-profile.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/user-profile/user-profile.info,v diff -u -r1.11 -r1.12 --- openacs-4/packages/user-profile/user-profile.info 15 May 2007 20:15:01 -0000 1.11 +++ openacs-4/packages/user-profile/user-profile.info 7 Oct 2007 22:37:05 -0000 1.12 @@ -7,13 +7,13 @@ f t - + OpenACS - 2007-04-22 + 2007-09-08 OpenACS - - + + Index: openacs-4/packages/weblogger-portlet/weblogger-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/weblogger-portlet.info,v diff -u -r1.8 -r1.9 --- openacs-4/packages/weblogger-portlet/weblogger-portlet.info 15 May 2007 20:15:01 -0000 1.8 +++ openacs-4/packages/weblogger-portlet/weblogger-portlet.info 7 Oct 2007 22:37:05 -0000 1.9 @@ -8,14 +8,14 @@ t weblogger-portlet - + Simon Carstensen - 2007-04-22 + 2007-09-08 Collaboraid - - - + + +
#forums.lt_Email_a_copy_of_the_f#