--- loncom/xml/lonxml.pm 2013/03/18 00:04:27 1.531.2.6
+++ loncom/xml/lonxml.pm 2013/05/12 13:32:16 1.531.2.8
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.531.2.6 2013/03/18 00:04:27 raeburn Exp $
+# $Id: lonxml.pm,v 1.531.2.8 2013/05/12 13:32:16 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1629,12 +1629,32 @@ sub inserteditinfo {
// ]]>
FULLPAGE
+ my $textareaclass;
if ($filetype eq 'html') {
- if ($symb || $folderpath) {
- $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
- $initialize .=
- &Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle,
- undef,$folderpath,$uri)."\n";
+ my $context;
+ if ($env{'request.course.id'}) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ 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 = ''.&Apache::lonhtmlcommon::dragmath_button('filecont',1).'';
$initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup');
@@ -1647,7 +1667,6 @@ FULLPAGE
}
my $titledisplay=&display_title();
- my $textareaclass;
my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit',
'vi' => 'Save and View',
'dv' => 'Discard Edits and View',
@@ -1663,7 +1682,9 @@ FULLPAGE
$htmlerror=''.$htmlerror.'';
}
if (&Apache::lonhtmlcommon::htmlareabrowser()) {
- $textareaclass = 'class="LC_richDefaultOff"';
+ unless ($textareaclass) {
+ $textareaclass = 'class="LC_richDefaultOff"';
+ }
}
}
my $editfooter=(<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') {
$breadcrumbtext = 'Style File Editor';
} elsif ($filetype eq 'js') {
@@ -1898,17 +1932,25 @@ ENDNOTFOUND
$displayfile=$request->uri;
if ($request->uri =~ m{^/uploaded/}) {
if ($env{'request.course.id'}) {
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/\Esupplemental/}) {
+ if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/supplemental/\E}) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['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) =
- &get_courseupload_hierarchy($request->uri,
- $env{'form.folderpath'},$env{'form.title'});
+ unless ($itemtitle) {
+ ($symb,$itemtitle,$displayfile) =
+ &get_courseupload_hierarchy($request->uri,
+ $env{'form.folderpath'},
+ $env{'form.title'});
+ }
} else {
$displayfile=~s/^\/[^\/]*//;
}