--- loncom/interface/coursecatalog.pm 2008/07/15 19:43:15 1.40 +++ loncom/interface/coursecatalog.pm 2010/02/12 00:21:30 1.53.4.4 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for displaying the course catalog interface # -# $Id: coursecatalog.pm,v 1.40 2008/07/15 19:43:15 raeburn Exp $ +# $Id: coursecatalog.pm,v 1.53.4.4 2010/02/12 00:21:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -90,7 +90,7 @@ sub handler { if ($env{'form.coursenum'} ne '' && &user_is_known()) { &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems); } else { - my ($catlinks,$has_subcats) = &category_breadcrumbs($codedom,@cats); + my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats); my $catjs = <<"ENDSCRIPT"; function setCatDepth(depth) { @@ -113,7 +113,7 @@ function setCourseId(caller) { } ENDSCRIPT - $catjs .= &syllabus_javascript(); + $catjs .= &courselink_javascript(); my $numtitles; if ($env{'form.currcat_0'} eq 'instcode::0') { $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc, @@ -123,25 +123,45 @@ ENDSCRIPT } } else { my (%add_entries); + my ($currdepth,$deeper) = &get_depth_values(); + if ($selitem) { + my $alert = &mt('Choose a subcategory to display'); + if (!$deeper) { + $alert = &mt('Choose a category to display'); + } + $catjs .= <'; &cat_header($r,$codedom,$catjs,\%add_entries,$catlinks); if ($env{'form.currcat_0'} ne '') { $r->print('
'. &additional_filters($codedom,$has_subcats)."\n"); - my ($currdepth,$deeper) = &get_depth_values(); $r->print(''."\n"); 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)); @@ -158,9 +178,9 @@ sub course_details { my %add_entries = (topmargin => "0", marginheight => "0",); my $js = ''."\n"; + &courselink_javascript().''."\n"; my $start_page = - &Apache::loncommon::start_page('Course Catalog',$js, + &Apache::loncommon::start_page('Course/Community Catalog',$js, { 'add_entries' => \%add_entries, 'no_inline_link' => 1,}); @@ -168,24 +188,25 @@ sub course_details { if ($env{'form.numtitles'} > 0) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/coursecatalog", - text=>"Select courses"}); + text=>"Course/Community Catalog"}); } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:document.$formname.submit()", text=>"Course listing"}, {text=>"Course details"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Details')); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog')); $r->print('
'.&mt('Detailed course information:').'

'. &print_course_listing($codedom,undef,$trails,$allitems). '

