"; # Close off the extra row and start a new one.
+ $headings_done = 1;
+ }
my $inputType;
if ($multichoice) { $inputType = 'checkbox'; }
else {$inputType = 'radio'; }
if (!&$choiceFunc($resource)) {
- return ' | ';
+ $result .= ' | ';
+ return $result;
} else {
- my $col = "&\"'");
+ if($option_vars) {
+ foreach my $option_var (@$option_vars) {
+ $col .=
+ " | | ";
+ }
+ }
+
+ $col .= "&"')
- . "' /> | ";
- return $col;
+ $col .= "value='" . $resource_name . "' />";
+ return $result.$col;
}
};
@@ -2062,7 +2124,7 @@ sub start_student {
$helper->declareVar($paramHash->{'variable'});
$paramHash->{'multichoice'} = $token->[2]{'multichoice'};
$paramHash->{'coursepersonnel'} = $token->[2]{'coursepersonnel'};
- $paramHash->{'sctiveonly'} = $token->[2]{'activeonly'};
+ $paramHash->{'activeonly'} = $token->[2]{'activeonly'};
if (defined($token->[2]{'nextstate'})) {
$paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
}
@@ -2132,13 +2194,25 @@ SCRIPT
$buttons = <
-
-
-
-
-
-
-
+
BUTTONS
}
@@ -2217,7 +2291,10 @@ BUTTONS
$checked = 1;
}
$result .=
- " value='" . HTML::Entities::encode($choice->[0] . ':' . $choice->[2] . ':' . $choice->[1] . ':' . $choice->[3],'<>&"')
+ " value='" . HTML::Entities::encode($choice->[0] . ':'
+ .$choice->[2] . ':'
+ .$choice->[1] . ':'
+ .$choice->[3], "<>&\"'")
. "' />"
. HTML::Entities::encode($choice->[1],'<>&"')
. " | "
@@ -2533,7 +2610,7 @@ BUTTONS
my $id = &new_id();
$result .= ' |
" .
"&"').
+ . ".forminput' ".qq{id="$id"}." value='" . HTML::Entities::encode($fileName,"<>&\"'").
"'";
if (!$self->{'multichoice'} && $choices == 0) {
$result .= ' checked';
@@ -2945,6 +3022,9 @@ will make a "Finish Helper" button that
which is useful for the Course Initialization helper so the users never see
the old values taking effect.
+If the parameter "restartCourse" is not true a 'Finish' Button will be
+presented that takes the user back to whatever was defined as
+
=cut
no strict;
@@ -3042,8 +3122,12 @@ sub render {
$result .= '';
}
+ my $actionURL = $self->{EXIT_PAGE};
+ my $targetURL = '';
+ my $finish=&mt('Finish');
if ($self->{'restartCourse'}) {
- my $targetURL = '/adm/menu';
+ my $actionURL = '/adm/roles';
+ $targetURL = '/adm/menu';
if ($ENV{'course.'.$ENV{'request.course.id'}.'.url'}=~/^uploaded/) {
$targetURL = '/adm/coursedocs';
} else {
@@ -3052,25 +3136,24 @@ sub render {
if ($ENV{'course.'.$ENV{'request.course.id'}.'.clonedfrom'}) {
$targetURL = '/adm/parmset?overview=1';
}
- my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
- my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');
- $result .= "\n" .
- "";
+ my $finish=&mt('Finish Course Initialization');
}
+ my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
+ my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');
+ $result .= "\n" .
+ "";
return $result;
}
sub overrideForm {
- my $self = shift;
- return $self->{'restartCourse'};
+ return 1;
}
1;
@@ -3147,7 +3230,6 @@ sub render {
my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});
my $title = $res->compTitle();
$symb = $res->symb();
- $navmap->untieHashes();
$resourceString .= ''.&mt('for the map named [_1]',"$title").'';
$level = 8;
$affectedResourceId = $vars->{RESOURCE_ID};
@@ -3157,7 +3239,6 @@ sub render {
my $res = $navmap->getById($vars->{RESOURCE_ID});
$symb = $res->symb();
my $title = $res->compTitle();
- $navmap->untieHashes();
$resourceString .= ''.&mt('for the resource named [_1]',"$title").'';
$level = 7;
$affectedResourceId = $vars->{RESOURCE_ID};
@@ -3217,7 +3298,7 @@ sub render {
$result .= ''.&mt('for section [_1]',"$section").'';
$level -= 3;
$result .= "&"') . "' />\n";
+ HTML::Entities::encode($section,"'<>&\"") . "' />\n";
} else {
# FIXME: This is probably wasteful! Store the name!
my $classlist = Apache::loncoursedata::get_classlist();
@@ -3229,9 +3310,9 @@ sub render {
$level -= 6;
my ($uname, $udom) = split /:/, $vars->{USER_NAME};
$result .= "&"') . "' />\n";
+ HTML::Entities::encode($uname,"'<>&\"") . "' />\n";
$result .= "&"') . "' />\n";
+ HTML::Entities::encode($udom,"'<>&\"") . "' />\n";
}
# Print value
|