Index: openacs-4/packages/calendar-portlet/sql/oracle/calendar-portlet-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/sql/oracle/calendar-portlet-create.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/calendar-portlet/sql/oracle/calendar-portlet-create.sql 26 Oct 2001 16:18:27 -0000 1.2 +++ openacs-4/packages/calendar-portlet/sql/oracle/calendar-portlet-create.sql 9 Nov 2001 19:37:11 -0000 1.3 @@ -38,6 +38,17 @@ value => '' ); + -- shaded_p + portal_datasource.set_def_param ( + datasource_id => ds_id, + config_required_p => 't', + configured_p => 't', + key => 'shaded_p', + value => 'f' +); + + + -- XXX community calendars -- Index: openacs-4/packages/calendar-portlet/tcl/calendar-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/tcl/calendar-portlet-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/calendar-portlet/tcl/calendar-portlet-procs.tcl 1 Nov 2001 23:11:51 -0000 1.7 +++ openacs-4/packages/calendar-portlet/tcl/calendar-portlet-procs.tcl 9 Nov 2001 19:37:03 -0000 1.8 @@ -70,10 +70,6 @@ set bgcolor_html "border=1 color=blue" set view day - - # AKS: code from calendar/www/cal-dayview.tcl - # --- - set mlist "" set set_id [ns_set new day_items] @@ -109,73 +105,77 @@
" } + # shaded_p support version 1 + + if { $config(shaded_p) == "f" } { - set row_html " - - " - - while {$i < $num_hour_rows} { - set filled_cell_count 0 - - # making hours before 10 looks prettier - if {$i < 10} { set cal_hour "0$i" } else { set cal_hour "$i" } + set row_html " +
TimeTitle
+ + + \n" - # am or pm determination logic - if {$i < 12} { - if {$i == 0} { - set time "12:00 am" + while {$i < $num_hour_rows} { + set filled_cell_count 0 + + # making hours before 10 looks prettier + if {$i < 10} { set cal_hour "0$i" } else { set cal_hour "$i" } + + # am or pm determination logic + if {$i < 12} { + if {$i == 0} { + set time "12:00 am" + } else { + set time "$cal_hour:00 am" + } } else { - set time "$cal_hour:00 am" + if {$i == 12} { + set time "12:00 pm" + } else { + set fm_hour [expr $i - 12] + if {$fm_hour < 10} { + set fm_hour "0$fm_hour" + } + set time "$fm_hour:00 pm" + } } - } else { - if {$i == 12} { - set time "12:00 pm" - } else { - set fm_hour [expr $i - 12] - if {$fm_hour < 10} { - set fm_hour "0$fm_hour" - } - set time "$fm_hour:00 pm" - } - } + + set cal_item_index [ns_set find $set_id $cal_hour] + + append row_html " + + + + \n" - set cal_item_index [ns_set find $set_id $cal_hour] - - append row_html " - - - - " - - incr i - } + incr i + } - append row_html "
TimeTitle
+ $time + " + + if {$cal_item_index == -1} { + append row_html " " + } + + while {$cal_item_index > -1} { + append row_html "[ns_set value $set_id $cal_item_index]" + ns_set delete $set_id $cal_item_index + set cal_item_index [ns_set find $set_id $cal_hour] + } + + append row_html "
- $time - " - - if {$cal_item_index == -1} { - append row_html " " - } - - while {$cal_item_index > -1} { - append row_html "[ns_set value $set_id $cal_item_index]" - ns_set delete $set_id $cal_item_index - set cal_item_index [ns_set find $set_id $cal_hour] - } - - append row_html "
" + append row_html "" - - # --- - # AKS: end lots of code from calendar/www/cal-dayview.tcl + } else { + # shaded_p + set row_html "" + } set template " - $row_html -
" + " - set code [template::adp_compile -string $template] set output [template::adp_eval code] Index: openacs-4/packages/dotlrn-portlet/sql/oracle/dotlrn-portlet-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/sql/oracle/dotlrn-portlet-create.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn-portlet/sql/oracle/dotlrn-portlet-create.sql 8 Oct 2001 23:44:22 -0000 1.3 +++ openacs-4/packages/dotlrn-portlet/sql/oracle/dotlrn-portlet-create.sql 9 Nov 2001 19:41:38 -0000 1.4 @@ -35,6 +35,15 @@ value => '' ); + -- shaded_p + portal_datasource.set_def_param ( + datasource_id => ds_id, + config_required_p => 't', + configured_p => 't', + key => 'shaded_p', + value => 'f' +); + end; / show errors Index: openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl 1 Nov 2001 23:12:05 -0000 1.8 +++ openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl 9 Nov 2001 19:42:44 -0000 1.9 @@ -65,15 +65,20 @@ set query "select pretty_name, description from dotlrn_communities where community_id = $config(community_id)" - - # for now query the DM directly - if { [db_0or1row select_comminity_info $query] } { - set data "$pretty_name - descriptions not available yet" + + if { $config(shaded_p) == "f" } { + + # for now query the DM directly + if { [db_0or1row select_comminity_info $query] } { + set data "$pretty_name - descriptions not available yet" + } else { + set data "Community info not found. Contact webmaster, please!" + } + + append data "

List of Students" } else { - set data "Community info not found. Contact webmaster, please!" + set data "" } - - append data "

List of Students" return $data Index: openacs-4/packages/faq-portlet/sql/oracle/faq-portlet-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/sql/oracle/faq-portlet-create.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/faq-portlet/sql/oracle/faq-portlet-create.sql 9 Oct 2001 04:04:00 -0000 1.2 +++ openacs-4/packages/faq-portlet/sql/oracle/faq-portlet-create.sql 9 Nov 2001 19:44:51 -0000 1.3 @@ -35,6 +35,15 @@ value => '' ); + -- shaded_p + portal_datasource.set_def_param ( + datasource_id => ds_id, + config_required_p => 't', + configured_p => 't', + key => 'shaded_p', + value => 'f' +); + end; / show errors Index: openacs-4/packages/faq-portlet/tcl/faq-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/tcl/faq-portlet-procs.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/faq-portlet/tcl/faq-portlet-procs.tcl 1 Nov 2001 23:12:20 -0000 1.9 +++ openacs-4/packages/faq-portlet/tcl/faq-portlet-procs.tcl 9 Nov 2001 19:46:21 -0000 1.10 @@ -91,6 +91,11 @@ set template "No faqs available

more..." } + if { $config(shaded_p) == "t" } { + set data "" + set template "" + } + set code [template::adp_compile -string $template] set output [template::adp_eval code]