version 1.456.2.4, 2019/05/17 15:41:32
|
version 1.460, 2016/08/09 23:43:38
|
Line 646 sub edit_controls {
|
Line 646 sub edit_controls {
|
} |
} |
$result .= ' |
$result .= ' |
<div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />'; |
<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'})) { |
if (($env{'request.course.id'}) && ($env{'form.forceedit'})) { |
my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); |
my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); |
if ($url =~ /\.html?$/i) { |
if ($url =~ /\.html?$/i) { |
Line 820 sub end_h1 {
|
Line 826 sub end_h1 {
|
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $post='\vskip 0 mm '; |
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') { |
if ($align eq 'center') { |
$post='\end{center}'; |
$post='\end{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
Line 2866 sub start_img {
|
Line 2872 sub start_img {
|
my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures')); |
my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures')); |
$currentstring .=&Apache::edit::tag_start($target,$token); |
$currentstring .=&Apache::edit::tag_start($target,$token); |
$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70). |
$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70). |
&Apache::edit::browse('src',undef,'alt',$only).' '. |
&Apache::edit::browse_or_search('src',undef,'alt',$only,undef,1). |
&Apache::edit::search('src',undef,'alt').'<br />'; |
'<br />'; |
$currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<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('width (pixel):','width',$token,5); |
$currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />'; |
$currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />'; |
Line 2889 sub start_img {
|
Line 2895 sub start_img {
|
my $src= &Apache::lonxml::get_param('src',$parstack,$safeeval); |
my $src= &Apache::lonxml::get_param('src',$parstack,$safeeval); |
my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval); |
my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval); |
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); |
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); |
|
my $element = &Apache::edit::get_element('src'); |
|
my $text; |
if ($token->[2]{'src'}=~/\$/) { |
if ($token->[2]{'src'}=~/\$/) { |
$currentstring.=&mt('Variable image source'); |
$text = &mt('Variable image source'); |
} elsif ($token->[2]{'src'}=~/\S/) { |
} elsif ($token->[2]{'src'}=~/\S/) { |
$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" '; |
$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" '; |
if ($width) { $currentstring.=' width="'.$width.'" '; } |
if ($width) { $currentstring.=' width="'.$width.'" '; } |
if ($height) { $currentstring.=' height="'.$height.'" '; } |
if ($height) { $currentstring.=' height="'.$height.'" '; } |
$currentstring .= ' />'; |
$currentstring .= ' id="previewimg_'.$element.'" />'; |
} else { |
} else { |
$currentstring.=&mt("No image source specified"); |
$text = &mt("No image source specified"); |
} |
} |
|
$currentstring .= ' <span id="showimg_'.$element.'">'.$text.'</span>'; |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my ($osrc,$owidth,$oheight)= |
my ($osrc,$owidth,$oheight)= |
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
Line 4560 sub latex_header {
|
Line 4568 sub latex_header {
|
($mode eq 'batchmode')) {$currentstring .='\batchmode';} |
($mode eq 'batchmode')) {$currentstring .='\batchmode';} |
$currentstring .= '\newcommand{\keephidden}[1]{}'. |
$currentstring .= '\newcommand{\keephidden}[1]{}'. |
'\renewcommand{\deg}{$^{\circ}$}'. |
'\renewcommand{\deg}{$^{\circ}$}'. |
'\usepackage{multirow}'."\n". |
'\usepackage{multirow}'. |
'\usepackage{longtable}'."\n". |
'\usepackage{longtable}'. |
'\usepackage{textcomp}'."\n". |
'\usepackage{textcomp}'. |
'\usepackage{makeidx}'."\n". |
'\usepackage{makeidx}'. |
'\usepackage[dvips]{graphicx}'."\n". |
'\usepackage[dvips]{graphicx}'. |
'\usepackage{wrapfig}'."\n". |
'\usepackage{wrapfig}'. |
'\usepackage{picins}'."\n". |
'\usepackage{picins}'. |
'\usepackage[T1]{fontenc}'."\n". |
'\usepackage[T1]{fontenc}'."\n". |
'\usepackage{lmodern}'."\n". |
'\usepackage{lmodern}'."\n". |
'\usepackage[postscript]{ucs}'."\n". |
'\usepackage[postscript]{ucs}'."\n". |
'\usepackage[utf8x]{inputenc}'."\n". |
'\usepackage[utf8x]{inputenc}'."\n". |
'\usepackage{pifont}'."\n". |
'\usepackage{pifont}' ."\n". |
'\usepackage{latexsym}'."\n". |
'\usepackage{latexsym}'."\n". |
'\usepackage{epsfig}'."\n". |
'\usepackage{epsfig}'. |
'\usepackage{xtab}'."\n". |
"\\usepackage{xtab}\n". |
'\usepackage{tabularx}'."\n". |
"\\usepackage{tabularx}\n". |
'\usepackage{booktabs}'."\n". |
"\\usepackage{booktabs}\n". |
'\usepackage{array}'."\n". |
"\\usepackage{array}\n". |
'\usepackage{colortbl}'."\n". |
"\\usepackage{colortbl}\n". |
'\usepackage{xcolor}'."\n". |
"\\usepackage{xcolor}\n". |
'\usepackage{calc}'."\n". |
'\usepackage{calc}'. |
'\usepackage{amsmath}'."\n". |
'\usepackage{amsmath}'. |
'\usepackage{soul}'."\n". |
'\usepackage{soul}'. |
'\usepackage{amssymb}'."\n". |
'\usepackage{amssymb}'. |
'\usepackage{amsfonts}'."\n". |
'\usepackage{amsfonts}'. |
'\usepackage{amsthm}'."\n". |
'\usepackage{amsthm}'. |
'\usepackage{amscd}'."\n". |
'\usepackage{amscd}' |
'\usepackage{actuarialangle}'."\n"; |
.'\usepackage{picins}\usepackage{calc}'."\n". # From lonprintout.pm |
|
'\usepackage[T1]{fontenc}'."\n". |
|
'\usepackage{lmodern}'."\n". |
|
'\usepackage[postscript]{ucs}'."\n". |
|
'\usepackage[utf8x]{inputenc}'."\n". |
|
'\usepackage{pifont}' . "\n"; |
|
|
if($env{'form.pdfFormFields'} eq 'yes') { |
if($env{'form.pdfFormFields'} eq 'yes') { |
$currentstring .= '\usepackage{hyperref}'. |
$currentstring .= '\usepackage{hyperref}'. |
'\usepackage{eforms}'. |
'\usepackage{eforms}'. |