--- loncom/interface/lonsyllabus.pm 2012/10/04 13:41:10 1.112
+++ loncom/interface/lonsyllabus.pm 2013/04/24 02:43:59 1.117
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.112 2012/10/04 13:41:10 bisitz Exp $
+# $Id: lonsyllabus.pm,v 1.117 2013/04/24 02:43:59 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -52,7 +52,8 @@ sub handler {
my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
# ------------------------------------------------------------ Get query string
&Apache::loncommon::get_unprocessed_cgi
- ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit']);
+ ($ENV{'QUERY_STRING'},['register','forceedit','todocs',
+ 'folderpath','title']);
# ----------------------------------------------------- Is this even a course?
my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
if ($homeserver eq 'no_host') {
@@ -61,6 +62,12 @@ sub handler {
&Apache::loncommon::simple_error_page($r,'No syllabus available',
'No syllabus available');
return OK;
+ } elsif (!&Apache::lonnet::is_course($cdom,$cnum)) {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ &Apache::loncommon::simple_error_page($r,'No syllabus available',
+ 'The course/community for which the syllabus was requested does not exist.');
+ return OK;
}
# ------------------------------------- There is such a course, get environment
my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
@@ -70,12 +77,70 @@ sub handler {
if ($target eq 'tex') {
$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
}
+
+# --------------------------------------------------------------- Force Student
+ my ($forceedit,$forcestudent);
+ if ($env{'form.forceedit'}) { $forceedit=1; }
+ if (!$forceedit) {
+ $forcestudent=1;
+ }
+
+# --------------------------------------------------------------- Check Privileges
+ my $allowed = 0;
+ if ($env{'user.environment'}) {
+# does this user have privileges to post, etc?
+ if ($env{'request.course.id'}
+ && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}
+ && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) {
+ $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+ if ($forcestudent or $target eq 'tex') { $allowed=0; }
+ }
+ }
+
# -------------------------------------------------- Let's see who handles this
- my $externalsyllabus=$courseenv{'externalsyllabus'};
+ my $external=$courseenv{'externalsyllabus'};
+ my $uploaded=$courseenv{'uploadedsyllabus'};
- if ($externalsyllabus=~/\w/) {
- $r->print( Apache::lonwrapper::wrapper($externalsyllabus) );
- return OK;
+ if ($uploaded =~/\w/) {
+ if ($external =~ m{\Q$uploaded\E$}) {
+ undef($external);
+ }
+ unless ($allowed && $forceedit) {
+ my $file=&Apache::lonnet::filelocation("",$uploaded);
+ if ($file =~ /\.(sty|css|js|txt|tex|html?)$/) {
+ my $filetype;
+ if ($file =~ /\.(sty|css|js|txt|tex)$/) {
+ $filetype=$1;
+ } else {
+ $filetype='html';
+ }
+ my $result = '';
+ my $filecontents=&Apache::lonnet::getfile($file);
+ if ($filecontents eq -1) {
+ $r->print(&mt('Syllabus file unavailable'));
+ } elsif ($filetype eq 'html') {
+ my %mystyle;
+ &Apache::structuretags::reset_problem_globals();
+ my $oldfile = $env{'request.filename'};
+ $env{'request.filename'} = $uploaded;
+ $result = &Apache::lonxml::xmlparse($r,'web',$filecontents,
+ '',%mystyle);
+ &Apache::structuretags::reset_problem_globals();
+ &Apache::lonhomework::finished_parsing();
+ $env{'request.filename'} = $oldfile;
+ &Apache::lonxml::add_messages(\$result);
+ $r->print($result);
+ }
+ } else {
+ $r->print(&Apache::lonwrapper::wrapper($uploaded));
+ }
+ return OK;
+ }
+ } elsif ($external=~/\w/) {
+ unless ($allowed && $forceedit) {
+ $r->print(&Apache::lonwrapper::wrapper($external));
+ return OK;
+ }
}
# ------------------------------ The buck stops here: internal syllabus display
@@ -96,12 +161,6 @@ sub handler {
'jjj_weblinks' => 'Web Links',
'kkk_textbook' => 'Textbook',
'lll_includeurl' => 'URLs To Include in Syllabus');
-# --------------------------------------------------------------- Force Student
- my $forcestudent='';
- if ($env{'form.forcestudent'}) { $forcestudent='student'; };
- my $forceedit='';
- if ($env{'form.forceedit'}) { $forceedit='edit'; }
-
# ----------------------------------------------------------------- Make header
if ($target ne 'tex') {
my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
@@ -110,6 +169,8 @@ sub handler {
$js .= <<"ENDSCRIPT";
<script type="text/javascript">
+// <![CDATA[
+
function ToCatalog(caller) {
numidx = getIndexByName('coursenum');
if (numidx > -1) {
@@ -129,55 +190,132 @@ function getIndexByName(item) {
return -1;
}
+// ]]>
</script>
ENDSCRIPT
}
- my $start_page =
- &Apache::loncommon::start_page("Syllabus", $rss_link.$js,
- {'function' => undef,
- 'domain' => $cdom,
- 'force_register' =>
- $env{'form.register'},});
+ if ($allowed && $forceedit) {
+ my $check_uncheck = &Apache::loncommon::check_uncheck_jscript();
+ my $invurl = &mt('Invalid URL');
+ my $urlregexp = <<'ENDREGEXP';
+/^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\(\)\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i
+ENDREGEXP
- $r->print($start_page);
+ $js .= <<"ENDSCRIPT";
+
+<script type="text/javascript">
+// <![CDATA[
+
+function toggleEditor(pick) {
+ var choices = new Array('template','url','file','templatebox');
+ for (var i=0; i<choices.length; i++) {
+ if (((choices[i] == 'templatebox') && (pick == 'template')) ||
+ (choices[i] == pick)) {
+ document.getElementById(choices[i]).style.display='block';
+ } else {
+ document.getElementById(choices[i]).style.display='none';
+ }
+ }
+ return;
+}
+
+var regexp = $urlregexp;
+
+function extUrlPreview(caller) {
+ if (document.getElementById(caller)) {
+ var url = document.getElementById(caller).value;
+ if (regexp.test(url)) {
+ openMyModal(url,500,400,'yes');
+ } else {
+ alert("$invurl");
+ }
+ }
+}
+
+function toggleBox(name,caller) {
+ if (name == 'all') {
+ if (document.syllabus.showfield.length > 0) {
+ for (var i=0; i<document.syllabus.showfield.length; i++) {
+ if (document.syllabus.showfield[i].checked) {
+ if (document.getElementById('box_'+document.syllabus.showfield[i].value)) {
+ document.getElementById('box_'+document.syllabus.showfield[i].value).style.display='block';
+ }
+ } else {
+ if (document.getElementById('box_'+document.syllabus.showfield[i].value)) {
+ document.getElementById('box_'+document.syllabus.showfield[i].value).style.display='none';
+ }
+ }
+ }
+ }
+ } else {
+ if (caller.checked) {
+ if (document.getElementById('box_'+caller.value)) {
+ document.getElementById('box_'+caller.value).style.display='block';
+ }
+ } else {
+ if (document.getElementById('box_'+caller.value)) {
+ document.getElementById('box_'+caller.value).style.display='none';
+ }
+ }
+ }
+ return;
+}
+
+$check_uncheck
+
+// ]]>
+</script>
+
+ENDSCRIPT
+ }
+ my $args = {'function' => undef,
+ 'domain' => $cdom};
+ my $forcereg;
+ if ($env{'form.register'}) {
+ $forcereg = 1;
+ $args->{'force_register'} = $forcereg;
+ }
if ($env{'form.backto'} eq 'coursecatalog') {
&Apache::lonhtmlcommon::clear_breadcrumbs();
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:ToCatalog()",
- text=>"Course/Community Catalog"});
+ my $brcrum = [{href=>"javascript:ToCatalog();",
+ text=>&mt('Course/Community Catalog'),
+ no_mt=>1}
+ ];
if ($env{'form.coursenum'} ne '') {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:ToCatalog('details')",
- text=>"Course details"});
- }
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>$r->uri,
- text=>"Course syllabus"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs());
+ push(@{$brcrum},
+ {href=>"javascript:ToCatalog('details')",
+ text=>"Course details"});
+ }
+ push(@{$brcrum},
+ {href=>$r->uri,
+ text=>"Course syllabus"});
+ $args->{'bread_crumbs'} = $brcrum;
+ } elsif ($env{'form.folderpath'} =~ /^supplemental/) {
+ my $crstype = &Apache::loncommon::course_type();
+ my $title = $env{'form.title'};
+ if ($title eq '') {
+ $title = &mt('Syllabus');
+ }
+ my $brcrum =
+ &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+ if (ref($brcrum) eq 'ARRAY') {
+ $args->{'bread_crumbs'} = $brcrum;
+ }
}
+ my $start_page =
+ &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args);
+ $r->print($start_page);
}
# ---------------------------------------------------------- Load syllabus info
my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);
- my $allowed=0;
- my $privileged=0;
+ my %displayfields;
# This handler might be called anonymously ...
# ----------------------------------------------------- Only if not public call
- if ($env{'user.environment'}) {
-# does this user have privileges to post, etc?
- if ($env{'request.course.id'}
- && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}
- && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) {
- $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
- $privileged=$allowed;
- if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) {
- $forcestudent='student';
- }
- if ($forcestudent or $target eq 'tex') { $allowed=0; }
- }
- #store what the user typed in
- if (($allowed) && ($env{'form.storesyl'})) {
+ if ($allowed) {
+#store what the user typed in to the template
+ if ($env{'form.storesyl'}) {
foreach my $syl_field (keys(%syllabusfields)) {
my $field=$env{'form.'.$syl_field};
chomp($field);
@@ -222,98 +360,231 @@ ENDSCRIPT
$syllabus{'uploaded.name'}=$env{'user.name'};
$syllabus{'uploaded.lastmodified'}=time;
&Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum);
+ my %storehash;
+ if ($courseenv{'uploadedsyllabus'}) {
+ &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
+ $storehash{'uploadedsyllabus'} = '';
+ }
+ if ($courseenv{'externalsyllabus'}) {
+ &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
+ $storehash{'externalsyllabus'} = '';
+ }
+ if ($courseenv{'externalsyllabus'} || $courseenv{'uploadedsyllabus'}) {
+ &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
+ undef($uploaded);
+ undef($external);
+ }
+ } elsif ($env{'form.storeurl'}) {
+ if ($env{'form.externalsyllabus'} =~ m{^https?://}) {
+ if ($env{'form.externalsyllabus'} eq $external) {
+ $r->print('<div class="LC_info">'.
+ &mt('External URL unchanged.').
+ '</div>');
+ if ($uploaded) {
+ my $prefix;
+ my $home=&Apache::lonnet::homeserver($cnum,$cdom);
+ if ($home ne 'no_host') {
+ my $protocol = $Apache::lonnet::protocol{$home};
+ $protocol = 'http' if ($protocol ne 'https');
+ $prefix = $protocol.'://'.&Apache::lonnet::hostname($home);
+ }
+ unless ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus\E}) {
+ &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
+ &Apache::lonnet::put('environment',{uploadedsyllabus => ''},
+ $cdom,$cnum);
+ undef($uploaded);
+ }
+ }
+ } else {
+ $external=$env{'form.externalsyllabus'};
+ $external =~ s/(`)//g;
+ my $putres =
+ &Apache::lonnet::put('environment',{externalsyllabus=>$external},
+ $cdom,$cnum);
+ if ($putres eq 'ok') {
+ &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.externalsyllabus' => $external});
+ $r->print('<div>'.
+ &Apache::lonhtmlcommon::confirm_success(&mt('External URL saved.')).
+ '</div>');
+ if ($uploaded) {
+ my $prefix;
+ my $home=&Apache::lonnet::homeserver($cnum,$cdom);
+ if ($home ne 'no_host') {
+ my $protocol = $Apache::lonnet::protocol{$home};
+ $protocol = 'http' if ($protocol ne 'https');
+ $prefix = $protocol.'://'.&Apache::lonnet::hostname($home);
+ }
+ unless ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus\E}) {
+ &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
+ &Apache::lonnet::put('environment',{uploadedsyllabus => ''},
+ $cdom,$cnum);
+ undef($uploaded);
+ }
+ }
+ } else {
+ $r->print('<div class="LC_error">'.
+ &mt('An error occurred storing the external URL: [_1]',$putres).
+ '</div>');
+ }
+ }
+ } else {
+ $r->print('<div class="LC_error">'.
+ &mt('External URL not saved -- invalid URL.').
+ '</div>');
+ }
+ } elsif ($env{'form.storefile'}) {
+ # Process file upload - phase one - upload and parse primary file.
+ my %allfiles = ();
+ my %codebase = ();
+ my ($upload_result,$upload_output,$uploadphase);
+ if ($env{'form.syllabusfile.filename'}) {
+ my ($url,$needlink) = &process_upload(\$upload_output,$cnum,$cdom,
+ \%allfiles,\%codebase);
+ $r->print($upload_output);
+ if ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E.*/[^/]+$}) {
+ my $exturl;
+ my $home=&Apache::lonnet::homeserver($cnum,$cdom);
+ if ($home ne 'no_host') {
+ my $protocol = $Apache::lonnet::protocol{$home};
+ $protocol = 'http' if ($protocol ne 'https');
+ $exturl = $protocol.'://'.&Apache::lonnet::hostname($home).$url;
+ }
+ my %storehash = (
+ uploadedsyllabus => $url,
+ );
+ if ($exturl) {
+ $storehash{'externalsyllabus'} = $exturl;
+ if ($exturl =~ /\.(html?|txt|js|css)$/) {
+ $exturl .= '?inhibitmenu=yes';
+ }
+ } else {
+ $storehash{'externalsyllabus'} = '',
+ }
+ my $putres =
+ &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
+ if ($putres eq 'ok') {
+ &Apache::lonnet::make_public_indefinitely($url);
+ foreach my $key (keys(%storehash)) {
+ &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$key => $storehash{$key}});
+ }
+ $uploaded = $url;
+ if ($needlink) {
+ $r->print(&return_to_editor($cdom,$cnum).
+ &Apache::loncommon::end_page());
+ return OK;
+ }
+ }
+ }
+ }
+ } elsif ($env{'form.phase'} eq 'upload_embedded') {
+ # Process file upload - phase two - upload embedded objects
+ my $uploadphase = 'check_embedded';
+ my $primaryurl = &HTML::Entities::encode($env{'form.primaryurl'},'<>&"');
+ my $state = &embedded_form_elems($uploadphase,$primaryurl);
+ my $url_root = '/uploaded/'.$cdom.'/'.$cnum;
+ my $actionurl = "/public/$cdom/$cnum/syllabus";
+ my ($result,$flag,$numpathchgs) =
+ &Apache::loncommon::upload_embedded('syllabus','portfolio/syllabus',
+ $cnum,$cdom,'/userfiles',$url_root,undef,undef,undef,$state,
+ $actionurl);
+ unless ($numpathchgs) {
+ my $modres =
+ &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus',
+ $cnum,$cdom,
+ '/userfiles',$env{'form.primaryurl'});
+ $result .= $modres;
+ }
+ $r->print($result.&return_to_editor($cdom,$cnum).
+ &Apache::loncommon::end_page());
+ return OK;
+ } elsif ($env{'form.phase'} eq 'check_embedded') {
+ # Process file upload - phase three - modify references in HTML file
+ my $uploadphase = 'modified_orightml';
+ my $result =
+ &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus',
+ $cnum,$cdom,
+ '/userfiles',$env{'form.primaryurl'});
+ $r->print($result.&return_to_editor($cdom,$cnum).
+ &Apache::loncommon::end_page());
+ return OK;
+ }
+ foreach my $field (keys(%syllabusfields)) {
+ if ($syllabus{$field} ne '') {
+ $displayfields{$field} = ' style="display:block;"';
+ } else {
+ $displayfields{$field} = ' style="display:none;"';
+ }
}
}
-#--------Functions
- if( ($allowed || $privileged) && $target ne 'tex') {
- my $functions=&Apache::lonhtmlcommon::start_funclist();
- if ($allowed) {
- #if you have the register flag, keep it
- if($env{'form.register'} == 1) {
- $functions.=&Apache::lonhtmlcommon::add_item_funclist(
- '<a href="'.$r->uri.'?forcestudent=1&register=1">'
- .&mt('Show Public View').'</a>'
- .&Apache::loncommon::help_open_topic(
- 'Uploaded_Templates_PublicView'));
- } else {
- $functions.=&Apache::lonhtmlcommon::add_item_funclist(
- '<a href="'.$r->uri.'?forcestudent=1">'
- .&mt('Show Public View').'</a>'
- .&Apache::loncommon::help_open_topic(
- 'Uploaded_Templates_PublicView'));
- }
- } elsif ($privileged) {
- if($env{'form.register'} == 1) {
- $functions.=&Apache::lonhtmlcommon::add_item_funclist(
- '<a href="'.$r->uri.'?forceedit=1&register=1">'
- .&mt('Edit').'</a>');
- } else {
- $functions.=&Apache::lonhtmlcommon::add_item_funclist(
- '<a href="'.$r->uri.'?forceedit=1">'
- .&mt('Edit').'</a>');
- }
+ if ($allowed) {
+#---------------------------------- Print External URL Syllabus Info if editing
+ if ($target ne 'tex') {
+ my $protocol = $Apache::lonnet::protocol{$homeserver};
+ $protocol = 'http' if ($protocol ne 'https');
+ $r->print('<div class="LC_info">'
+ .'<p>'
+ .&mt('This syllabus can be publicly viewed at [_1]'
+ ,'<tt>'.$protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri.'</tt>')
+ .' '.&Apache::loncommon::help_open_topic('Syllabus_ExtLink')
+ .'</p>'
+ .'</div>');
+ my $lonhost = $r->dir_config('lonHostID');
+ $r->print(&chooser($external,$uploaded,$lonhost,\%syllabusfields,\%syllabus));
}
-
- $functions.=&Apache::lonhtmlcommon::end_funclist();
- $r->print(&Apache::loncommon::head_subbox($functions));
- }
-
-#---------------------Print External URL Syllabus Info and Help Text
- if( ($allowed) && ($target ne 'tex') ) {
- my $protocol = $Apache::lonnet::protocol{$homeserver};
- $protocol = 'http' if ($protocol ne 'https');
- $r->print('<p class="LC_info">'
- .&mt('This syllabus can be publicly viewed at [_1]'
- ,'<tt>'.$protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri.'</tt>')
- .' '.&Apache::loncommon::help_open_topic('Syllabus_ExtLink')
- .'</p>'
- .'<p class="LC_info">'
- .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].'
- ,'<a href="/adm/courseprefs?actions=courseinfo&phase=display">','</a>')
- .'</p>'
- );
- #-Print Help Text
- $r->print(&Apache::loncommon::help_open_topic(
- 'Uploaded_Templates_TextBoxes',
- &mt('Help with filling in text boxes')));
- }
-
-#----------Print last update
- my $lastmod=$syllabus{'uploaded.lastmodified'};
- $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
- my $who;
- if (($env{'user.name'} ne 'public') && ($env{'user.domain'} ne 'public')) {
- $who = &Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($syllabus{'uploaded.name'},
- $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
- $syllabus{'uploaded.domain'});
} else {
- # Public user?
- # Only display name of user, but no link to personal information page
- $who = &Apache::loncommon::plainname(
- $syllabus{'uploaded.name'},
- $syllabus{'uploaded.domain'});
- }
-
- if ($target ne 'tex') {
- $r->print('<div class="LC_info">'.&mt('Last updated').': '.
- $lastmod . ' '.
- ($who ? &mt('by').' '.$who
+#--------------------------------------------- Print last update unless editing
+ my $lastmod=$syllabus{'uploaded.lastmodified'};
+ $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
+ my $who;
+ if ($syllabus{'uploaded.lastmodified'}) {
+ if (($env{'user.name'} ne 'public') && ($env{'user.domain'} ne 'public')) {
+ $who = &Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($syllabus{'uploaded.name'},
+ $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
+ $syllabus{'uploaded.domain'});
+ } else {
+# Public user?
+# Only display name of user, but no link to personal information page
+ $who = &Apache::loncommon::plainname(
+ $syllabus{'uploaded.name'},
+ $syllabus{'uploaded.domain'});
+ }
+ }
+ if ($target ne 'tex') {
+ $r->print('<div class="LC_info">'.&mt('Last updated').': '.
+ $lastmod . ' '.
+ ($who ? &mt('by').' '.$who
: '' ) .
- '</div>' );
-
- } else {
- $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
- ($who? &mt('by').'\\\\ '.
- &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})
- :'')
- .'\\\\');
+ '</div>' );
+ } else {
+ $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
+ ($who? &mt('by').'\\\\ '.
+ &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})
+ :'')
+ .'\\\\');
+ }
}
-#----------------------------Print Headtitle
+
+#-------------------------------------------------------------- Print Headtitle
if ($target ne 'tex') {
- $r->print('<h1>'.$courseenv{'description'}.'</h1>');
- $r->print('<h3>'. &Apache::lonnet::domain($cdom,'description').'</h3>');
+ my $display = 'block';
+ if ($external || $uploaded) {
+ $display = 'none';
+ }
+ $r->print('<div class="LC_Box" id="template" style="display: '.$display.'">'.
+ '<h2 class="LC_hcell">'.$courseenv{'description'}.'</h2>');
+ if ($allowed) {
+ $r->print('<div style="margin: 0; float:left;">'.
+ '<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>'.
+ '</div>');
+# Print Help Text if editing at right side of screen
+ $r->print('<div style="margin: 0; float:right;">'.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).
+ '</div><br clear="all" />');
+ } else {
+ $r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
+ }
} else {
$r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
&Apache::lonnet::domain($cdom,'description').'}\\\\');
@@ -368,17 +639,25 @@ ENDSCRIPT
&Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
if ($target ne 'tex') {
if ($allowed) {
- &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
+ my $display = ' style="display:block;"';
+ if ($syllabus{'000_showrssfeeds'} eq 'no') {
+ $display = ' style="display:none;"';
+ }
+ &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box',
+ 'box_000_showrssfeeds',$display);
$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
$r->print( '<a href="'.$editurl.'">'.&mt('New RSS Feed or Blog').'</a>');
&Apache::lontemplate::print_end_template($r);
- } elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
- &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
- $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
- &Apache::lontemplate::print_end_template($r);
+ } else {
+ unless ($syllabus{'000_showrssfeeds'} eq 'no') {
+ if (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
+ &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
+ $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
+ &Apache::lontemplate::print_end_template($r);
+ }
+ }
}
-
} else {
$r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
}
@@ -386,10 +665,11 @@ ENDSCRIPT
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
if ($allowed) {
$r->print('<form method="post" action="">'.
- '<input type="hidden" name="forceedit" value="edit" />');
+ '<input type="hidden" name="forceedit" value="'.$env{'form.forceedit'}.'" />');
}
+
my $url_include_handler = sub {
- my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed) = @_;
+ my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display) = @_;
my %data = %{$data_ref};
my %fields = %{$fields_ref};
my $urls=$message;
@@ -415,7 +695,8 @@ ENDSCRIPT
if ($allowed) {
&Apache::lonfeedback::newline_to_br(\$urls);
&Apache::lontemplate::print_start_template($r,$fields{$field}.
- &Apache::loncommon::help_open_topic('Syllabus_URLs'),'LC_Box');
+ &Apache::loncommon::help_open_topic('Syllabus_URLs'),'LC_Box',
+ 'box_'.$field,$display);
$r->print($urls);
$r->print("<br /><div>");
&Apache::lontemplate::print_textarea_template($r, $data{$field},
@@ -430,7 +711,8 @@ ENDSCRIPT
};
my %custom_hash = ( 'lll_includeurl' => $url_include_handler );
&Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields,
- $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash);
+ $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash,
+ undef,\%displayfields);
if ($allowed) {
$r->print('</form>'.
&Apache::lonhtmlcommon::htmlareaselectactive());
@@ -441,6 +723,7 @@ ENDSCRIPT
if ($target ne 'tex') {$r->print('</p>');}
}
if ($target ne 'tex') {
+ $r->print('</div>');
if ($env{'form.backto'} eq 'coursecatalog') {
$r->print('<form name="backtocat" method="post" action="/adm/coursecatalog">'.
&Apache::lonhtmlcommon::echo_form_input(['backto','courseid']).
@@ -453,5 +736,229 @@ ENDSCRIPT
return OK;
}
+sub chooser {
+ my ($external,$uploaded,$lonhost,$fields,$values) = @_;
+ my %lt = &Apache::lonlocal::texthash(
+ 'type' => 'Syllabus Type',
+ 'url' => 'External URL',
+ 'file' => 'Uploaded File',
+ 'template' => 'Syllabus Template',
+ 'templateboxes' => 'Choose template items ... ',
+ 'curr' => 'Current:',
+ 'rep' => 'Replace:',
+ 'upl' => 'Upload:',
+ 'pr' => 'Preview',
+ 'save' => 'Save',
+ 'chourl' => 'Choose external URL',
+ 'chofile' => 'Uploaded syllabus file',
+ 'parse' => 'Upload embedded images/multimedia files if HTML file',
+ );
+ my %checked = (
+ file => '',
+ url => '',
+ template => '',
+ );
+ my %display = (
+ file => 'none',
+ url => 'none',
+ templatebox => 'none',
+ );
+ my $check = ' checked="checked" ';
+ if ($uploaded) {
+ $checked{'file'} = $check;
+ $display{'file'} = 'block';
+ } elsif ($external) {
+ $checked{'url'} = $check;
+ $display{'url'} = 'block';
+ } else {
+ $checked{'template'} = $check;
+ $checked{'templatebox'} = $check;
+ $display{'templatebox'} = 'block';
+ }
+
+ my $output =
+ '<form name="syllabus" method="post" enctype="multipart/form-data" action="">'."\n".
+ '<input type="hidden" name="forceedit" value="1" />'."\n".
+ '<div class="LC_left_float"><fieldset><legend>'.$lt{'type'}.'</legend>';
+ foreach my $item ('template','url','file') {
+ $output .= '<label><input type="radio" name="choice" value="'.$item.'" '.$checked{$item}.' onclick="toggleEditor('."'$item'".')" />'.
+ $lt{$item}.'</label><br />';
+ }
+ $output .= '</fieldset></div>'."\n".
+ '<div id="url" class="LC_left_float" style="display: '.$display{'url'}.'">'."\n".
+ '<fieldset><legend>'.$lt{'chourl'}.'</legend><span class="LC_nobreak">'."\n".
+ '<a href="javascript:extUrlPreview('."'syllabusurl'".');">'.$lt{'pr'}.'</a></span> '."\n".
+ '<input type="text" id="syllabusurl" name="externalsyllabus" value="'.$external.'" size="55" />'."\n".
+ ' <input type="submit" name="storeurl" value="'.$lt{'save'}.'" />'."\n".
+ '</fieldset></div>'."\n".
+ '<div id="file" class="LC_left_float" style="display: '.$display{'file'}.'"><fieldset><legend>'.$lt{'file'}.'</legend>';
+ if ($uploaded) {
+ my $protocol = $Apache::lonnet::protocol{$lonhost};
+ $protocol = 'http' if ($protocol ne 'https');
+ my $absurl = $protocol.'://'.&Apache::lonnet::hostname($lonhost).$uploaded;
+ my ($filename) = ($uploaded =~ m{([^/]+)$});
+ $output .= '<span class="LC_nobreak">'.$lt{'curr'}.' '.
+ '<input type="hidden" name="uploadedfile" value="'.&HTML::Entities::encode($absurl).'?inhibitmenu=yes" id="currfile" />'.
+ '<a href="javascript:extUrlPreview('."'currfile'".');">'.$filename.'</a></span><br /><br />'.$lt{'rep'};
+ } else {
+ $output .= $lt{'upl'};
+ }
+
+ $output .= '<br />'."\n".
+ '<span class="LC_nobreak">'.
+ '<input type="file" name="syllabusfile" size="55" />'."\n".
+ ' <input type="submit" name="storefile" value="'.$lt{'save'}.'" />'.
+ '</span><br />'.
+ '<label>'.
+ '<input type="checkbox" name="parserflag" checked="checked" />'.
+ $lt{'parse'}.
+ '</label>'.
+ '</fieldset></div>'.
+ '<div id="templatebox" class="LC_left_float" style="display: '.
+ $display{'templatebox'}.';"><fieldset><legend>'.$lt{'templateboxes'}.
+ ' <input type="button" value="'.&mt('check all').'" '.
+ 'onclick="javascript:checkAll('."document.syllabus.showfield".');javascript:toggleBox('."'all'".');" />'.
+ (' 'x2).
+ '<input type="button" value="'.&mt('uncheck all').'" '.
+ 'onclick="javascript:uncheckAll('."document.syllabus.showfield".');javascript:toggleBox('."'all'".');" />'.
+ '</legend>'.
+ &fields_check_uncheck($fields,$values).
+ '</fieldset>'.
+ '</div>';
+ $output .= '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
+ '</form>';
+ return $output;
+}
+
+sub fields_check_uncheck {
+ my ($fields,$values) = @_;
+ return unless ((ref($fields) eq 'HASH') && (ref($values) eq 'HASH'));
+ my $numinrow = 4;
+ my $table;
+ my @fieldnames = sort(keys(%{$fields}));
+ unshift(@fieldnames,'000_showrssfeeds');
+ my $numfields = scalar(@fieldnames);
+ for (my $i=0; $i<$numfields; $i++) {
+ my $checked;
+ my $name = $fields->{$fieldnames[$i]};
+ if ($fieldnames[$i] eq '000_showrssfeeds') {
+ $name = &mt('RSS Feeds and Blogs');
+ unless ($values->{$fieldnames[$i]} eq 'on') {
+ $checked = ' checked="checked"';
+ }
+ } elsif ($values->{$fieldnames[$i]} ne '') {
+ $checked = ' checked="checked"';
+ }
+ my $rem = $i%($numinrow);
+ if ($rem == 0) {
+ if (($i > 0) && ($i < $numfields-1)) {
+ $table .= '</tr>';
+ }
+ if ($i < $numfields-1) {
+ $table .= '<tr>';
+ }
+ }
+ $table .=
+ '<td><label><input type="checkbox" name="showfield" value="'.$fieldnames[$i].'" '.
+ $checked.' id="showfield_'.$i.'" onclick="javascript:toggleBox('."'$fieldnames[$i]',this".');" />'.
+ $name.'</label></td>'."\n";
+ }
+ if ($table ne '') {
+ my $rem = $numfields%($numinrow);
+ my $colsleft = $numinrow - $rem;
+ if ($colsleft > 1 ) {
+ $table .= '<td colspan="'.$colsleft.'"> </td>';
+ } elsif ($colsleft == 1) {
+ $table .= '<td> </td>';
+ }
+ $table = '<table>'.$table.'</tr></table>';
+ }
+ return $table;
+}
+
+sub process_upload {
+ my ($upload_output,$cnum,$cdom,$allfiles,$codebase) = @_;
+ my ($parseaction,$showupload,$mimetype);
+ my $dest = 'portfolio/syllabus';
+ if ($env{'form.parserflag'}) {
+ $parseaction = 'parse';
+ }
+ my $url=&Apache::lonnet::userfileupload('syllabusfile','syllabus',$dest,
+ $parseaction,$allfiles,
+ $codebase,undef,undef,undef,undef,
+ undef,undef,\$mimetype);
+ if ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E.*/([^/]+)$}) {
+ my $stored = $1;
+ $showupload = '<p>'.&mt('Uploaded [_1]',
+ '<span class="LC_filename">'.$stored.'</span>').
+ '</p>';
+ } else {
+ my ($filename) = ($env{'form.syllabusfile.filename'} =~ m{([^/]+)$});
+ $$upload_output = '<div class="LC_error" id="uploadfileresult">'.
+ &mt('Unable to save file [_1].',
+ '<span class="LC_filename">'.$filename.'</span>').
+ '</div>';
+ return ();
+ }
+ my $needlink;
+ if (($parseaction eq 'parse') && ($mimetype eq 'text/html')) {
+ $$upload_output = $showupload;
+ my $total_embedded = scalar(keys(%{$allfiles}));
+ if ($total_embedded > 0) {
+ my $uploadphase = 'upload_embedded';
+ my $primaryurl = &HTML::Entities::encode($url,'<>&"');
+ my $state = &embedded_form_elems($uploadphase,$primaryurl);
+ my $actionurl = "/public/$cdom/$cnum/syllabus";
+ my ($embedded,$num,$numpathchanges,$existing);
+ ($embedded,$num,$numpathchanges,$existing) =
+ &Apache::loncommon::ask_for_embedded_content($actionurl,$state,
+ $allfiles,$codebase,
+ {'error_on_invalid_names' => 1,
+ 'ignore_remote_references' => 1,});
+ if ($embedded) {
+ $needlink = 1;
+ if ($num) {
+ $$upload_output .=
+ '<p>'.&mt('This file contains embedded multimedia objects, which need to be uploaded.').'</p>'.$embedded;
+ } elsif ($numpathchanges) {
+ $$upload_output .= $embedded;
+ } else {
+ $$upload_output .= $embedded;
+ &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus',
+ $cnum,$cdom,'/userfiles',$url);
+ }
+ } else {
+ $$upload_output .= &mt('Embedded item(s) already present, so no additional upload(s) required').'<br />';
+ &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus',
+ $cnum,$cdom,'/userfiles',$url);
+
+ }
+ } else {
+ $$upload_output .= &mt('No embedded items identified').'<br />';
+ }
+ $$upload_output = '<div id="uploadfileresult">'.$$upload_output.'</div>';
+ }
+ return ($url,$needlink);
+}
+
+sub embedded_form_elems {
+ my ($phase,$primaryurl) = @_;
+ return <<STATE;
+ <input type="hidden" name="forceedit" value="1" />
+ <input type="hidden" name="cmd" value="upload_embedded" />
+ <input type="hidden" name="phase" value="$phase" />
+ <input type="hidden" name="primaryurl" value="$primaryurl" />
+STATE
+}
+
+sub return_to_editor {
+ my ($cdom,$cnum) = @_;
+ my $actionurl = "/public/$cdom/$cnum/syllabus";
+ return '<p><form name="backtoeditor" method="post" action="'.$actionurl.'" />'.
+ '<input type="hidden" name="forceedit" value="1" />'."\n".
+ '<a href="javascript:document.backtoeditor.submit();">'.&mt('Return to Editor').
+ '</a></p>';
+}
+
1;
__END__