".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file
");
+ &Apache::lonxml::info("
".
+ &mt("Unable to undo, unable to switch [_1] and [_2]",
+ ''.
+ $filebak.'',
+ ''.
+ $file.'')."
");
$error=1;
}
} else {
@@ -672,20 +712,29 @@ sub handle_save_or_undo {
my $fs=Apache::File->new(">$filebak");
if (defined($fs)) {
print $fs $$problem;
- &Apache::lonxml::info("".&mt("Making Backup to").
- " $filebak");
+ &Apache::lonxml::info("".&mt("Making Backup to [_1]",
+ ''.
+ $filebak.'').
+ "");
} else {
- &Apache::lonxml::info("".&mt("Unable to make backup")." $filebak");
+ &Apache::lonxml::info("".
+ &mt("Unable to make backup [_1]",
+ ''.
+ $filebak.'')."");
$error=2;
}
my $fh=Apache::File->new(">$file");
if (defined($fh)) {
print $fh $$result;
- &Apache::lonxml::info("".&mt("Saving Modifications to").
- " $file");
+ &Apache::lonxml::info("".&mt("Saving Modifications to [_1]",
+ ''.
+ $file.'' )."");
} else {
- &Apache::lonxml::info("".
- &mt("Unable to write to")." $file");
+ &Apache::lonxml::info(''.
+ &mt("Unable to write to [_1]",
+ ''.
+ $file.'').
+ '');
$error|=4;
}
}
@@ -702,11 +751,14 @@ sub analyze_header {
';
&Apache::lonxml::add_messages(\$result);
$request->print($result);
@@ -759,19 +811,27 @@ sub analyze {
$answer_part);
my $concatanswer= join("\0",@{ $answer_part });
if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {
- $answer_part = [''.&mt('Error').''];
+ $answer_part = [''.&mt('Error').''];
}
$seedexample{join("\0",$part,$i,@{$answer_part})}=
$thisseed;
$i++;
}
}
+ if (!keys(%{ $analyze{$part.'.answer'} })) {
+ my $answer_part =
+ [''.&mt('Error').''];
+ $seedexample{join("\0",$part,0,@{$answer_part})}=
+ $thisseed;
+ push( @{ $overall{$part.'.answer'}[0] },
+ $answer_part);
+ }
}
}
}
&Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,
&mt('Analyzing Results'));
- $request->print(''.&mt('List of possible answers').': ');
+ $request->print(''.&mt('List of possible answers').': ');
foreach my $part (sort(keys(%allparts))) {
if (defined(@{ $overall{$part.'.answer'} })) {
for (my $i=0;$i 80) { $cols = 80; }
if ($cols < 70) { $cols = 70; }
if ($rows < 20) { $rows = 20; }
+ my $js =
+ &Apache::edit::js_change_detection().
+ &Apache::loncommon::resize_textarea_js();
+ my $only_body = ($env{'environment.remote'} eq 'off')? 0 : 1;
my $start_page =
- &Apache::loncommon::start_page(&mt("EditXML [_1]",$file),
- &Apache::edit::js_change_detection(),
- {'no_auto_mt_title' => 1,});
+ &Apache::loncommon::start_page(&mt("EditXML [_1]",$file),$js,
+ {'no_auto_mt_title' => 1,
+ 'only_body' => $only_body,
+ 'add_entries' => {
+ 'onresize' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
+ 'onload' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
+ }});
$result.=$start_page.
&renderpage($request,$file,['no_output_web'],1).
- &Apache::lonxml::message_location().'
- '.&Apache::loncommon::end_page();
&Apache::lonxml::add_messages(\$result);
$request->print($result);
@@ -879,6 +995,7 @@ sub renderpage {
my @targets = @{$targets || [&get_target()]};
&Apache::lonhomework::showhashsubset(\%env,'form.');
&Apache::lonxml::debug("Running targets ".join(':',@targets));
+
my $overall_result;
foreach my $target (@targets) {
# FIXME need to do something intelligent when a problem goes
@@ -916,7 +1033,7 @@ sub renderpage {
&Apache::lonxml::debug("Should be parsing now");
$result .= &Apache::lonxml::xmlparse($request, $target, $problem,
&setup_vars($target),%mystyle);
- undef($Apache::lonhomework::parsing_a_problem);
+ &finished_parsing();
if (!$output) { $result = ''; }
#$request->print("Result follows:");
if ($target eq 'modified') {
@@ -947,50 +1064,54 @@ sub renderpage {
}
}
-# with no arg it returns a HTML \n';
+ my $glob_extension = $extension;
+ if ($extension eq 'survey' || $extension eq 'exam') {
+ $glob_extension = 'problem';
+ }
+ my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
+ '/templates/*.'.$glob_extension);
+ @files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title'))]} (@files);
+ @files = sort {$a->[1] cmp $b->[1]} (@files);
+ foreach my $file (@files) {
+ next if ($file->[1] !~ /\S/);
+ $result .=
+ ' ';
}
return $result;
}
sub newproblem {
my ($request) = @_;
- my $extension=$request->uri;
- $extension=~s:^.*\.([\w]+)$:$1:;
- &Apache::lonxml::debug("Looking for :$extension:");
- my $templatelist=&get_template_list('',$extension);
- if ($env{'form.template'} &&
- $env{'form.template'} ne "Select a $extension template") {
- use File::Copy;
- my $file = &get_template_list($env{'form.template'},$extension);
+
+ if ($env{'form.template'}) {
+ my $file = $env{'form.template'};
my $dest = &Apache::lonnet::filelocation("",$request->uri);
- copy($file,$dest);
+ &File::Copy::copy($file,$dest);
&renderpage($request,$dest);
- } elsif($env{'form.newfile'} && !$templatelist) {
- # I don't like hard-coded filenames but for now, this will work.
- use File::Copy;
+ return;
+ }
+
+ my ($extension) = ($request->uri =~ m/\.(\w+)$/);
+ &Apache::lonxml::debug("Looking for :$extension:");
+ my $templatelist=&get_template_list($extension);
+ if ($env{'form.newfile'} && !$templatelist) {
+ # no templates found
my $templatefilename =
$request->dir_config('lonIncludes').'/templates/blank.'.$extension;
&Apache::lonxml::debug("$templatefilename");
my $dest = &Apache::lonnet::filelocation("",$request->uri);
- copy($templatefilename,$dest);
+ &File::Copy::copy($templatefilename,$dest);
&renderpage($request,$dest);
} else {
my $url=&HTML::Entities::encode($request->uri,'<>&"');
@@ -998,9 +1119,6 @@ sub newproblem {
$shownurl=~s-^/~-/priv/-;
my $dest = &Apache::lonnet::filelocation("",$request->uri);
my $errormsg;
- if ($env{'form.newfile'}) {
- $errormsg='
'.&mt('You did not select a template.').'
'."\n";
- }
my $instructions;
my $start_page =
&Apache::loncommon::start_page("Create New $extension");
@@ -1013,18 +1131,37 @@ $errormsg
".&mt("To create a new $extension, select a template from the".
- "pull-down menu below. Then click on the \"Create $extension\" button.")."
+ " list below. Then click on the \"Create $extension\" button.")."