--- loncom/xml/lonxml.pm 2012/12/07 17:16:01 1.537
+++ loncom/xml/lonxml.pm 2014/06/21 23:36:05 1.548
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.537 2012/12/07 17:16:01 raeburn Exp $
+# $Id: lonxml.pm,v 1.548 2014/06/21 23:36:05 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -144,7 +144,7 @@ $metamode = 0;
# turns on and of run::evaluate actually derefencing var refs
$evaluate = 1;
-# data structure for eidt mode, determines what tags can go into what other tags
+# data structure for edit mode, determines what tags can go into what other tags
%insertlist=();
# stores the list of active tag namespaces
@@ -306,8 +306,12 @@ sub xmlparse {
&clean_safespace($safeeval);
if (@script_var_displays) {
- my $scriptoutput = join('',@script_var_displays);
- $finaloutput=~s{(</body>\s*</html>)\s*$}{$scriptoutput$1}s;
+ if ($finaloutput =~ m{</body>\s*</html>\s*$}s) {
+ my $scriptoutput = join('',@script_var_displays);
+ $finaloutput=~s{(</body>\s*</html>)\s*$}{$scriptoutput$1}s;
+ } else {
+ $finaloutput .= join('',@script_var_displays);
+ }
undef(@script_var_displays);
}
&init_state();
@@ -651,7 +655,7 @@ sub init_safespace {
my ($target,$safeeval,$safehole,$safeinit) = @_;
$safeeval->reval('use LaTeX::Table;');
$safeeval->deny_only(':dangerous');
- $safeeval->reval('use Math::Complex;');
+ $safeeval->reval('use LONCAPA::LCMathComplex;');
$safeeval->permit_only(":default");
$safeeval->permit("entereval");
$safeeval->permit(":base_math");
@@ -1359,7 +1363,9 @@ sub do_registered_ssi {
sub add_script_result {
my ($display) = @_;
- push(@script_var_displays, $display);
+ if ($display ne '') {
+ push(@script_var_displays, $display);
+ }
}
#
@@ -1510,33 +1516,57 @@ sub renderingoptions {
}
sub inserteditinfo {
- my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri) = @_;
+ my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri,$action) = @_;
$filecontents = &HTML::Entities::encode($filecontents,'<>&"');
my $xml_help = '';
my $initialize='';
my $textarea_id = 'filecont';
- my ($dragmath_button,$deps_button);
- my ($add_to_onload, $add_to_onresize);
+ my ($dragmath_button,$deps_button,$context,$cnum,$cdom,$add_to_onload,
+ $add_to_onresize,$init_dragmath);
$initialize=&Apache::lonhtmlcommon::spellheader();
- if (($filetype eq 'html') && (&Apache::lonhtmlcommon::htmlareabrowser())) {
- my $lang = &Apache::lonhtmlcommon::htmlarea_lang();
- my %textarea_args = (
- fullpage => 'true',
- dragmath => 'math',
- );
- $initialize .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
+ if ($filetype eq 'html') {
+ if ($env{'request.course.id'}) {
+ $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if ($uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E}) {
+ $context = 'syllabus';
+ }
+ }
+ if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+ my $lang = &Apache::lonhtmlcommon::htmlarea_lang();
+ my %textarea_args = (
+ fullpage => 'true',
+ dragmath => 'math',
+ );
+ $initialize .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
+ if ($context eq 'syllabus') {
+ $init_dragmath = "editmath_visibility('filecont','none')";
+ }
+ }
}
$initialize .= (<<FULLPAGE);
<script type="text/javascript">
// <![CDATA[
function initDocument() {
resize_textarea('$textarea_id','LC_aftertextarea');
+ $init_dragmath
}
// ]]>
</script>
FULLPAGE
+ my $textareaclass;
if ($filetype eq 'html') {
- if ($symb || $folderpath) {
+ if ($context eq 'syllabus') {
+ $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
+ $initialize .=
+ &Apache::lonhtmlcommon::dependencycheck_js(undef,&mt('Syllabus'),
+ $uri,undef,
+ "/public/$cdom/$cnum/syllabus").
+ "\n";
+ if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+ $textareaclass = 'class="LC_richDefaultOn"';
+ }
+ } elsif ($symb || $folderpath) {
$deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
$initialize .=
&Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle,
@@ -1549,11 +1579,14 @@ FULLPAGE
$add_to_onresize = "resize_textarea('$textarea_id','LC_aftertextarea');";
if ($filetype eq 'html') {
- $xml_help=&Apache::loncommon::helpLatexCheatsheet();
+ my $not_author;
+ if ($uri =~ m{^/uploaded/}) {
+ $not_author = 1;
+ }
+ $xml_help=&Apache::loncommon::helpLatexCheatsheet(undef,undef,$not_author);
}
my $titledisplay=&display_title();
- my $textareaclass;
my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit',
'vi' => 'Save and View',
'dv' => 'Discard Edits and View',
@@ -1569,13 +1602,19 @@ FULLPAGE
$htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
}
if (&Apache::lonhtmlcommon::htmlareabrowser()) {
- $textareaclass = 'class="LC_richDefaultOff"';
+ unless ($textareaclass) {
+ $textareaclass = 'class="LC_richDefaultOff"';
+ }
}
}
+ my $undo;
+ unless ($uri =~ m{^/uploaded/}) {
+ $undo = '<input type="submit" name="Undo" accesskey="u" value="'.$lt{'un'}.'" />'."\n";
+ }
my $editfooter=(<<ENDFOOTER);
$initialize
<a name="editsection" />
-<form $form_events method="post" name="xmledit">
+<form $form_events method="post" name="xmledit" action="$action">
<div class="LC_edit_problem_editxml_header">
<table class="LC_edit_problem_header_title"><tr><td>
$filename
@@ -1585,8 +1624,7 @@ $initialize
</table>
<div class="LC_edit_problem_discards">
<input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
- <input type="submit" name="Undo" accesskey="u" value="$lt{'un'}" />
- $htmlerror $deps_button $dragmath_button
+ $undo $htmlerror $deps_button $dragmath_button
</div>
<div class="LC_edit_problem_saves">
<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
@@ -1599,7 +1637,6 @@ $initialize
$titledisplay
</div>
</form>
-</body>
ENDFOOTER
return ($editfooter,$add_to_onload,$add_to_onresize);;
}
@@ -1675,6 +1712,19 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['todocs']);
}
+ my ($cdom,$cnum);
+ if ($env{'request.course.id'}) {
+ $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if ($filetype eq 'html') {
+ if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E.+$}) {
+ if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['editmode']);
+ }
+ }
+ }
+ }
if ($filetype eq 'sty') {
$breadcrumbtext = 'Style File Editor';
} elsif ($filetype eq 'js') {
@@ -1777,7 +1827,7 @@ ENDNOTFOUND
my $brcrum;
if ($env{'request.state'} eq 'construct') {
$brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Construction Space'},
+ 'text' => 'Authoring Space'},
{'href' => '',
'text' => $breadcrumbtext}];
} else {
@@ -1800,27 +1850,37 @@ ENDNOTFOUND
unless ($env{'request.state'} eq 'published') {
if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
{
- my ($displayfile,$url,$symb,$itemtitle);
+ my ($displayfile,$url,$symb,$itemtitle,$action);
$displayfile=$request->uri;
if ($request->uri =~ m{^/uploaded/}) {
if ($env{'request.course.id'}) {
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/\Esupplemental/}) {
+ if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/supplemental/\E}) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['folderpath','title']);
+ } elsif ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) {
+ my $filename = $1;
+ if ($1 eq 'loncapa.html') {
+ $displayfile = &mt('Syllabus (minimal template)');
+ $action = $request->uri.'?forceedit=1';
+ } else {
+ $displayfile = &mt('Syllabus file: [_1]',$1);
+ }
+ $itemtitle = &mt('Syllabus');
}
}
- ($symb,$itemtitle,$displayfile) =
- &get_courseupload_hierarchy($request->uri,
- $env{'form.folderpath'},$env{'form.title'});
+ unless ($itemtitle) {
+ ($symb,$itemtitle,$displayfile) =
+ &get_courseupload_hierarchy($request->uri,
+ $env{'form.folderpath'},
+ $env{'form.title'});
+ }
} else {
$displayfile=~s/^\/[^\/]*//;
}
my ($edit_info, $add_to_onload, $add_to_onresize)=
&inserteditinfo($filecontents,$filetype,$displayfile,$symb,
- $itemtitle,$env{'form.folderpath'},$request->uri);
+ $itemtitle,$env{'form.folderpath'},$request->uri,$action);
my %options =
('add_entries' =>
@@ -1830,7 +1890,7 @@ ENDNOTFOUND
if ($env{'request.state'} eq 'construct') {
$options{'bread_crumbs'} = [{
'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Construction Space'},
+ 'text' => 'Authoring Space'},
{'href' => '',
'text' => $breadcrumbtext}];
$header = &Apache::loncommon::head_subbox(
@@ -1865,7 +1925,7 @@ sub display_title {
$title = substr($title, rindex($title, '/') + 1);
}
$result = "<script type='text/javascript'>top.document.title = '$title - LON-CAPA "
- .&mt('Construction Space')."';</script>";
+ .&mt('Authoring Space')."';</script>";
}
return $result;
}
@@ -1880,6 +1940,7 @@ sub get_courseupload_hierarchy {
while (@folders) {
my $folder=shift(@folders);
my $foldername=shift(@folders);
+ $foldername =~ s/\:(\d*)\:(\w*)\:(\w*):(\d*)\:?(\d*)$//;
push(@pathitems,&unescape($foldername));
}
if ($title) {
@@ -2243,7 +2304,7 @@ sub description {
sub helpinfo {
my ($token)=@_;
my $tag = &get_tag($token);
- return ($insertlist{$tag.'.helpfile'}, $insertlist{$tag.'.helpdesc'});
+ return ($insertlist{$tag.'.helpfile'}, &mt($insertlist{$tag.'.helpdesc'}));
}
sub get_tag {