--- loncom/xml/lonxml.pm 2009/04/17 01:00:20 1.494
+++ loncom/xml/lonxml.pm 2010/05/30 02:57:01 1.505.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.494 2009/04/17 01:00:20 www Exp $
+# $Id: lonxml.pm,v 1.505.2.1 2010/05/30 02:57:01 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -111,6 +111,7 @@ use Apache::loncacc();
use Apache::lonmaxima();
use Apache::lonr();
use Apache::lonlocal;
+use Apache::lonhtmlcommon();
#==================================== Main subroutine: xmlparse
@@ -243,7 +244,7 @@ sub tokeninputfield {
document.tokeninput.barcode.value='';
}
</script>
-<form method="post" name="tokeninput">
+<form method="post" name="tokeninput" action="">
<table border="2" bgcolor="#FFFFBB">
<tr><th>DocID Checkin</th></tr>
<tr><td>
@@ -251,7 +252,7 @@ sub tokeninputfield {
<tr>
<td>Scan in Barcode</td>
<td><input type="text" size="22" name="barcode"
-onChange="updatetoken()"/></td>
+onchange="updatetoken()"/></td>
</tr>
<tr><td><i>or</i> Type in DocID</td>
<td>
@@ -260,7 +261,7 @@ onChange="updatetoken()"/></td>
<input type="text" size="5" name="codetwo" />
<b><font size="+2">*</font></b>
<input type="text" size="10" name="codethree" value="$defhost"
-onChange="this.value=this.value.toUpperCase()" />
+onchange="this.value=this.value.toUpperCase()" />
</td></tr>
</table>
</td></tr>
@@ -757,6 +758,8 @@ sub init_safespace {
'&maxima_cas_formula_fix');
$safehole->wrap(\&Apache::lonr::r_eval,$safeeval,'&r_eval');
+ $safehole->wrap(\&Apache::lonr::Rentry,$safeeval,'&Rentry');
+ $safehole->wrap(\&Apache::lonr::Rarray,$safeeval,'&Rarray');
$safehole->wrap(\&Apache::lonr::r_check,$safeeval,'&r_check');
$safehole->wrap(\&Apache::lonr::r_cas_formula_fix,$safeeval,
'&r_cas_formula_fix');
@@ -1041,7 +1044,7 @@ sub get_id {
my ($parstack,$safeeval)=@_;
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
if ($env{'request.state'} eq 'construct' && $id =~ /([._]|[^\w\d\s[:punct:]])/) {
- &error(&mt("ID "[_1]" contains invalid characters, IDs are only allowed to contain letters, numbers, spaces and -",'<tt>'.$id.'</tt>'));
+ &error(&mt('ID [_1] contains invalid characters. IDs are only allowed to contain letters, numbers, spaces and -','"<tt>'.$id.'</tt>"'));
}
if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
return $id;
@@ -1544,20 +1547,30 @@ sub renderingoptions {
= &Apache::loncommon::plainlanguagedescription($_);
}
}
- return
- '<span class="LC_nobreak">'.
- &mt('Language:').' '.
- &Apache::loncommon::select_form($env{'form.languages'},'languages',
- %langchoices).'
- </span>
- <span class="LC_nobreak">'.
+ my $output;
+ unless ($env{'form.forceedit'}) {
+ $output .=
+ '<span class="LC_nobreak">'.
+ &mt('Language:').' '.
+ &Apache::loncommon::select_form(
+ $env{'form.languages'},
+ 'languages',
+ &Apache::lonlocal::texthash(%langchoices)).
+ '</span>';
+ }
+ $output .=
+ ' <span class="LC_nobreak">'.
&mt('Math Rendering:').' '.
- &Apache::loncommon::select_form($env{'form.texengine'},'texengine',
- ('' => '',
- 'tth' => 'tth (TeX to HTML)',
- 'jsMath' => 'jsMath',
- 'mimetex' => 'mimetex (Convert to Images)')).'
- </span>';
+ &Apache::loncommon::select_form(
+ $env{'form.texengine'},
+ 'texengine',
+ &Apache::lonlocal::texthash
+ ('' => '',
+ 'tth' => 'tth (TeX to HTML)',
+ 'jsMath' => 'jsMath',
+ 'mimetex' => 'mimetex (Convert to Images)')).
+ '</span>';
+ return $output;
}
sub inserteditinfo {
@@ -1604,7 +1617,7 @@ FULLPAGE
}
</script>
FULLPAGE
- if ($filetype eq 'html') {
+ if ($filetype eq 'html' || $filetype eq 'tex') {
$initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup');
$dragmath_button = &Apache::lonhtmlcommon::dragmath_button('filecont',1);
}
@@ -1618,6 +1631,7 @@ FULLPAGE
}
my $titledisplay=&display_title();
+ my $wysiwyglink;
my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit',
'vi' => 'Save and View',
'dv' => 'Discard Edits and View',
@@ -1632,6 +1646,13 @@ FULLPAGE
if ($htmlerror) {
$htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
}
+ if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+ if (&Apache::lonhtmlcommon::htmlareablocked()) {
+ $wysiwyglink = &Apache::lonhtmlcommon::enablelink($textarea_id);
+ } else {
+ $wysiwyglink = &Apache::lonhtmlcommon::disablelink($textarea_id);
+ }
+ }
}
my $editfooter=(<<ENDFOOTER);
$initialize
@@ -1656,6 +1677,7 @@ $initialize
</div>
<textarea $textarea_events style="width:100%" cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>
<div id="LC_aftertextarea">
+ $wysiwyglink
<br />
$titledisplay
</div>
@@ -1704,18 +1726,46 @@ sub handler {
$request->set_last_modified(&Apache::lonnet::metadata($request->uri,
'lastrevisiondate'));
}
+ # Embedded Flash movies from Camtasia served from https will not display in IE
+ # if XML config file has expired from cache.
+ if ($ENV{'SERVER_PORT'} == 443) {
+ if ($request->uri =~ /\.xml$/) {
+ my ($httpbrowser,$clientbrowser) =
+ &Apache::loncommon::decode_user_agent($request);
+ if ($clientbrowser =~ /^explorer$/i) {
+ delete $request->headers_out->{'Cache-control'};
+ delete $request->headers_out->{'Pragma'};
+ my $expiration = time + 60;
+ my $date=strftime("%a, %d %b %Y %H:%M:%S GMT",gmtime($expiration));
+ $request->headers_out->set("Expires" => $date);
+ }
+ }
+ }
$request->send_http_header;
return OK if $request->header_only;
my $file=&Apache::lonnet::filelocation("",$request->uri);
- my $filetype;
- if ($file =~ /\.(sty|css|js|txt)$/) {
+ my ($filetype,$breadcrumbtext);
+ if ($file =~ /\.(sty|css|js|txt|tex)$/) {
$filetype=$1;
} else {
$filetype='html';
}
+ if ($filetype eq 'sty') {
+ $breadcrumbtext = 'Style File Editor';
+ } elsif ($filetype eq 'js') {
+ $breadcrumbtext = 'Javascript Editor';
+ } elsif ($filetype eq 'css') {
+ $breadcrumbtext = 'CSS Editor';
+ } elsif ($filetype eq 'txt') {
+ $breadcrumbtext = 'Text Editor';
+ } elsif ($filetype eq 'tex') {
+ $breadcrumbtext = 'TeX Editor';
+ } else {
+ $breadcrumbtext = 'HTML Editor';
+ }
#
# Edit action? Save file.
@@ -1735,10 +1785,13 @@ sub handler {
if ($filecontents eq -1) {
my $start_page=&Apache::loncommon::start_page('File Error');
my $end_page=&Apache::loncommon::end_page();
- my $fnf=&mt('File not found');
+ my $errormsg='<p class="LC_error">'
+ .&mt('File not found: [_1]'
+ ,'<span class="LC_filename">'.$file.'</span>')
+ .'</p>';
$result=(<<ENDNOTFOUND);
$start_page
-<b>$fnf: $file</b>
+$errormsg
$end_page
ENDNOTFOUND
$filecontents='';
@@ -1747,7 +1800,7 @@ ENDNOTFOUND
$filecontents=&createnewsty();
} elsif ($filetype eq 'js') {
$filecontents=&createnewjs();
- } elsif (($filetype ne 'css') && ($filetype ne 'txt')) {
+ } elsif ($filetype ne 'css' && $filetype ne 'txt' && $filetype ne 'tex') {
$filecontents=&createnewhtml();
}
$env{'form.editmode'}='Edit'; #force edit mode
@@ -1771,18 +1824,31 @@ ENDNOTFOUND
# up if it did
&Apache::structuretags::reset_problem_globals();
&Apache::lonhomework::finished_parsing();
+ } elsif ($filetype eq 'tex') {
+ $result = &Apache::lontexconvert::converted(\$filecontents,
+ $env{'form.texengine'});
+ if ($env{'form.return_only_error_and_warning_counts'}) {
+ if (&verify_html('<html><body>'.$result.'</body></html>')) {
+ $errorcount++;
+ }
+ $result = "$errorcount:$warningcount";
+ }
} else {
$result = $filecontents;
}
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['rawmode']);
if ($env{'form.rawmode'}) { $result = $filecontents; }
- if ($filetype ne 'html') {
- my $nochgview = 1;
- my $controls =
- ($env{'request.state'} eq 'construct') ? &Apache::londefdef::edit_controls($nochgview)
- : '';
- if ($filetype ne 'sty') {
+ if (($filetype ne 'html') &&
+ (!$env{'form.return_only_error_and_warning_counts'})) {
+ my $nochgview = 1;
+ my $controls = '';
+ if ($env{'request.state'} eq 'construct') {
+ $controls = &Apache::loncommon::head_subbox(
+ &Apache::loncommon::CSTR_pageheader()
+ .&Apache::londefdef::edit_controls($nochgview));
+ }
+ if ($filetype ne 'sty' && $filetype ne 'tex') {
$result =~ s/</</g;
$result =~ s/>/>/g;
$result = '<table class="LC_sty_begin">'.
@@ -1790,17 +1856,27 @@ ENDNOTFOUND
'</pre></b></td></tr></table>';
}
if ($env{'environment.remote'} eq 'off') {
- my %options = ('bgcolor' => '#FFFFFF');
- $result =
- &Apache::loncommon::start_page(undef,undef,\%options).
- $controls.
- $result.
- &Apache::loncommon::end_page();
+ my $brcrum;
+ if ($env{'request.state'} eq 'construct') {
+ $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+ 'text' => 'Construction Space'},
+ {'href' => '',
+ 'text' => $breadcrumbtext}];
+ } else {
+ $brcrum = ''; # FIXME: Where are we?
+ }
+ my %options = ('bread_crumbs' => $brcrum,
+ 'bgcolor' => '#FFFFFF');
+ $result =
+ &Apache::loncommon::start_page(undef,undef,\%options)
+ .$controls
+ .$result
+ .&Apache::loncommon::end_page();
} else {
$result = $controls.$result;
}
}
- }
+ }
}
#
@@ -1817,9 +1893,18 @@ ENDNOTFOUND
my %options =
('add_entries' =>
- {'onresize' => $add_to_onresize,
- 'onload' => $add_to_onload, });
-
+ {'onresize' => $add_to_onresize,
+ 'onload' => $add_to_onload, });
+ my $header;
+ if ($env{'request.state'} eq 'construct') {
+ $options{'bread_crumbs'} = [{
+ 'href' => &Apache::loncommon::authorspace(),
+ 'text' => 'Construction Space'},
+ {'href' => '',
+ 'text' => $breadcrumbtext}];
+ $header = &Apache::loncommon::head_subbox(
+ &Apache::loncommon::CSTR_pageheader());
+ }
if ($env{'environment.remote'} ne 'off') {
$options{'bgcolor'} = '#FFFFFF';
$options{'only_body'} = 1;
@@ -1829,14 +1914,15 @@ ENDNOTFOUND
&Apache::loncommon::resize_textarea_js();
my $start_page = &Apache::loncommon::start_page(undef,$js,
\%options);
- $result=$start_page.
- &Apache::lonxml::message_location().
- $edit_info.
- &Apache::loncommon::end_page();
+ $result = $start_page
+ .$header
+ .&Apache::lonxml::message_location()
+ .$edit_info
+ .&Apache::loncommon::end_page();
}
}
if ($filetype eq 'html') { &writeallows($request->uri); }
-
+
&Apache::lonxml::add_messages(\$result);
$request->print($result);
@@ -2205,24 +2291,20 @@ sub get_tag {
=pod
-=item &print_pdf_radiobutton(fieldname, value, text)
+=item &print_pdf_radiobutton(fieldname, value)
-Returns a latexline to generate a PDF-Form-Radiobutton with Text.
+Returns a latexline to generate a PDF-Form-Radiobutton.
+Note: Radiobuttons with equal names are automaticly grouped
+ in a selection-group.
-$fieldname: PDF internalname of the radiobutton
-$value: Value of radiobutton (read when dumping the PDF data)
-$text: Text on the rightside of the radiobutton
+$fieldname: PDF internalname of the radiobutton(group)
+$value: Value of radiobutton
=cut
sub print_pdf_radiobutton {
- my $result = '';
- my ($fieldName, $value, $text) = @_;
- $result .= '\begin{tabularx}{\textwidth}{p{0cm}X}'."\n";
- $result .= '\radioButton[\symbolchoice{circle}]{'.
- $fieldName.'}{10bp}{10bp}{'.$value.'}&'.$text."\n";
- $result .= '\end{tabularx}' . "\n";
- $result .= '\hspace{2mm}' . "\n";
- return $result;
+ my ($fieldname, $value) = @_;
+ return '\radioButton[\symbolchoice{circle}]{'
+ .$fieldname.'}{10bp}{10bp}{'.$value.'}';
}