'.&mt('
-Please read the "Log-in help" and "Getting started guide" if you can not log-in').'. '.&mt('If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk').'. '.&mt('Note').': '.&mt('Student questions about course content should be directed to the course instructor').'.
+Please review the information in "Log-in help"').$getstarttext.' '.&mt('if you are unable to log-in').'. '.&mt('If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk').'. '.&mt('Note').': '.&mt('Student questions about course content should be directed to the course instructor').'.
');
}
@@ -922,9 +962,9 @@ sub build_code_selections {
my @sorted_b = ();
my @sorted_b_titles = ();
&sort_cats($num,$cat_order,$codetitles,\@{$idarrays{$$codetitles[2]}{$key_a}{$key_b}},\@sorted_b);
- if (defined($$cat_titles{$$codetitles[1]})) {
+ if (defined($$cat_titles{$$codetitles[2]})) {
foreach (@sorted_b) {
- push @sorted_b_titles, $$cat_titles{$$codetitles[1]}{$_};
+ push @sorted_b_titles, $$cat_titles{$$codetitles[2]}{$_};
}
}
$$idlist{$$codetitles[2]}{$key_a}{$key_b} = join('","',@sorted_b);
@@ -942,9 +982,18 @@ sub build_code_selections {
%{$$idlist{$$codetitles[3]}{$key_a}{$key_b}} = ();
foreach my $key_c (keys %{$idarrays{$$codetitles[3]}{$key_a}{$key_b}}) {
my @sorted_c = ();
+ my @sorted_c_titles = ();
&sort_cats($num,$cat_order,$codetitles,\@{$idarrays{$$codetitles[3]}{$key_a}{$key_b}{$key_c}},\@sorted_c);
+ if (defined($$cat_titles{$$codetitles[3]})) {
+ foreach (@sorted_c) {
+ push @sorted_c_titles, $$cat_titles{$$codetitles[3]}{$_};
+ }
+ }
$$idlist{$$codetitles[3]}{$key_a}{$key_b}{$key_c} = join('","',@sorted_c);
$$idnums{$$codetitles[3]}{$key_a}{$key_b}{$key_c} = scalar(@sorted_c);
+ if (defined($$cat_titles{$$codetitles[3]})) {
+ $$idlist_titles{$$codetitles[2]}{$key_a}{$key_b} = join('","',@sorted_c_titles);
+ }
}
}
}
@@ -958,7 +1007,13 @@ sub build_code_selections {
%{$$idlist{$$codetitles[4]}{$key_a}{$key_b}{$key_c}} = ();
foreach my $key_d (keys %{$idarrays{$$codetitles[4]}{$key_a}{$key_b}{$key_c}}) {
my @sorted_d = ();
+ my @sorted_d_titles = ();
&sort_cats($num,$cat_order,$codetitles,$idarrays{$$codetitles[4]}{$key_a}{$key_b}{$key_c}{$key_d},\@sorted_d);
+ if (defined($$cat_titles{$$codetitles[4]})) {
+ foreach (@sorted_d) {
+ push @sorted_d_titles, $$cat_titles{$$codetitles[4]}{$_};
+ }
+ }
$$idlist{$$codetitles[4]}{$key_a}{$key_b}{$key_c}{$key_d} = join('","',@sorted_d);
$$idnums{$$codetitles[4]}{$key_a}{$key_b}{$key_c}{$key_d} = scalar(@sorted_d);
}
@@ -1064,89 +1119,150 @@ sub recurse_list {
}
sub javascript_code_selections {
- my ($numcats,$script_tag,$idlist,$idnums,$idlist_titles,$codetitles) = @_;
+ my ($numcats,$cat_titles,$script_tag,$idlist,$idnums,$idlist_titles,$codetitles) = @_;
my $numtitles = @{$codetitles};
- my @seltitles = ();
+ my @seltitles = ();
for (my $j=0; $j<$numtitles; $j++) {
$seltitles[$j] = 'id'.$$codetitles[$j];
}
my $seltitle_str = join('","',@seltitles);
+ my @longtitles = ();
+ for (my $i=0; $i<$numtitles; $i++) {
+ if (defined($$cat_titles{$$codetitles[$i]})) {
+ $longtitles[$i] = 1;
+ } else {
+ $longtitles[$i] = 0;
+ }
+ }
+ my $longtitles_str = join('","',@longtitles);
$$script_tag .= <