version 1.127, 2003/07/25 02:04:51
|
version 1.131, 2003/08/21 17:07:57
|
Line 718 sub fix_ids_and_indices {
|
Line 718 sub fix_ids_and_indices {
|
} |
} |
if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; } |
if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; } |
$outstring.='<'.$tag.$newparmstring.$endtag.'>'; |
$outstring.='<'.$tag.$newparmstring.$endtag.'>'; |
if ($lctag eq 'm') { |
if ($lctag eq 'm' || $lctag eq 'script' |
$outstring.=&get_all_text_unbalanced('/m',\@parser); |
|| $lctag eq 'display' || $lctag eq 'tex') { |
|
$outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser); |
} |
} |
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
if ($token->[2]) { |
if ($token->[2]) { |
Line 1744 unless ($ENV{'form.phase'} eq 'two') {
|
Line 1745 unless ($ENV{'form.phase'} eq 'two') {
|
if ($fn=~/\/$/) { |
if ($fn=~/\/$/) { |
# -------------------------------------------------------- This is a directory |
# -------------------------------------------------------- This is a directory |
&publishdirectory($r,$fn,$thisdisfn); |
&publishdirectory($r,$fn,$thisdisfn); |
|
$r->print('<hr><font size="+2">Done</font><br><a href="/priv/' |
|
.$cuname.'/'.$thisdisfn |
|
.'">Return to Directory</a>'); |
|
|
|
|
} else { |
} else { |
# ---------------------- Evaluate individual file, and then output information. |
# ---------------------- Evaluate individual file, and then output information. |
$thisfn=~/\.(\w+)$/; |
$thisfn=~/\.(\w+)$/; |
my $thistype=$1; |
my $thistype=$1; |
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
|
|
$r->print('<h2>Publishing '. |
$r->print('<h2>Publishing '. |
&Apache::loncommon::filedescription($thistype).' <tt>'. |
&Apache::loncommon::filedescription($thistype).' <tt>'); |
'<a href="/~'.$cuname.'/'.$thisdisfn.'" target="cat">'.$thisdisfn. |
|
'</a></tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><br />'); |
$r->print(<<ENDCAPTION); |
|
<a href='javascript:void(window.open("/~$cuname/$thisdisfn","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'> |
|
$thisdisfn</a> |
|
ENDCAPTION |
|
$r->print( |
|
'</tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><br />'); |
|
|
if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) { |
if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) { |
$r->print('<h3><font color="red">Co-Author: '.$cuname.' at '.$cudom. |
$r->print('<h3><font color="red">Co-Author: '.$cuname.' at '.$cudom. |
Line 1762 unless ($ENV{'form.phase'} eq 'two') {
|
Line 1771 unless ($ENV{'form.phase'} eq 'two') {
|
} |
} |
|
|
if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') { |
if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') { |
$r->print('<br /><a href="/adm/diff?filename=/~'.$cuname.'/'. |
$r->print(<<ENDDIFF); |
$thisdisfn. |
<br /> |
'&versiontwo=priv" target="cat">Diffs with Current Version</a><br />'); |
<a href='javascript:void(window.open("/adm/diff?filename=/~$cuname/$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>Diffs with Current Version</a><br /> |
|
ENDDIFF |
} |
} |
|
|
# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle. |
# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle. |