loncom/interface/coursecatalog.pm - diff

Return to coursecatalog.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/coursecatalog.pm between versions 1.58.4.2 and 1.58.4.8.2.1

version 1.58.4.2, 2010/08/14 02:00:27	version 1.58.4.8.2.1, 2012/02/14 00:29:50
Line 89 sub handler {	Line 89 sub handler {
\%idx,\@jsarray,$subcats);	\%idx,\@jsarray,$subcats);
my ($numtitles,@codetitles);	my ($numtitles,@codetitles);
if ($env{'form.coursenum'} ne '' && &user_is_known()) {	if ($env{'form.coursenum'} ne '' && &user_is_known()) {
if ($env{'form.currcat_0'} eq 'instcode::0') {
$numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
undef,undef,\@codetitles);
}
&course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles);	&course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles);
} else {	} else {
my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats);	my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats);
Line 288 sub instcode_course_selector {	Line 284 sub instcode_course_selector {
$r->print('<input type="hidden" name="coursenum" value="" />'."\n".	$r->print('<input type="hidden" name="coursenum" value="" />'."\n".
'<input type="hidden" name="sortby" value="" />'."\n".	'<input type="hidden" name="sortby" value="" />'."\n".
'<input type="hidden" name="state" value="listing" />'."\n".	'<input type="hidden" name="state" value="listing" />'."\n".
'<input type="hidden" name="form.currcat_0" value="instcode::0" />'."\n".
'<input type="submit" name="catalogfilter" value="'.	'<input type="submit" name="catalogfilter" value="'.
&mt('Display courses').'" />'.	&mt('Display courses').'" />'.
'<input type="hidden" name="numtitles" value="'.$numtitles.	'<input type="hidden" name="numtitles" value="'.$numtitles.
Line 338 sub cat_header {	Line 333 sub cat_header {
unless ($env{'form.interface'} eq 'textual') {	unless ($env{'form.interface'} eq 'textual') {
$onchange = 'this.form.submit()';	$onchange = 'this.form.submit()';
}	}
$r->print('<form name="coursecatdom" method="post" action="/adm/coursecatalog">'.	unless ($codedom eq 'relate') {
'<table border="0"><tr><td><b>'.&mt('Domain:').'</b></td><td>'.	$r->print('<form name="coursecatdom" method="post" action="/adm/coursecatalog">'.
&Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange));	'<table border="0"><tr><td><b>'.&mt('Domain:').'</b></td><td>'.
if (!$onchange) {	&Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange));
$r->print(' <input type="submit" name="godom" value="'.&mt('Change').'" />');	if (!$onchange) {
	$r->print(' <input type="submit" name="godom" value="'.&mt('Change').'" />');
	}
	$r->print('</td></tr></table></form>');
}	}
$r->print('</td></tr></table></form>'.	$r->print('<form name="coursecats" method="post" action="/adm/coursecatalog"'.
'<form name="coursecats" method="post" action="/adm/coursecatalog"'.
' onsubmit="return check_selected();">'.	' onsubmit="return check_selected();">'.
'<table border="0"><tr>'.$catlinks.'</tr></table></form>');	'<table border="0"><tr>'.$catlinks.'</tr></table></form>');
return;	return;
Line 405 sub category_breadcrumbs {	Line 402 sub category_breadcrumbs {
$catlinks .= '<option value="">'.&mt('De-select').'</option>';	$catlinks .= '<option value="">'.&mt('De-select').'</option>';
for (my $j=0; $j<@{$cats[$shallower]{$container}}; $j++) {	for (my $j=0; $j<@{$cats[$shallower]{$container}}; $j++) {
my $name = $cats[$shallower]{$container}[$j];	my $name = $cats[$shallower]{$container}[$j];
my $item = &escape($name).':'.$container.':'.$shallower;	my $item = &escape($name).':'.&escape($container).':'.$shallower;
my $selected = '';	my $selected = '';
if ($item eq $env{'form.currcat_'.$shallower}) {	if ($item eq $env{'form.currcat_'.$shallower}) {
$selected = ' selected="selected"';	$selected = ' selected="selected"';
Line 809 sub build_courseinfo_hash {	Line 806 sub build_courseinfo_hash {
$selfenroll_end = $courses->{$course}{'selfenroll_end_date'};	$selfenroll_end = $courses->{$course}{'selfenroll_end_date'};
$categories = $courses->{$course}{'categories'};	$categories = $courses->{$course}{'categories'};
push(@owners,$singleowner);	push(@owners,$singleowner);
if (ref($courses->{$course}{'co-owners'}) eq 'ARRAY') {	if ($courses->{$course}{'co-owners'} ne '') {
foreach my $item (@{$courses->{$course}{'co-owners'}}) {	foreach my $item (split(/,/,$courses->{$course}{'co-owners'})) {
push(@owners,$item);	push(@owners,$item);
}	}
}	}
Line 1027 sub courseinfo_row {	Line 1024 sub courseinfo_row {
if (($info->{'selfenroll_start'} > 0) && ($info->{'selfenroll_start'} > $now)) {	if (($info->{'selfenroll_start'} > 0) && ($info->{'selfenroll_start'} > $now)) {
$output .= '<td>'.&mt('Starts: [_1]','<span class="LC_cusr_emph">'.$showstart.'</span>').'<br />'.&mt('Ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>').'</td>';	$output .= '<td>'.&mt('Starts: [_1]','<span class="LC_cusr_emph">'.$showstart.'</span>').'<br />'.&mt('Ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>').'</td>';
} else {	} else {
$output .= '<td><a href="javascript:ToSelfenroll('."'$course'".')">'.&mt('Enroll in course').'</a></td>';	$output .= '<td><a href="javascript:ToSelfenroll('."'$course'".')">'.&mt('Enroll in course').'</a><br />';
	if ($info->{'selfenroll_end'} == 0) {
	$output .= &mt('Available permanently');
	} elsif ($info->{'selfenroll_end'} > $now) {
	$output .= &mt('Self-enrollment ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>');
	}
	$output .= '</td>';
}	}
$selfenroll = 1;	$selfenroll = 1;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.58.4.2
changed lines
	Added in v.1.58.4.8.2.1