--- loncom/interface/coursecatalog.pm 2009/10/23 16:14:43 1.56
+++ loncom/interface/coursecatalog.pm 2009/11/23 21:45:18 1.57
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for displaying the course catalog interface
#
-# $Id: coursecatalog.pm,v 1.56 2009/10/23 16:14:43 bisitz Exp $
+# $Id: coursecatalog.pm,v 1.57 2009/11/23 21:45:18 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -149,13 +149,19 @@ ENDJS
for (my $i=0; $i<$deeper; $i++) {
$r->print(''."\n");
}
+ my $display_button;
+ if ($env{'form.currcat_0'} eq 'communities::0') {
+ $display_button = &mt('Display communities');
+ } else {
+ $display_button = &mt('Display courses');
+ }
$r->print(''."\n".
''."\n".
''."\n".
''.
'
');
+ $display_button.'" />
');
}
if ($env{'form.state'} eq 'listing') {
$r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats));
@@ -325,7 +331,9 @@ sub category_breadcrumbs {
my ($dom,@cats) = @_;
my $crumbsymbol = ' ▶ ';
my ($currdepth,$deeper) = &get_depth_values();
- my $currcat_str = '';
+ my $currcat_str =
+ ''.
+ '';
my $catlinks = '
'.&mt('Catalog:').' | ';
my $has_subcats;
my $selitem;
@@ -355,6 +363,10 @@ sub category_breadcrumbs {
$catlinks .= &mt('Official courses (with institutional codes)').
'';
$env{'form.currcat_0'} = 'instcode::0';
+ } elsif ($cats[0][0] eq 'communities') {
+ $catlinks .= &mt('Communities').
+ '';
+ $env{'form.currcat_0'} = 'communities::0';
} else {
my $name = $cats[0][0];
my $item = &escape($name).'::0';
@@ -377,6 +389,8 @@ sub category_breadcrumbs {
$catlinks .= '
';
@@ -558,13 +585,18 @@ sub search_courselist {
} else {
$filterstr = $filter;
}
- my $showhidden;
+ my ($showhidden,$typefilter);
if (&user_is_dc($domain)) {
$showhidden = $env{'form.showhidden'};
}
+ if ($env{'form.currcat_0'} eq 'communities::0') {
+ $typefilter = 'Community';
+ } else {
+ $typefilter = '.';
+ }
%courses =
&Apache::lonnet::courseiddump($domain,'.',1,'.','.','.',undef,undef,
- '.',1,$env{'form.showselfenroll'},
+ $typefilter,1,$env{'form.showselfenroll'},
$filterstr,$showhidden,'coursecatalog');
}
return %courses;
@@ -596,7 +628,11 @@ sub print_course_listing {
%courses = &search_courselist($domain,$subcats);
}
if (keys(%courses) == 0) {
- $output = &mt('No courses match the criteria you selected.');
+ if ($env{'form.currcat_0'} eq 'communities::0') {
+ $output = &mt('No communities match the criteria you selected.');
+ } else {
+ $output = &mt('No courses match the criteria you selected.');
+ }
return $output;
}
if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain))) {
|