Index: openacs.org-dev/www/templates/general-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/general-master.adp,v diff -u -r1.1 -r1.2 --- openacs.org-dev/www/templates/general-master.adp 8 Aug 2002 16:37:25 -0000 1.1 +++ openacs.org-dev/www/templates/general-master.adp 8 Aug 2002 16:58:21 -0000 1.2 @@ -36,5 +36,16 @@ + + + + +@etp_link@ + + + + + + \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/companies.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/companies.tcl,v diff -u -r1.1 -r1.2 --- openacs.org-dev/www/templates/widgets/companies.tcl 8 Aug 2002 16:40:52 -0000 1.1 +++ openacs.org-dev/www/templates/widgets/companies.tcl 8 Aug 2002 16:49:14 -0000 1.2 @@ -5,5 +5,5 @@ etp::get_page_attributes etp::get_content_items -#etp::get_content_items -package_id 3906 -result_name companies -limit $companies_limit -etp::get_content_items -package_id 3188 -result_name companies -limit $companies_limit +etp::get_content_items -package_id 3906 -result_name companies -limit $companies_limit +#etp::get_content_items -package_id 3188 -result_name companies -limit $companies_limit Index: openacs.org-dev/www/templates/widgets/features.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/features.tcl,v diff -u -r1.1 -r1.2 --- openacs.org-dev/www/templates/widgets/features.tcl 8 Aug 2002 16:40:52 -0000 1.1 +++ openacs.org-dev/www/templates/widgets/features.tcl 8 Aug 2002 16:49:14 -0000 1.2 @@ -14,7 +14,7 @@ set feature_limit [expr $n_feature_items + 1] -#etp::get_content_items -package_id 4053 -limit $feature_limit \ +etp::get_content_items -package_id 4053 -limit $feature_limit \ -result_name feature_items -etp::get_content_items -package_id 3138 -limit $feature_limit \ +#etp::get_content_items -package_id 3138 -limit $feature_limit \ -result_name feature_items \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/forums.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/forums.tcl,v diff -u -r1.1 -r1.2 --- openacs.org-dev/www/templates/widgets/forums.tcl 8 Aug 2002 16:40:52 -0000 1.1 +++ openacs.org-dev/www/templates/widgets/forums.tcl 8 Aug 2002 16:49:14 -0000 1.2 @@ -7,7 +7,7 @@ where acs_permission__permission_p(forum_id,:user_id,'forum_read') = 't' and enabled_p = 't' --- and package_id = 3061 - and package_id = 3183 + and package_id = 3061 +-- and package_id = 3183 order by upper(name) } \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/jobs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/jobs.tcl,v diff -u -r1.1 -r1.2 --- openacs.org-dev/www/templates/widgets/jobs.tcl 8 Aug 2002 16:40:52 -0000 1.1 +++ openacs.org-dev/www/templates/widgets/jobs.tcl 8 Aug 2002 16:49:14 -0000 1.2 @@ -5,5 +5,5 @@ etp::get_page_attributes etp::get_content_items -#etp::get_content_items -package_id 3889 -result_name jobs -limit $jobs_limit -etp::get_content_items -package_id 3197 -result_name jobs -limit $jobs_limit +etp::get_content_items -package_id 3889 -result_name jobs -limit $jobs_limit +#etp::get_content_items -package_id 3197 -result_name jobs -limit $jobs_limit Index: openacs.org-dev/www/templates/widgets/news.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/news.tcl,v diff -u -r1.1 -r1.2 --- openacs.org-dev/www/templates/widgets/news.tcl 8 Aug 2002 16:40:52 -0000 1.1 +++ openacs.org-dev/www/templates/widgets/news.tcl 8 Aug 2002 16:49:14 -0000 1.2 @@ -19,8 +19,8 @@ publish_title, pretty_publish_date from news_items_approved ---where package_id = 43787 -where package_id = 3147 +where package_id = 43787 +--where package_id = 3147 and publish_date < current_timestamp and (archive_date is null or archive_date > current_timestamp) order by publish_date desc, item_id desc Index: openacs.org-dev/www/templates/widgets/postings.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/postings.tcl,v diff -u -r1.1 -r1.2 --- openacs.org-dev/www/templates/widgets/postings.tcl 8 Aug 2002 16:40:52 -0000 1.1 +++ openacs.org-dev/www/templates/widgets/postings.tcl 8 Aug 2002 16:49:14 -0000 1.2 @@ -30,7 +30,7 @@ where fm.forum_id = ff.forum_id and fm.parent_id is null ---and ff.package_id = 3061 -and ff.package_id = 3928 +and ff.package_id = 3061 +--and ff.package_id = 3928 order by forum_name " \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/sites.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/sites.tcl,v diff -u -r1.1 -r1.2 --- openacs.org-dev/www/templates/widgets/sites.tcl 8 Aug 2002 16:40:52 -0000 1.1 +++ openacs.org-dev/www/templates/widgets/sites.tcl 8 Aug 2002 16:49:14 -0000 1.2 @@ -6,5 +6,5 @@ etp::get_page_attributes etp::get_content_items -#etp::get_content_items -package_id 3894 -result_name sites -limit $sites_limit -etp::get_content_items -package_id 3173 -result_name sites -limit $sites_limit +etp::get_content_items -package_id 3894 -result_name sites -limit $sites_limit +#etp::get_content_items -package_id 3173 -result_name sites -limit $sites_limit Index: openacs.org-dev/www/templates/widgets/statistics.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/statistics.tcl,v diff -u -r1.1 -r1.2 --- openacs.org-dev/www/templates/widgets/statistics.tcl 8 Aug 2002 16:40:52 -0000 1.1 +++ openacs.org-dev/www/templates/widgets/statistics.tcl 8 Aug 2002 16:49:14 -0000 1.2 @@ -1,2 +1,2 @@ -set n_users [util_memoize {db_string select_n_users "select count(user_id) from users" -default "unknown"} 120] +set n_users [util_memoize {db_string select_n_users "select count(user_id) from users" -default "unknown"} 300] set n_downloads NNNN \ No newline at end of file