print(&Apache::loncommon::start_data_table()
@@ -901,20 +1055,23 @@ sub editxmlmode {
my $problem=&Apache::lonnet::getfile($file);
if ($problem eq -1) {
&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);
@@ -926,28 +1083,25 @@ sub editxmlmode {
my $js =
&Apache::edit::js_change_detection().
&Apache::loncommon::resize_textarea_js().
- &Apache::structuretags::setmode_javascript().
+ &Apache::lonxml::setmode_javascript().
&Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
- my $only_body = ($env{'environment.remote'} eq 'off')? 0 : 1;
- my $dragmath_button =
- &Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
# Breadcrumbs
- my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
- 'text' => 'Construction Space'},
+ my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
+ 'text' => 'Authoring Space'},
{'href' => '',
'text' => 'Problem Editing'}];
my $start_page =
&Apache::loncommon::start_page(&mt("EditXML [_1]",$file),$js,
{'no_auto_mt_title' => 1,
- 'only_body' => $only_body,
+ 'only_body' => 0,
'add_entries' => {
'onresize' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
'onload' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
- },
+ },
'bread_crumbs' => $brcrum,
-});
+ });
$result=$start_page
.&Apache::loncommon::head_subbox(
@@ -956,39 +1110,88 @@ sub editxmlmode {
''.&Apache::loncommon::end_page();
- &Apache::lonxml::add_messages(\$result);
- $request->print($result);
+ ' .
+ &Apache::lonxml::message_location() .
+ &Apache::loncommon::xmleditor_js() .
+ '
';
+
+ my $resource = $env{'request.ambiguous'};
+ unless($env{'environment.nocodemirror'}){
+ $result .= '
+
+ ';
+ }
+
+ $result .= &Apache::loncommon::end_page();
+ &Apache::lonxml::add_messages(\$result);
+ $request->print($result);
}
return '';
}
@@ -1023,12 +1226,11 @@ sub renderpage {
$problem='';
my $filename=(split('/',$file))[-1];
my $error =
- " ".&mt('Unable to find [_1]',
- ''.$filename.'')
- ."";
+ &mt('Unable to find [_1]',
+ ''.$filename.'');
$result.=
&Apache::loncommon::simple_error_page($request,'Not available',
- $error);
+ $error,{'no_auto_mt_msg' => 1});
return;
}
@@ -1076,22 +1278,37 @@ sub finished_parsing {
undef($Apache::lonhomework::parsing_a_task);
}
+
+# function extracted from get_template_html
+# returns "key" -> list
+# key: path of template
+# value 1: title
+# value 2: category
+# value 3: name of help topic ???
sub get_template_list {
my ($extension) = @_;
+
+ my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
+ '/templates/*.'.$extension);
+ @files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')),
+ (&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')),
+ &mt(&Apache::lonnet::metadata($_, 'help'))]} (@files);
+ @files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files);
+ return @files;
+}
+
+sub get_template_html {
+ my ($extension) = @_;
my $result;
my @allnames;
&Apache::lonxml::debug("Looking for :$extension:");
my $glob_extension = $extension;
if ($extension eq 'survey' || $extension eq 'exam') {
- $glob_extension = 'problem';
+ $glob_extension = 'problem';
}
- my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
- '/templates/*.'.$glob_extension);
- @files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')),
- (&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')),
- &mt(&Apache::lonnet::metadata($_, 'help'))]} (@files);
- @files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files);
+ my @files = &get_template_list($extension);
my ($midpoint,$seconddiv,$numfiles);
+ my @noexamplelink = ('blank.problem','blank.library','script.library');
$numfiles = 0;
foreach my $file (@files) {
next if ($file->[1] !~ /\S/);
@@ -1107,6 +1324,7 @@ sub get_template_list {
my $count = 0;
my $currentcategory='';
my $first = 1;
+ my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
foreach my $file (@files) {
next if ($file->[1] !~ /\S/);
if ($file->[2] ne $currentcategory) {
@@ -1129,11 +1347,16 @@ 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) {
@@ -1145,17 +1368,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 = ''.&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 =
@@ -1166,13 +1416,10 @@ 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(),
- 'text' => 'Construction Space'},
+ my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
+ 'text' => 'Authoring Space'},
{'href' => '',
'text' => "Create New $extension"}];
my $start_page =
@@ -1186,7 +1433,7 @@ sub newproblem {
.''.&mt("Creating a new $extension resource.")."
$errormsg
".&mt("The requested file [_1] currently does not exist.",
- ''.$shownurl.'').'
+ ''.$url.'').'
'.&mt("To create a new $extension, select a template from the".
" list below. Then click on the \"Create $extension\" button.").'
@@ -1231,7 +1478,7 @@ sub handler {
my $file=&Apache::lonnet::filelocation("",$request->uri);
#check if we know where we are
- if ($env{'request.course.fn'} && !&Apache::lonnet::symbread()) {
+ if ($env{'request.course.fn'} && !&Apache::lonnet::symbread('','',1,1)) {
# if we are browsing we might not be able to know where we are
if ($Apache::lonhomework::browse ne 'F' &&
$env{'request.state'} ne "construct") {
@@ -1257,7 +1504,10 @@ sub handler {
#first visit to problem in construction space
$env{'form.problemmode'}= 'view';
&renderpage($request,$file);
- } elsif ($env{'form.problemmode'} eq 'editxml') {
+ } elsif (($env{'form.problemmode'} eq 'editxml') ||
+ ($env{'form.problemmode'} eq 'saveeditxml') ||
+ ($env{'form.problemmode'} eq 'saveviewxml') ||
+ ($env{'form.problemmode'} eq 'undoxml')) {
&editxmlmode($request,$file);
} elsif ($env{'form.problemmode'} eq 'calcanswers') {
&analyze($request,$file);
@@ -1266,6 +1516,8 @@ sub handler {
&renderpage($request,$file);
}
} else {
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['mode']);
# requested file doesn't exist in contruction space
&newproblem($request);
}
@@ -1283,5 +1535,179 @@ sub handler {
}
+sub template_dropdown_datastructure {
+ # gathering the all templates and their path, title, category and help topic
+ my @templates = get_template_list('problem');
+ # template category => title
+ my %tmplthash = ();
+ # template title => path
+ my %tmpltcontent = ();
+
+ foreach my $template (@templates){
+ # put in hash if the template is not empty
+ unless ($template->[1] eq ''){
+ push(@{$tmplthash{$template->[2]}}, $template->[1]);
+ push(@{$tmpltcontent{$template->[1]}},$template->[0]);
+ }
+ }
+
+ my $catList = [];
+ foreach my $cat (sort keys %tmplthash) {
+ my $catItems = [];
+ foreach my $title (sort @{$tmplthash{$cat}}) {
+ my $path = $tmpltcontent{$title}->[0];
+ my $code;
+ open(FH, "<$path");
+ while(){
+ $code.= $_ unless $_ =~ /()|(<\/problem>)/;
+ }
+ close(FH);
+
+ if ($code ne '') {
+ my $href = 'javascript:insertText(\'' . &convert_for_js(&HTML::Entities::encode($code,'<>&"')) . '\')';
+ my $currItem = [$href, $title, undef];
+ push @{$catItems}, $currItem;
+ }
+ }
+ push @{$catList}, [$catItems, $cat, undef];
+ }
+
+ return $catList;
+}
+
+sub responseblock_dropdown_datastructure {
+
+ my $mathCat = [
+ [
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_formularesponse())) . "\')", &mt("Formula Response"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_functionplotresponse())) . "\')", &mt("Function Plot Response"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_mathresponse())) . "\')", &mt("Math Response"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_numericalresponse())) . "\')", &mt("Numerical Response"), undef]
+ ],
+ &mt("Math"),
+ undef
+ ];
+
+ my $miscCat = [
+ [
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_imageresponse())) . "\')", &mt("Click on Image"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_customresponse())) . "\')", &mt("Custom Response"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_externalresponse())) . "\')", &mt("External Response"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_matchresponse())) . "\')", &mt("Match Two Lists"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_radiobuttonresponse())) . "\')", &mt("One out of N statements"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_optionresponse())) . "\')", &mt("Select from Options"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_rankresponse())) . "\')", &mt("Rank Values"), undef]
+ ],
+ &mt("Miscellaneous"),
+ undef
+ ];
+
+ my $chemCat = [
+ [
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_reactionresponse())) . "\')", &mt("Chemical Reaction"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Chemical Structure"), undef]
+ ],
+ &mt("Chemistry"),
+ undef
+ ];
+
+ my $textCat = [
+ [
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_stringresponse())) . "\')", &mt("String Response"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef]
+ ],
+ &mt("Text"),
+ undef
+ ];
+
+ return [$mathCat, $miscCat, $chemCat, $textCat];
+}
+
+
+sub conditional_scripting_datastructure {
+# TODO: corresponding routines should be used for the javascript:insertText parts
+# instead of the placeholder routine default_xml_tag with the tags
+# e.g. &default_xml_tag("postanswerdate") should be replaced with a routine which
+# returns the corresponding content for this case
+
+#TODO translated is currently temporarily here, another solution should be found where the
+# needed string can be retrieved
+
+ my $translatedTag = '
+
+
+
+';
+ return [
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Block"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("block"))) . "\')", &mt("Conditional Block"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("postanswerdate"))) . "\')", &mt("After Answer Date Block"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("preduedate"))) . "\')", &mt("Before Due Date Block"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("solved"))) . "\')", &mt("Block For After Solved"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef]
+ ];
+}
+
+sub misc_datastructure {
+ return [
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_img())) . "\')", &mt("Image"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::lonplot::insert_gnuplot())) . "\')", &mt("GNU Plot"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicstructure())) . "\')", &mt("Organic Structure"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_script())) . "\')", &mt("Script Block"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("allow"))) . "\')", &mt("File Dependencies"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("import"))) . "\')", &mt("Import a File"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::londefdef::insert_meta())) . "\')", &mt("Custom Metadata"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("part"))) . "\')", &mt("Problem Part"), undef]
+ ];
+}
+
+# helper routine for the datastructure building subroutines
+sub default_xml_tag {
+ my ($tag) = @_;
+ return "\n<$tag>";
+}
+
+sub helpmenu_datastructure {
+
+ # filename, title, width, height
+ my $helpers = [
+ ['Problem_LON-CAPA_Functions.hlp', &mt('Script Functions'), 800, 600],
+ ['Greek_Symbols.hlp', &mt('Greek Symbols'), 500, 600],
+ ['Other_Symbols.hlp', &mt('Other Symbols'), 500, 600],
+ ['Authoring_Output_Tags.hlp', &mt('Output Tags'), 800, 600],
+ ['Authoring_Multilingual_Problems.hlp', &mt('Languages'), 800, 600],
+ ];
+
+ my $help_structure = [];
+
+ foreach my $count (0..(scalar(@{$helpers})-1)) {
+ my $filename = $helpers->[$count]->[0];
+ my $title = $helpers->[$count]->[1];
+ my $width = $helpers->[$count]->[2];
+ my $height = $helpers->[$count]->[3];
+ if ($width eq '') {
+ $width = 500;
+ }
+ if ($height eq '') {
+ $height = 600;
+ }
+ my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename',$width,$height,'yes');");
+ push @{$help_structure}, [$href, $title, undef];
+ }
+
+ return $help_structure;
+}
+
+# we need substitution to not break javascript code
+sub convert_for_js {
+ my $return = shift;
+ $return =~ s|script|ESCAPEDSCRIPT|g;
+ $return =~ s|\\|\\\\|g;
+ $return =~ s|\n|\\r\\n|g;
+ $return =~ s|'|\\'|g;
+ $return =~ s|'|\\'|g;
+ return $return;
+}
+
1;
__END__
',
+ helpmenu_datastructure(),"");
+
+ $result.="