'.&mt('List of possible answers').': '); + &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,&mt('Analyzing Results')); + $request->print('
' + .'
' + .&mt('List of possible answers') + .'
' + ); foreach my $part (sort(keys(%allparts))) { - if (defined(@{ $overall{$part.'.answer'} })) { + if ((ref($overall{$part.'.answer'}) eq 'ARRAY') && + (@{$overall{$part.'.answer'}} > 0)) { for (my $i=0;$i| '.&mt('Part').' '.$part); + $request->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .' | ' + .&mt('Part').' '.$part + ); if (scalar(@{ $overall{$part.'.answer'} }) > 1) { - $request->print(&mt(' Answer [_1]',$i+1)); + $request->print(' '.&mt('Answer [_1]',$i+1)); } - $request->print(' | |
|---|---|---|
| '.&mt('Answer').' | '.&mt('Frequency').' (' - .&mt('click for example').') | '.&mt('Answer').' | ' + .''.&mt('Frequency').' ' + .'('.&mt('click for example').') | '
+ .&Apache::loncommon::end_data_table_header_row()
+ );
foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
- $request->print('
| '. - join(' | ',split("\0",$answer)). - ' | '.$frequency{$answer}. - ' | ' + .join(' | ',split("\0",$answer)) + .' | ' + .'' + .''.$frequency{$answer}.'' + .' | ' + .&Apache::loncommon::end_data_table_row() + ); } - $request->print('
'.&mt('Response').' '.$part.' '. - &mt('is not analyzable at this time').'
'); + $request->print('' + .&mt('Response [_1] is not analyzable at this time.',$part) + .'
' + ); } } if (scalar(keys(%allparts)) == 0 ) { - $request->print(''.&mt('Found no analyzable responses in this problem, currently only Numerical, Formula and String response styles are supported.').'
'); + $request->print('' + .&mt('Found no analyzable responses in this problem.' + .' Currently only Numerical, Formula and String response styles are supported.') + .'
' + ); } &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state); &analyze_footer($request); @@ -907,28 +1048,29 @@ sub editxmlmode { my $result; my $problem=&Apache::lonnet::getfile($file); if ($problem eq -1) { - &Apache::lonxml::error(" ".&mt('Unable to find'). - " $file"); + &Apache::lonxml::error( + '' + .&mt('Unable to find [_1]', + ''.$file.'') + .'
'); + $problem=''; } - if (defined($env{'form.editxmltext'}) || defined($env{'form.Undo'})) { + + if (($env{'form.problemmode'} eq 'saveeditxml') || + ($env{'form.problemmode'} eq 'saveviewxml') || + ($env{'form.problemmode'} eq 'undoxml')) { my $error=&handle_save_or_undo($request,\$problem, \$env{'form.editxmltext'}); if (!$error) { $problem=&Apache::lonnet::getfile($file); } } &Apache::lonhomework::showhashsubset(\%env,'^form'); - if ( $env{'form.submitbutton'} eq &mt('Save and View') ) { + if ($env{'form.problemmode'} eq 'saveviewxml') { &Apache::lonhomework::showhashsubset(\%env,'^form'); $env{'form.problemmode'}='view'; &renderpage($request,$file); } else { my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem); - my $xml_help = '| '. - &Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index", - "Problem Editing Help"). - ' | '. - &Apache::loncommon::help_open_menu(undef,undef,5,'Authoring'). - ' |
+
' .
+ &Apache::lonxml::message_location() .
+ &Apache::loncommon::xmleditor_js() .
+ ' '.
+ &mt('Problem Editing').' '.&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').
+ '
';
+
+ $result.=''.
+ &Apache::structuretags::problem_edit_buttons('editxml');
+ $result.='
';
+
+ $result .= '
";
+
+ $result .= '- ';
+
+ unless ($env{'environment.nocodemirror'}) {
+ # dropdown menus
+ $result .= Apache::lonmenu::create_submenu("#", "",
+ &mt("Problem Templates"), template_dropdown_datastructure());
+
+ $result .= Apache::lonmenu::create_submenu("#", "",
+ &mt("Response Types"), responseblock_dropdown_datastructure());
+
+ $result .= Apache::lonmenu::create_submenu("#", "",
+ &mt("Conditional Blocks"), conditional_scripting_datastructure());
+
+ $result .= Apache::lonmenu::create_submenu("#", "",
+ &mt("Miscellaneous"), misc_datastructure());
+ }
+
+ $result .= Apache::lonmenu::create_submenu("#", "",
+ &mt("Help") . '
',
+ helpmenu_datastructure(),"");
+
+ $result.="'."\n";
+ $result .= '
'."\n".''."\n";
$seconddiv = 1;
+ } elsif (!$first) {
+ $result.='
'."\n";
+ } else {
+ $first = 0;
}
- $result.=''.$currentcategory.'
'; + $result.= ''."\n"
+ .'
'."\n"; + $filename=~s{^\Q$londocroot\E}{}; + if (!(grep($filename =~ /\Q$_\E$/,@noexamplelink))) { + $result .= ' ' + .&Apache::loncommon::modal_link( + $filename.'?inhibitmenu=yes',&mt('Example'),600,420,'sample') + .''; + } + $result .= '
'."\n"; $count ++; } if ($numfiles > 0) { - $result .= '
'."\n".''."\n";
+ $result .= ''."\n".''."\n";
}
return $result;
}
@@ -1134,17 +1362,44 @@ sub get_template_list {
sub newproblem {
my ($request) = @_;
+ if ($env{'form.mode'} eq 'blank'){
+ my $dest = &Apache::lonnet::filelocation("",$request->uri);
+ my $templatefilename =
+ $request->dir_config('lonIncludes').'/templates/blank.problem';
+ &File::Copy::copy($templatefilename,$dest);
+ &renderpage($request,$dest);
+ return;
+ }
+ my $errormsg;
if ($env{'form.template'}) {
- my $file = $env{'form.template'};
- my $dest = &Apache::lonnet::filelocation("",$request->uri);
- &File::Copy::copy($file,$dest);
- &renderpage($request,$dest);
- return;
+ my $file;
+ my ($extension) = ($env{'form.template'} =~ /\.(\w+)$/);
+ if ($extension) {
+ my @files = &get_template_list($extension);
+ foreach my $poss (@files) {
+ if (ref($poss) eq 'ARRAY') {
+ if ($env{'form.template'} eq $poss->[0]) {
+ $file = $env{'form.template'};
+ last;
+ }
+ }
+ }
+ if ($file) {
+ my $dest = &Apache::lonnet::filelocation("",$request->uri);
+ &File::Copy::copy($file,$dest);
+ &renderpage($request,$dest);
+ return;
+ } else {
+ $errormsg = ''.$currentcategory.'
'."\n"; $count++; } $result .= @@ -1120,13 +1341,20 @@ sub get_template_list { if ($file->[3]) { $result.=&Apache::loncommon::help_open_topic($file->[3]); } + # Provide example link my $filename=$file->[0]; - $filename=~s/^\/home\/httpd\/html//; - $result.=' '.&mt('Example').''."\n"; + $filename=~s{^\Q$londocroot\E}{}; + if (!(grep($filename =~ /\Q$_\E$/,@noexamplelink))) { + $result .= ' ' + .&Apache::loncommon::modal_link( + $filename.'?inhibitmenu=yes',&mt('Example'),600,420,'sample') + .''; + } + $result .= '
'."\n"; $count ++; } if ($numfiles > 0) { - $result .= '
'.&mt('Invalid template file.').'
'; + } + } else { + $errormsg = ''.&mt('Invalid template file; template needs to be a .problem, .library, or .task file.').'
'; + } } my ($extension) = ($request->uri =~ m/\.(\w+)$/); &Apache::lonxml::debug("Looking for :$extension:"); - my $templatelist=&get_template_list($extension); + my $templatelist=&get_template_html($extension); if ($env{'form.newfile'} && !$templatelist) { # no templates found my $templatefilename = @@ -1155,31 +1410,35 @@ sub newproblem { &renderpage($request,$dest); } else { my $url=&HTML::Entities::encode($request->uri,'<>&"'); - my $shownurl=$url; - $shownurl=~s-^/~-/priv/-; my $dest = &Apache::lonnet::filelocation("",$request->uri); - my $errormsg; my $instructions; + my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri), + 'text' => 'Authoring Space'}, + {'href' => '', + 'text' => "Create New $extension"}]; my $start_page = - &Apache::loncommon::start_page("Create New $extension"); - $request->print(" -$start_page -".&mt("Creating a new $extension resource.")."
+ &Apache::loncommon::start_page("Create New $extension", + undef, + {'bread_crumbs' => $brcrum,}); + $request->print( + $start_page + .&Apache::loncommon::head_subbox( + &Apache::loncommon::CSTR_pageheader()) + .''.&mt("Creating a new $extension resource.")."
$errormsg ".&mt("The requested file [_1] currently does not exist.", - "$shownurl")." -- -".&mt("To create a new $extension, select a template from the". - " list below. Then click on the \"Create $extension\" button.")." -