'); $r->print('
'. ''. &mt('Back to course listing').''. - &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter','showdetails']).'
'); + &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter', + 'showdetails','courseid']).''); return; } -sub syllabus_javascript { +sub courselink_javascript { return <<"END"; function ToSyllabus(cdom,cnum) { @@ -195,13 +216,21 @@ function ToSyllabus(cdom,cnum) { if (cnum == '' || cnum == null) { return; } - document.syllabuslaunch.action = "/public/"+cdom+"/"+cnum+"/syllabus"; - document.syllabuslaunch.submit(); + document.linklaunch.action = "/public/"+cdom+"/"+cnum+"/syllabus"; + document.linklaunch.submit(); } -END +function ToSelfenroll(courseid) { + if (courseid == '') { + return; + } + document.linklaunch.action = "/adm/selfenroll"; + document.linklaunch.courseid.value = courseid; + document.linklaunch.submit(); } +END +} sub instcode_course_selector { my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs) = @_; @@ -210,79 +239,17 @@ sub instcode_course_selector { my @codetitles = (); my %cat_titles = (); my %cat_order = (); - my %idlist = (); - my %idnums = (); - my %idlist_titles = (); - my %by_year; - my %by_sem; - my %by_dept; my %cat_items; my $caller = 'global'; my $format_reply; - my $totcodes = 0; - my $jscript = ''; - my ($numtitles,$lasttitle); my %add_entries = (topmargin => "0", marginheight => "0",); - my $js; - $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom); - if ($totcodes > 0) { - $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order); - if ($format_reply eq 'ok') { - my $numtypes = @codetitles; - &Apache::courseclassifier::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles); - my ($scripttext,$longtitles) = &Apache::courseclassifier::javascript_definitions(\@codetitles,\%idlist,\%idlist_titles,\%idnums,\%cat_titles); - my $longtitles_str = join('","',@{$longtitles}); - my $allidlist = $idlist{$codetitles[0]}; - $numtitles = @codetitles; - $lasttitle = $numtitles; - if ($numtitles > 4) { - $lasttitle = 4; - } - if ($numtitles == 0) { - if (!defined($env{'form.state'})) { - $env{'form.state'} = 'listing'; - } - } else { - my @data = ('top'); - for (my $k=0; $k<$lasttitle; $k++) { - my $cat = $codetitles[$k]; - my $level = 1; - $level = &recurse_options($codetitles[$k],$idlist{$codetitles[$k]},$level,$cat,\%cat_items,\@data,\%by_year,\%by_sem,\%by_dept); - } - $scripttext .= &build_javascript(\%by_year,\%by_sem,\%by_dept,\%cat_order,\@codetitles); - $jscript .= &javascript_select_filler($formname,$scripttext,\@codetitles,$longtitles_str,$allidlist); - if ($env{'form.state'} eq 'listing') { - $jscript .= ' -function setElements() { -'; - for (my $i=0; $i<@codetitles-1; $i++) { - if ($env{'form.'.$codetitles[$i]} != -1) { - $jscript .= ' - for (var j=0; j'; + if ($totcodes) { if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) { $add_entries{'onLoad'} = 'setElements()'; } @@ -294,43 +261,9 @@ function setElements() { ''. &additional_filters($codedom)); if ($numtitles > 0) { - $r->print(''.&mt('Choose which course(s) to list.').'
'); - $r->print(''); - for (my $k=0; $k<$lasttitle-1; $k++) { - my (@items,@unsorted); - if (ref($cat_items{$codetitles[$k]}) eq 'ARRAY') { - @unsorted = @{$cat_items{$codetitles[$k]}}; - } - &Apache::courseclassifier::sort_cats($k,\%cat_order,\@codetitles,\@unsorted,\@items); - my @longitems; - if (defined($cat_titles{$codetitles[$k]})) { - foreach my $item (@items) { - push(@longitems,$cat_titles{$codetitles[$k]}{$item}); - } - } else { - @longitems = @items; - } - $r->print(''); - } - $r->print('
'.$codetitles[$k].'
'."\n". - '		'.$codetitles[$lasttitle-1].'
'."\n". - ''."\n". - '
'."\n"); - if ($numtitles > 4) { - $r->print('

'.$codetitles[$numtitles-1].'
'."\n". - '
'."\n"); - } - $r->print('
'); + $r->print(''.&mt('Choose which course(s) to list.').'
'. + &Apache::courseclassifier::build_instcode_selectors($numtitles, + $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order)); } $r->print(''."\n". ''."\n". @@ -341,6 +274,7 @@ function setElements() { '

'); } else { + $js = ''; &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles); my $cat_maxdepth = $env{'form.catalog_maxdepth'}; $r->print('
'. @@ -355,7 +289,7 @@ function setElements() { sub cat_header { my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_; my $start_page = - &Apache::loncommon::start_page('Course Catalog',$js, + &Apache::loncommon::start_page('Course/Community Catalog',$js, { 'add_entries' => $add_entries, 'no_inline_link' => 1,}); @@ -364,83 +298,104 @@ sub cat_header { if ($numtitles > 0) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/coursecatalog", - text=>"Select courses"}, + text=>"Course/Community Catalog"}, {text=>"Course listing"}); } else { &Apache::lonhtmlcommon::add_breadcrumb ({text=>"Course listing"}); } - $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Listing')); } else { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/coursecatalog", - text=>"Select courses"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs('Select courses')); + text=>"Course/Community Catalog"}); + } + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog')); + my $onchange; + unless (($env{'browser.interface'} eq 'textual') || ($env{'form.interface'} eq 'textual')) { + $onchange = 'this.form.submit()'; } $r->print(''. '
'.&mt('Domain:').''. - &Apache::loncommon::select_dom_form($codedom,'showdom','',1). - ' 
'. - '
'. + &Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange)); + if (!$onchange) { + $r->print(' '); + } + $r->print('
'. + '
'. ''.$catlinks.'
'); return; } sub category_breadcrumbs { my ($dom,@cats) = @_; + my $crumbsymbol = ' ▶ '; my ($currdepth,$deeper) = &get_depth_values(); - my $currcat_str = ''; - my $catlinks = ''.&mt('Catalog:').''; + my $currcat_str = + ''. + ''; + my $catlinks = ''; - return ($catlinks,$has_subcats); + return ($catlinks,$has_subcats,$selitem); +} + +sub main_category_selector { + my (@cats) = @_; + my $maincatlinks = ''."\n"; + } + return $maincatlinks; } sub get_depth_values { @@ -517,10 +507,15 @@ sub additional_filters { if ($env{'form.showselfenroll'}) { $show_selfenroll_status = 'checked="checked" '; } + my $selfenroll_text; + if ($env{'form.currcat_0'} eq 'communities::0') { + $selfenroll_text = &mt('Only show communities which allow self-enrollment'); + } else { + $selfenroll_text = &mt('Only show courses which allow self-enrollment'); + } $output .= ''; if (&user_is_dc($codedom)) { my $showdetails_status; @@ -532,14 +527,20 @@ sub additional_filters { $showhidden_status = 'checked="checked" '; } my $dc_title = &Apache::lonnet::plaintext('dc'); + my ($details_text,$hidden_text); + if ($env{'form.currcat_0'} eq 'communities::0') { + $details_text = &mt('Show full details for each community ([_1] only)',$dc_title); + $hidden_text = &mt('Include communities set to be hidden from catalog ([_1] only)',$dc_title); + } else { + $details_text = &mt('Show full details for each course ([_1] only)',$dc_title); + $hidden_text = &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title); + } $output .= ''; } $output .= '
'.&mt('Catalog:').''; - } - if ($deeper == 0) { - $catlinks .= ''; + } } } else { + $catlinks .= &mt('Official courses (with institutional codes)'); + $env{'form.currcat_0'} = 'instcode::0'; + $currcat_str .= ''; + } + if ($deeper) { + for (my $i=1; $i<=$deeper; $i++) { + my $shallower = $i-1; + next if ($shallower == 0); + my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower}); + if ($cat ne '') { + $catlinks .= '
'; my $has_subcats; - for (my $i=0; $i<$deeper; $i++) { - $currcat_str .= ''; - my ($cattitle,$shallower); - if ($i == 0) { - $cattitle = &mt('Main Categories'); - } else { - $shallower = $i-1; - my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower}); - $cattitle = $cat; - } - $catlinks .= ''.$cattitle.'->'.&mt('Main Categories').': '; - if (ref($cats[0]) eq 'ARRAY') { - if ((@{$cats[0]} == 1) && ($cats[0][0] eq 'instcode')) { - $catlinks .= &mt('Official courses (with institutional codes)'). - ''; + my $selitem; + if (ref($cats[0]) eq 'ARRAY') { + if (@{$cats[0]} == 0) { + $catlinks .= &mt('No categories defined in this domain'); + } elsif (@{$cats[0]} == 1) { + if ($cats[0][0] eq 'instcode') { + $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 { - $has_subcats = 1; - $catlinks .= ''."\n". - ' '; + my $name = $cats[0][0]; + my $item = &escape($name).'::0'; + $catlinks .= $name; + $env{'form.currcat_0'} = $item; } + $currcat_str .= ''; } else { - $catlinks .= &mt('Official courses (with institutional codes)'). - ''; - $env{'form.currcat_0'} = 'instcode::0'; + $catlinks .= &main_category_selector(@cats); + if (($env{'form.currcat_0'} ne '') && + ($env{'form.currcat_0'} ne 'instcode::0')) { + $catlinks .= $crumbsymbol; + } else { + $catlinks .= ''. + ''; + } + unless ($i == $deeper) { + $catlinks .= $crumbsymbol; + } + } my ($cat,$container,$depth); if ($env{'form.currcat_'.$currdepth} eq '') { my $shallower = $currdepth - 1; @@ -448,29 +403,64 @@ sub category_breadcrumbs { } else { ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$currdepth}); } - my $deeper = $depth +1; - my $currcat = $cat; - if ($cat eq 'instcode') { - $currcat = &mt('Official courses (with institutional codes)'); - } - $catlinks .= ''.$currcat; - if (ref($cats[$deeper]{$cat}) eq 'ARRAY') { + my $deeperlevel = $depth +1; + if (ref($cats[$deeperlevel]{$cat}) eq 'ARRAY') { $has_subcats = 1; - my $selstr; - $catlinks .= ': '; + if (@{$cats[$deeperlevel]{$cat}}) { + $catlinks .= ''; + } + for (my $k=0; $k<@{$cats[$deeperlevel]{$cat}}; $k++) { + my $name = $cats[$deeperlevel]{$cat}[$k]; + my $item = &escape($name).':'.&escape($cat).':'.$deeperlevel; $catlinks .= ''."\n"; } - $catlinks .= ''."\n". - ' '; + $catlinks .= ''."\n"; + } elsif ($cat ne 'instcode') { + $catlinks .= ' '.&mt('(No subcategories)'); } + } else { + $selitem = 'currcat_0'; } $catlinks .= $currcat_str.'
'. '
'."\n". ''."\n".'
'. ''."\n".'

'; @@ -559,113 +560,9 @@ sub user_is_dc { return; } -sub recurse_options { - my ($currkey,$currlist,$level,$cat,$cat_options,$data,$by_year,$by_sem,$by_dept) = @_; - if (ref($currlist) eq 'HASH') { - $level ++; - foreach my $key (sort(keys(%{$currlist}))) { - $$data[$level-1]= $key; - &recurse_options($key,$currlist->{$key},$level,$cat,$cat_options,$data,$by_year,$by_sem,$by_dept); - } - } else { - $level --; - my @contents = split(/","/,$currlist); - foreach my $item (@contents) { - if (!grep(/^\Q$item\E$/,@{$cat_options->{$cat}})) { - push(@{$cat_options->{$cat}},$item); - } - if ($level == 3) { - if (!grep/^\Q$item\E$/,@{$by_year->{$data->[1]}->{$currkey}}) { - push(@{$by_year->{$data->[1]}->{$currkey}},$item); - } - if (!grep/^\Q$item\E$/,@{$by_sem->{$data->[2]}->{$currkey}}) { - push(@{$by_sem->{$data->[2]}->{$currkey}},$item); - } - if (!grep/^\Q$item\E$/,@{$by_dept->{$currkey}}) { - push(@{$by_dept->{$currkey}},$item); - } - - } - } - } - return $level; -} - -sub build_javascript { - my ($by_year,$by_sem,$by_dept,$cat_order,$codetitles) = @_; - my @unsorted = keys(%{$by_year}); - my @sorted_yrs; - &Apache::courseclassifier::sort_cats('0',$cat_order,$codetitles,\@unsorted,\@sorted_yrs); - my $output = 'var idcse_by_yr_year = new Array("'.join('","',@sorted_yrs).'");'."\n". - 'var idcse_by_yr_dept = new Array('.scalar(@sorted_yrs).');'."\n". - 'var idcse_by_yr_num = new Array('.scalar(@sorted_yrs).');'."\n"; - for (my $i=0; $i<@sorted_yrs; $i++) { - my $numkeys = keys(%{$by_year->{$sorted_yrs[$i]}}); - $output .= " idcse_by_yr_num[$i] = new Array($numkeys);\n"; - if (ref($by_year->{$sorted_yrs[$i]}) eq 'HASH') { - @unsorted = keys(%{$by_year->{$sorted_yrs[$i]}}); - my @sorted_depts; - &Apache::courseclassifier::sort_cats('2',$cat_order,$codetitles,\@unsorted,\@sorted_depts); - $output .= qq| idcse_by_yr_dept[$i] = new Array ("|.join('","',@sorted_depts).'");'."\n"; - for (my $j=0; $j<@sorted_depts; $j++) { - $output .= qq| idcse_by_yr_num[$i][$j] = new Array ("|; - $output .= join('","',sort(@{$by_year->{$sorted_yrs[$i]}->{$sorted_depts[$j]}})).'");'."\n"; - } - } - } - @unsorted = keys(%{$by_sem}); - my @sorted_sems; - &Apache::courseclassifier::sort_cats('1',$cat_order,$codetitles,\@unsorted,\@sorted_sems); - $output .= 'idcse_by_sem_sems = new Array("'.join('","',@sorted_sems).'");'."\n". - 'idcse_by_sem_dept = new Array('.scalar(@sorted_sems).');'."\n". - 'idcse_by_sem_num = new Array('.scalar(@sorted_sems).');'."\n"; - for (my $i=0; $i<@sorted_sems; $i++) { - my $numkeys = keys(%{$by_sem->{$sorted_sems[$i]}}); - $output .= " idcse_by_sem_num[$i] = new Array($numkeys);\n"; - if (ref($by_sem->{$sorted_sems[$i]}) eq 'HASH') { - @unsorted = keys(%{$by_sem->{$sorted_sems[$i]}}); - my @sorted_depts; - &Apache::courseclassifier::sort_cats('2',$cat_order,$codetitles,\@unsorted,\@sorted_depts); - $output .= qq| idcse_by_sem_dept[$i] = new Array("|.join('","',@sorted_depts).'");'."\n"; - for (my $j=0; $j<@sorted_depts; $j++) { - $output .= qq| idcse_by_sem_num[$i][$j] = new Array ("|.join('","',sort(@{$by_sem->{$sorted_sems[$i]}->{$sorted_depts[$j]}})).'");'."\n"; - } - } - } - @unsorted = keys(%{$by_dept}); - my @sorted_deps; - &Apache::courseclassifier::sort_cats('2',$cat_order,$codetitles,\@unsorted,\@sorted_deps); - $output .= 'idcse_by_dep = new Array('.scalar(@sorted_deps).');'."\n"; - for (my $k=0; $k<@sorted_deps; $k++) { - $output .= qq| idcse_by_dep[$k] = new Array ("|.join('","',sort(@{$by_dept->{$sorted_deps[$k]}})).'");'."\n"; - } - return $output; -} - sub search_official_courselist { my ($domain,$numtitles) = @_; - my $instcode; - if (defined($numtitles) && $numtitles == 0) { - $instcode = '.+'; - } else { - my (%codedefaults,@code_order); - my $defaults_result = - &Apache::lonnet::auto_instcode_defaults($domain,\%codedefaults, - \@code_order); - if ($defaults_result eq 'ok') { - $instcode ='^'; - foreach my $item (@code_order) { - if ($env{'form.'.$item} eq '0' ) { - $instcode .= $codedefaults{$item}; - } else { - $instcode .= $env{'form.'.$item}; - } - } - $instcode .= '$'; - } else { - $instcode = '.'; - } - } + my $instcode = &Apache::courseclassifier::instcode_search_str($domain,$numtitles); my $showhidden; if (&user_is_dc($domain)) { $showhidden = $env{'form.showhidden'}; @@ -704,13 +601,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; @@ -742,7 +644,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))) { @@ -755,9 +661,10 @@ sub print_course_listing { my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$domain); $output .= &construct_data_table($knownuser,\%courses,$details,undef,$now,\%domconfig,$trails,$allitems); - $output .= "\n".'
'. + $output .= "\n".''. ''. - &Apache::lonhtmlcommon::echo_form_input(['catalogfilter']).'
'; + ''. + &Apache::lonhtmlcommon::echo_form_input(['catalogfilter','courseid']).''; return $output; } @@ -799,7 +706,7 @@ sub construct_data_table { $output .= ''.&mt('Default Access Dates for Students').''. ''.&mt('Student Counts').''. - ''.&mt('Auto-enrollment of
registered students').''; + ''.&mt('Auto-enrollment of[_1]registered students','
').''; } else { $output .= ''.&mt('Details').''; } @@ -877,7 +784,7 @@ sub build_courseinfo_hash { } } foreach my $owner (@owners) { - my ($ownername,$ownerdom) = @_; + my ($ownername,$ownerdom); if ($owner =~ /:/) { ($ownername,$ownerdom) = split(/:/,$owner); } else { @@ -946,10 +853,10 @@ sub build_courseinfo_hash { } } if ($startaccess) { - $accessdates .= &mt('From: ').$startaccess.'
'; + $accessdates .= ''.&mt('From:[_1]',' '.$startaccess).'
'; } if ($endaccess) { - $accessdates .= &mt('To: ').$endaccess.'
'; + $accessdates .= ''.&mt('To:[_1]',' '.$endaccess).'
'; } if (($selfenroll_types ne '') && ($selfenroll_end > 0 && $selfenroll_end > $now)) { @@ -970,10 +877,10 @@ sub build_courseinfo_hash { if ($selfenroll_start_access || $selfenroll_end_access) { $accessdates .= '

'.&mt('Self-enrollers:').'
'; if ($selfenroll_start_access) { - $accessdates .= &mt('From: ').$selfenroll_start_access.'
'; + $accessdates .= ''.&mt('From:[_1]',' '.$selfenroll_start_access).'
'; } if ($selfenroll_end_access) { - $accessdates .= &mt('To: ').$selfenroll_end_access.'
'; + $accessdates .= ''.&mt('To:[_1]',' '.$selfenroll_end_access).'
'; } } } @@ -1008,10 +915,10 @@ sub count_students { $student_count{$data->[$idx{'status'}]} ++; } - my $countslist = &mt('[quant,_1,section]',$numsec).':
'; + my $countslist = &mt('[quant,_1,section:,sections:,No sections]',$numsec).'
'; foreach my $status ('Active','Future') { - $countslist .= ''.$status_title{$status}.': '. - $student_count{$status}.'
'; + $countslist .= ''.$status_title{$status}.': '. + $student_count{$status}.'
'; } return $countslist; } @@ -1084,7 +991,7 @@ sub courseinfo_row { if (($info->{'selfenroll_start'} > 0) && ($info->{'selfenroll_start'} > $now)) { $output .= ''.&mt('Starts: [_1]',''.$showstart.'').'
'.&mt('Ends: [_1]',''.$showend.'').''; } else { - $output .= ''.&mt('Enroll in course').''; + $output .= ''.&mt('Enroll in course').''; } $selfenroll = 1; } @@ -1151,156 +1058,17 @@ sub get_valid_classes { } if ($totalitems > 0) { if (@{$validations{'sections'}}) { - $response = &mt('Sections: '). + $response = &mt('Sections:').' '. join(', ',@{$validations{'sections'}}).'
'; } if (@{$validations{'xlists'}}) { - $response .= &mt('Courses: '). + $response .= &mt('Courses:').' '. join(', ',@{$validations{'xlists'}}); } } return $response; } -sub javascript_select_filler { - my ($formname,$scripttext,$codetitles,$longtitles_str,$allidlist) = @_; - my $output = < -1) { - document.$formname.Number.options[0] = new Option('All','0',false,false); - for (var k=0; k -1) { - for (var i=0; i -1) { - for (var i=0; i -1) { - for (var k=0; kStarts: '). - $autostart.'
'.$valid_classes; } + $autoenrolldates = &mt('Not enabled').'
' + .&mt('Starts: [_1]',$autostart) + .'
'.$valid_classes; + } } } else { if ($coursehash->{'internal.autoend'} && $coursehash->{'internal.autoend'} < $now) { - $autoenrolldates = &mt('Not enabled
Ended: ').$autoend; + $autoenrolldates = &mt('Not enabled').'
' + .&mt('Ended: [_1]',$autoend); } else { my $valid_classes = &get_valid_classes($seclist,$xlist_items, $code,$owners,$cdom,$cnum); if ($valid_classes ne '') { - $autoenrolldates = &mt('Currently enabled
'). + $autoenrolldates = &mt('Currently enabled').'
'. $valid_classes; } }