version 1.534, 2012/11/29 20:47:11
|
version 1.540, 2013/05/12 13:05:31
|
Line 1535 sub inserteditinfo {
|
Line 1535 sub inserteditinfo {
|
// ]]> |
// ]]> |
</script> |
</script> |
FULLPAGE |
FULLPAGE |
|
my $textareaclass; |
if ($filetype eq 'html') { |
if ($filetype eq 'html') { |
if ($symb || $folderpath) { |
my $context; |
$deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n"; |
if ($env{'request.course.id'}) { |
$initialize .= |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
&Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle, |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
undef,$folderpath,$uri)."\n"; |
if ($uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E}) { |
|
$context = 'syllabus'; |
|
$deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n"; |
|
$initialize .= |
|
&Apache::lonhtmlcommon::dependencycheck_js(undef,&mt('Syllabus'), |
|
$uri,undef, |
|
"/public/$cdom/$cnum/syllabus"). |
|
"\n"; |
|
if (&Apache::lonhtmlcommon::htmlareabrowser()) { |
|
$textareaclass = 'class="LC_richDefaultOn"'; |
|
} |
|
} |
|
} |
|
unless ($context eq 'syllabus') { |
|
if ($symb || $folderpath) { |
|
$deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n"; |
|
$initialize .= |
|
&Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle, |
|
undef,$folderpath,$uri)."\n"; |
|
} |
} |
} |
$dragmath_button = '<span id="math_filecont">'.&Apache::lonhtmlcommon::dragmath_button('filecont',1).'</span>'; |
$dragmath_button = '<span id="math_filecont">'.&Apache::lonhtmlcommon::dragmath_button('filecont',1).'</span>'; |
$initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup'); |
$initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup'); |
Line 1553 FULLPAGE
|
Line 1573 FULLPAGE
|
} |
} |
|
|
my $titledisplay=&display_title(); |
my $titledisplay=&display_title(); |
my $textareaclass; |
|
my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit', |
my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit', |
'vi' => 'Save and View', |
'vi' => 'Save and View', |
'dv' => 'Discard Edits and View', |
'dv' => 'Discard Edits and View', |
Line 1569 FULLPAGE
|
Line 1588 FULLPAGE
|
$htmlerror='<span class="LC_error">'.$htmlerror.'</span>'; |
$htmlerror='<span class="LC_error">'.$htmlerror.'</span>'; |
} |
} |
if (&Apache::lonhtmlcommon::htmlareabrowser()) { |
if (&Apache::lonhtmlcommon::htmlareabrowser()) { |
$textareaclass = 'class="LC_richDefaultOff"'; |
unless ($textareaclass) { |
|
$textareaclass = 'class="LC_richDefaultOff"'; |
|
} |
} |
} |
} |
} |
my $editfooter=(<<ENDFOOTER); |
my $editfooter=(<<ENDFOOTER); |
Line 1670 sub handler {
|
Line 1691 sub handler {
|
} else { |
} else { |
$filetype='html'; |
$filetype='html'; |
} |
} |
|
unless ($env{'request.uri'}) { |
|
$env{'request.uri'}=$request->uri; |
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
|
['todocs']); |
|
} |
|
my ($cdom,$cnum); |
|
if ($env{'request.course.id'}) { |
|
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
if ($filetype eq 'html') { |
|
if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E.+$}) { |
|
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
|
['editmode']); |
|
} |
|
} |
|
} |
|
} |
if ($filetype eq 'sty') { |
if ($filetype eq 'sty') { |
$breadcrumbtext = 'Style File Editor'; |
$breadcrumbtext = 'Style File Editor'; |
} elsif ($filetype eq 'js') { |
} elsif ($filetype eq 'js') { |
Line 1799 ENDNOTFOUND
|
Line 1838 ENDNOTFOUND
|
$displayfile=$request->uri; |
$displayfile=$request->uri; |
if ($request->uri =~ m{^/uploaded/}) { |
if ($request->uri =~ m{^/uploaded/}) { |
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/supplemental/\E}) { |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/\Esupplemental/}) { |
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['folderpath','title']); |
['folderpath','title']); |
|
} elsif ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) { |
|
my $filename = $1; |
|
if ($1 eq 'loncapa.html') { |
|
$displayfile = &mt('Syllabus (minimal template)'); |
|
} else { |
|
$displayfile = &mt('Syllabus file: [_1]',$1); |
|
} |
|
$itemtitle = &mt('Syllabus'); |
} |
} |
} |
} |
($symb,$itemtitle,$displayfile) = |
unless ($itemtitle) { |
&get_courseupload_hierarchy($request->uri, |
($symb,$itemtitle,$displayfile) = |
$env{'form.folderpath'},$env{'form.title'}); |
&get_courseupload_hierarchy($request->uri, |
|
$env{'form.folderpath'}, |
|
$env{'form.title'}); |
|
} |
} else { |
} else { |
$displayfile=~s/^\/[^\/]*//; |
$displayfile=~s/^\/[^\/]*//; |
} |
} |
Line 1875 sub get_courseupload_hierarchy {
|
Line 1923 sub get_courseupload_hierarchy {
|
while (@folders) { |
while (@folders) { |
my $folder=shift(@folders); |
my $folder=shift(@folders); |
my $foldername=shift(@folders); |
my $foldername=shift(@folders); |
|
$foldername =~ s/\:(\d*)\:(\w*)\:(\w*):(\d*)\:?(\d*)$//; |
push(@pathitems,&unescape($foldername)); |
push(@pathitems,&unescape($foldername)); |
} |
} |
if ($title) { |
if ($title) { |
Line 2050 sub add_messages {
|
Line 2099 sub add_messages {
|
} |
} |
|
|
sub get_param { |
sub get_param { |
my ($param,$parstack,$safeeval,$context,$case_insensitive) = @_; |
my ($param,$parstack,$safeeval,$context,$case_insensitive, $noelide) = @_; |
|
|
if ( ! $context ) { $context = -1; } |
if ( ! $context ) { $context = -1; } |
my $args =''; |
my $args =''; |
if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; } |
if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; } |
if ( ! $Apache::lonxml::usestyle ) { |
if ( ! $Apache::lonxml::usestyle ) { |
$args=$Apache::lonxml::style_values.$args; |
$args=$Apache::lonxml::style_values.$args; |
} |
} |
|
|
|
|
|
if ($noelide) { |
|
# $args =~ s/\\'/'/g; |
|
$args =~ s/'\$/'\\\$/g; |
|
} |
|
|
if ( ! $args ) { return undef; } |
if ( ! $args ) { return undef; } |
if ( $case_insensitive ) { |
if ( $case_insensitive ) { |
if ($args =~ s/(my (?:.*))(\$\Q$param\E[,\)])/$1.lc($2)/ei) { |
if ($args =~ s/(my (?:.*))(\$\Q$param\E[,\)])/$1.lc($2)/ei) { |
|
|
return &Apache::run::run("{$args;".'return $'.$param.'}', |
return &Apache::run::run("{$args;".'return $'.$param.'}', |
$safeeval); #' |
$safeeval); #' |
} else { |
} else { |
Line 2067 sub get_param {
|
Line 2125 sub get_param {
|
} |
} |
} else { |
} else { |
if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) { |
if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) { |
|
|
return &Apache::run::run("{$args;".'return $'.$param.'}', |
return &Apache::run::run("{$args;".'return $'.$param.'}', |
$safeeval); #' |
$safeeval); #' |
} else { |
} else { |