version 1.370, 2007/06/26 01:20:35
|
version 1.376, 2007/09/10 19:50:20
|
Line 448 sub start_meta {
|
Line 448 sub start_meta {
|
if ((not defined $content) && (not defined $name)) { |
if ((not defined $content) && (not defined $name)) { |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
} |
} |
|
} elsif ($target eq 'edit') { |
|
$currentstring .= &Apache::edit::tag_start($target,$token); |
|
$currentstring .= &Apache::edit::text_arg('Name:','name',$token,30); |
|
$currentstring .= &Apache::edit::text_arg('Content:','content',$token,70); |
|
$currentstring .= &Apache::edit::end_row(); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag = |
|
&Apache::edit::get_new_args($token,$parstack,$safeeval, |
|
'name','content'); |
|
if ($constructtag) { $currentstring = &Apache::edit::rebuild_tag($token); } |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 471 sub end_meta {
|
Line 481 sub end_meta {
|
return $currentstring; |
return $currentstring; |
} |
} |
|
|
|
sub insert_meta { |
|
return ' |
|
<meta />'; |
|
} |
|
|
# accessrule |
# accessrule |
sub start_accessrule { |
sub start_accessrule { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
my $eff=&Apache::lonxml::get_param |
my $eff =&Apache::lonxml::get_param('effect',$parstack,$safeeval,undef,1); |
('effect',$parstack,$safeeval,undef,1); |
my $realm=&Apache::lonxml::get_param('realm', $parstack,$safeeval,undef,1); |
my $realm=&Apache::lonxml::get_param |
my $role =&Apache::lonxml::get_param('role', $parstack,$safeeval,undef,1); |
('realm',$parstack,$safeeval,undef,1); |
my $type =&Apache::lonxml::get_param('type', $parstack,$safeeval,undef,1); |
my $role=&Apache::lonxml::get_param |
|
('role',$parstack,$safeeval,undef,1); |
my ($dom,$crs,$sec,$separator); |
my ($dom,$crs,$sec)=split(/\_/,$realm); |
|
$dom = &LONCAPA::clean_domain($dom); |
|
my $type=&Apache::lonxml::get_param |
|
('type',$parstack,$safeeval,undef,1); |
|
if ($type eq 'user') { |
if ($type eq 'user') { |
|
($dom,$crs,$sec)=split(m{/},$realm); |
$crs = &LONCAPA::clean_username($crs); |
$crs = &LONCAPA::clean_username($crs); |
|
$separator = '/'; |
} else { |
} else { |
|
($dom,$crs,$sec)=split(/\_/,$realm); |
$crs = &LONCAPA::clean_courseid($crs); |
$crs = &LONCAPA::clean_courseid($crs); |
|
$separator = '_'; |
} |
} |
|
$dom = &LONCAPA::clean_domain($dom); |
|
|
$sec =~s/\W//; |
$sec =~s/\W//; |
$realm = $dom; |
$realm = $dom; |
if ($crs =~ /\S/) { $realm .= '_'.$crs; } |
if ($crs =~ /\S/) { $realm .= $separator.$crs; } |
if ($sec =~ /\S/) { $realm .= '_'.$sec; } |
if ($sec =~ /\S/) { $realm .= $separator.$sec; } |
$role=~s/\W//g; |
$role=~s/\W//g; |
|
|
if ($target eq 'web') { |
if ($target eq 'web') { |
Line 561 sub start_body {
|
Line 578 sub start_body {
|
'force_register' => 1}); |
'force_register' => 1}); |
|
|
if ($env{'request.state'} ne 'published') { |
if ($env{'request.state'} ne 'published') { |
$currentstring.=&Apache::lonmenu::constspaceform(); |
|
$currentstring.=(<<EDITBUTTON); |
|
<form method="post"> |
|
<input type="submit" name="editmode" accesskey="e" value="Edit" /> |
|
</form> |
|
<br /> |
|
EDITBUTTON |
|
} |
} |
$currentstring.=&Apache::lonxml::message_location(); |
$currentstring.=&Apache::lonxml::message_location(); |
|
$currentstring.=&Apache::londefdef::edit_controls(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring = '\begin{document}'; |
$currentstring = '\begin{document}'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
|
sub edit_controls { |
|
my $result = &Apache::lonmenu::constspaceform(); |
|
$result .= (<<EDITBUTTON); |
|
<form method="post"> |
|
<input type="submit" name="editmode" accesskey="e" value="Edit" /> |
|
</form> |
|
<br /> |
|
EDITBUTTON |
|
return $result; |
|
} |
|
|
sub end_body { |
sub end_body { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = &end_p(); # Close off unclosed <p> |
my $currentstring = &end_p(); # Close off unclosed <p> |
Line 1251 sub start_br {
|
Line 1274 sub start_br {
|
$signal = 1; |
$signal = 1; |
} |
} |
} |
} |
if ($signal eq 1) { |
if ($signal != 1) { |
$currentstring .= ' \vskip 0 mm '; |
|
} else { |
|
$currentstring .= '\strut \\\\ \strut '; |
$currentstring .= '\strut \\\\ \strut '; |
} |
} |
|
|
Line 2066 sub end_table {
|
Line 2087 sub end_table {
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
|
my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); |
my $inmemory = ''; |
my $inmemory = ''; |
my $output = ''; |
my $output = ''; |
my $WARNING=''; |
my $WARNING=''; |
Line 2258 sub end_table {
|
Line 2280 sub end_table {
|
for (my $i=0;$i<=$#fwidth;$i++) { |
for (my $i=0;$i<=$#fwidth;$i++) { |
$current+=$fwidth[$i]; |
$current+=$fwidth[$i]; |
} |
} |
|
if ($current == 0) { |
|
$current = $Apache::londefdef::table[-1]{'width'}; |
|
} |
my $coef=$Apache::londefdef::table[-1]{'width'}/$current; |
my $coef=$Apache::londefdef::table[-1]{'width'}/$current; |
for (my $i=0;$i<=$#fwidth;$i++) { |
for (my $i=0;$i<=$#fwidth;$i++) { |
$fwidth[$i]*=$coef; |
$fwidth[$i]*=$coef; |
Line 2310 sub end_table {
|
Line 2335 sub end_table {
|
# Do the appropriate magic if this has a colspan |
# Do the appropriate magic if this has a colspan |
# |
# |
|
|
|
my $border_char = ""; |
|
if ($border) { |
|
$border_char = "|"; |
|
} |
my $spanwidth = 0; |
my $spanwidth = 0; |
if ($colspan > 1) { |
if ($colspan > 1) { |
for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) { |
for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) { |
Line 2319 sub end_table {
|
Line 2348 sub end_table {
|
$colspan |
$colspan |
."}"; |
."}"; |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
$output .= '{|c|}{'; |
$output .= '{'.$border_char.'c'.$border_char.'}{'; |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
$output .= '{|r|}{'; |
$output .= '{'.$border_char.'r'.$border_char.'}{'; |
} |
} |
else { |
else { |
$output .= "{|p{$spanwidth mm}|}{"; |
$output .= '{'.$border_char."p{$spanwidth mm}".$border_char.'}{'; |
} |
} |
|
|
} else { |
} else { |
Line 2340 sub end_table {
|
Line 2369 sub end_table {
|
if ($rowspan > 1) { |
if ($rowspan > 1) { |
if ($colspan == 1) { |
if ($colspan == 1) { |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
$output .= '\multicolumn{1}{|c|}{'; |
$output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{'; |
$multirow_aligned = 1; |
$multirow_aligned = 1; |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
$output .= '\multicolumn{1}{|r|}{'; |
$output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{'; |
$multirow_aligned = 1; |
$multirow_aligned = 1; |
} |
} |
} |
} |
Line 2380 sub end_table {
|
Line 2409 sub end_table {
|
# |
# |
if ($colspan == 1 && $rowspan == 1) { |
if ($colspan == 1 && $rowspan == 1) { |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
$output .= '\multicolumn{1}{|c|}{'; |
$output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{'; |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
$output .= '\multicolumn{1}{|r|}{'; |
$output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{'; |
} |
} |
} |
} |
|
|