--- loncom/xml/londefdef.pm 2023/12/29 23:33:43 1.456.2.6.2.3 +++ loncom/xml/londefdef.pm 2016/08/13 19:02:00 1.461 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.456.2.6.2.3 2023/12/29 23:33:43 raeburn Exp $ +# $Id: londefdef.pm,v 1.461 2016/08/13 19:02:00 raeburn Exp $ # # # Copyright Michigan State University Board of Trustees @@ -98,19 +98,7 @@ sub start_m { # On top of that, MathJax will render math without $, but # it will fail with tth. This is worth a warning. # (even though some people might just use latex for printing) - &Apache::lonxml::warning(&mt('Missing $ in [_1].','<m>')); - } elsif (($env{'browser.type'} eq 'safari') && ($env{'form.editxmltext'}) && - (($env{'form.problemmode'} eq 'view') || ($env{'form.problemmode'} eq 'discard'))) { - my $delimiter; - if ($inside =~ /\$$/) { - $delimiter = '$'; - } elsif ($inside =~ /\\([)\]])$/) { - $delimiter = $1; - } - if ($delimiter) { - &Apache::lonxml::warning(&mt('Insert a space between [_1] and [_2].', - $delimiter,'</m>')); - } + &Apache::lonxml::warning(&mt("Missing \$ in <m>.")); } my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); if ($eval eq 'on') { @@ -367,7 +355,7 @@ sub start_title { $Apache::londefdef::title = &Apache::lonxml::get_all_text('/title',$parser,$style); } elsif ($target eq 'tex') { - $currentstring .= '\keephidden{Title of the document: '; + $currentstring .= '\keephidden{Title of the document: ' } if ($target eq 'meta') { $currentstring=''; @@ -612,9 +600,6 @@ sub start_body { if ($env{'request.use_absolute'}) { $args->{'use_absolute'} = $env{'request.use_absolute'}; } - if ($env{'form.only_body'}) { - $args->{'only_body'} = 1; - } } $currentstring = &Apache::loncommon::start_page($Apache::londefdef::title, @@ -649,9 +634,9 @@ sub start_body { sub edit_controls { my ($nochgview) = @_; - my $result = &Apache::lonxml::seteditor_javascript().' + my $result .= ' <form method="post" action=""> -<div class="LC_edit_problem_header">'."\n"; +<div class="LC_edit_problem_header">'; unless ($nochgview) { $result .= ' <div class="LC_edit_problem_header_row1">'. @@ -660,10 +645,13 @@ sub edit_controls { </div>'; } $result .= ' -<div> -<input type="hidden" name="editmode" value="" /> -<input type="button" name="editordefault" accesskey="e" value="'.&mt('Edit'). -'" onclick="seteditmode(this.form,'."'edit'".');" />'."\n"; +<div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />'; + if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) { + my $uri = $env{'request.uri'}; + my $daxeurl = '/daxepage'.$uri; + $result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '. + 'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />'; + } if (($env{'request.course.id'}) && ($env{'form.forceedit'})) { my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); if ($url =~ /\.html?$/i) { @@ -838,7 +826,7 @@ sub end_h1 { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { my $post='\vskip 0 mm '; - my $align=lc(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1)); + my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); if ($align eq 'center') { $post='\end{center}'; } elsif ($align eq 'left') { @@ -2884,8 +2872,8 @@ sub start_img { my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures')); $currentstring .=&Apache::edit::tag_start($target,$token); $currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70). - &Apache::edit::browse('src',undef,'alt',$only).' '. - &Apache::edit::search('src',undef,'alt').'<br />'; + &Apache::edit::browse_or_search('src',undef,'alt',$only,undef,1). + '<br />'; $currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />'; $currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5); $currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />'; @@ -2907,17 +2895,19 @@ sub start_img { my $src= &Apache::lonxml::get_param('src',$parstack,$safeeval); my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval); my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); - + my $element = &Apache::edit::get_element('src'); + my $text; if ($token->[2]{'src'}=~/\$/) { - $currentstring.=&mt('Variable image source'); + $text = &mt('Variable image source'); } elsif ($token->[2]{'src'}=~/\S/) { $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" '; if ($width) { $currentstring.=' width="'.$width.'" '; } if ($height) { $currentstring.=' height="'.$height.'" '; } - $currentstring .= ' />'; + $currentstring .= ' id="previewimg_'.$element.'" />'; } else { - $currentstring.=&mt("No image source specified"); + $text = &mt("No image source specified"); } + $currentstring .= ' <span id="showimg_'.$element.'">'.$text.'</span>'; } elsif ($target eq 'modified') { my ($osrc,$owidth,$oheight)= ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); @@ -3273,12 +3263,12 @@ sub end_externallink { return $currentstring; } -#-- <blankspace height=""> +#-- <blankspace heigth=""> sub start_blankspace { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = &end_p(); # closes off any unclosed <p> if ($target eq 'tex') { - my $howmuch = &Apache::lonxml::get_param('height',$parstack,$safeeval,undef,1); + my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1); $currentstring .= '\vskip '.$howmuch.' '; } return $currentstring; @@ -4284,10 +4274,10 @@ sub resize_image { $height_param=$TeXwidth/$old_width_param*$height_param; } } elsif ($TeXheight) { + $height_param = $TeXheight; if ($height_param) { $width_param = $TeXheight/$height_param*$width_param; } - $height_param = $TeXheight; } elsif ($width) { my $old_width_param=$width_param; $width_param = $width*$scaling; @@ -4604,8 +4594,7 @@ sub latex_header { '\usepackage{amssymb}'."\n". '\usepackage{amsfonts}'."\n". '\usepackage{amsthm}'."\n". - '\usepackage{amscd}'."\n". - '\usepackage{actuarialangle}'."\n"; + '\usepackage{amscd}'."\n"; if($env{'form.pdfFormFields'} eq 'yes') { $currentstring .= '\usepackage{hyperref}'. '\usepackage{eforms}'.