--- loncom/interface/lonsyllabus.pm 2010/02/15 20:28:51 1.106.2.3
+++ loncom/interface/lonsyllabus.pm 2013/05/19 15:48:51 1.128
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.106.2.3 2010/02/15 20:28:51 faziophi Exp $
+# $Id: lonsyllabus.pm,v 1.128 2013/05/19 15:48:51 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,16 +40,6 @@ use Apache::lonlocal;
use Apache::lonhtmlcommon;
use Apache::lonspeller();
use HTML::Entities();
-use Digest::MD5 qw(md5_hex);
-use Storable qw(freeze thaw);
-
-# These are strings representing types of fields
-# that will used to parse/display a field correctly
-use constant {
- TYPE_TEXT_HTML => 'html', #<-- default
- TYPE_TEXT_PLAIN => 'text',
- TYPE_URL_INCLUDE => 'include-url',
-};
sub handler {
my $r = shift;
@@ -62,7 +52,8 @@ sub handler {
my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
# ------------------------------------------------------------ Get query string
&Apache::loncommon::get_unprocessed_cgi
- ($ENV{'QUERY_STRING'},['delete', 'rename', 'field', 'forcestudent','register','forceedit','forceflush','wrapperdisplay']);
+ ($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') {
@@ -71,28 +62,103 @@ 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);
+ my $crstype = &Apache::loncommon::course_type();
# ------------------------------------------------------------ Print the screen
+
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'};
- if ($externalsyllabus=~/\w/) {
- if ($env{'form.wrapperdisplay'} eq 'menu') {
- $r->print(&Apache::lonwrapper::simple_menu());
- } else {
- $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu",
- $externalsyllabus));
- }
- return OK;
+ my $external=$courseenv{'externalsyllabus'};
+ my $uploaded=$courseenv{'uploadedsyllabus'};
+ my $minimal=$courseenv{'minimalsyllabus'};
+
+ if (($minimal =~/\w/) || ($uploaded =~/\w/)) {
+ my $item;
+ if ($minimal =~/\w/) {
+ if ($external =~ m{\Q$minimal\E$}) {
+ undef($external);
+ }
+ $item = $minimal;
+ } elsif ($uploaded =~/\w/) {
+ if ($external =~ m{\Q$uploaded\E$}) {
+ undef($external);
+ }
+ $item = $uploaded;
+ }
+ unless ($allowed && $forceedit) {
+ my $file=&Apache::lonnet::filelocation("",$item);
+ if ($file =~ /\.(tex|x?html?)$/) {
+ my $filetype = $1;
+ my $filecontents=&Apache::lonnet::getfile($file);
+ if ($filecontents eq -1) {
+ $r->print(&mt('Syllabus file unavailable'));
+ } elsif ($filetype eq 'tex') {
+ my $result = &Apache::lontexconvert::converted(\$filecontents,
+ $env{'form.texengine'});
+ my %args;
+ &get_breadcrumbs($cdom,$cnum,$crstype,\%args);
+ $r->print(&Apache::loncommon::start_page("Syllabus",undef,\%args).
+ $result.
+ &Apache::loncommon::end_page());
+ } else {
+ my %mystyle;
+ &Apache::structuretags::reset_problem_globals();
+ my $oldfile = $env{'request.filename'};
+ $env{'request.filename'} = $item;
+ my $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($item));
+ }
+ return OK;
+ }
+ } elsif ($external=~/\w/) {
+ unless ($allowed && $forceedit) {
+ $r->print(&Apache::lonwrapper::wrapper($external));
+ return OK;
+ }
}
-# --------------------------------------------------------- The old syllabus fields
+
+# ------------------------------ The buck stops here: internal syllabus display
+# --------------------------------------------------------- The syllabus fields
my %syllabusfields=&Apache::lonlocal::texthash(
'aaa_instructorinfo' => 'Instructor Information',
'bbb_description' => 'Course Description',
@@ -109,529 +175,247 @@ 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);
- my $js;
- if ($env{'form.backto'} eq 'coursecatalog') {
- $js .= <<"ENDSCRIPT";
+# ---------------------------------------------------------- Load syllabus info
+ my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);
+ my ($output,%displayfields,%noshow);
-
-
-ENDSCRIPT
- }
- $js .= <<'ENDSCRIPT';
-
-
+ if ($target ne 'tex') {
+ &print_header($r,$cnum,$cdom,$crstype,$allowed,$forceedit,\%syllabus,
+ \%syllabusfields);
+ $r->print($output);
+ }
-
-ENDSCRIPT
- my $start_page =
- &Apache::loncommon::start_page("Syllabus", $rss_link.$js,
- {'function' => undef,
- 'domain' => $cdom,
- 'force_register' =>
- $env{'form.register'},});
+# -------------------------------------------- Determine which fields are shown
- $r->print($start_page);
- if ($env{'form.backto'} eq 'coursecatalog') {
- &Apache::lonhtmlcommon::clear_breadcrumbs();
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:ToCatalog()",
- text=>"Course/Community Catalog"});
- 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());
+ if ($syllabus{'uploaded.fields'}) {
+ if ($syllabus{'uploaded.fields'} eq 'none') {
+ foreach my $field (keys(%syllabusfields)) {
+ $displayfields{$field} = ' style="display:none;"';
+ $noshow{$field} = 1;
+ }
+ } else {
+ my %included;
+ map { $included{$_} = 1; } split(/,/,$syllabus{'uploaded.fields'});
+ foreach my $field (keys(%syllabusfields)) {
+ my ($prefix) = split(/_/,$field);
+ if ($included{$prefix}) {
+ $displayfields{$field} = ' style="display:block;"';
+ } else {
+ $displayfields{$field} = ' style="display:none;"';
+ $noshow{$field} = 1;
+ }
+ }
}
- }
-# ---------------------------------------------------------- Load syllabus info
- my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); # load db
- my $allowed=0; # can we edit this page?
- my $privileged=0;
- my %data;
- if ($env{'form.forceflush'}) {
- delete $syllabus{'data.fields'};
- &Apache::lonnet::del('syllabus', ['data.fields'], $cdom, $cnum);
- delete $syllabus{'properties.v2_conflict'};
- &Apache::lonnet::del('syllabus', ['properties.v2_conflict'], $cdom, $cnum);
- delete $syllabus{'properties.v2_conflict_fail'};
- &Apache::lonnet::del('syllabus', ['properties.v2_conflict_fail'], $cdom, $cnum);
- delete $syllabus{'properties.last_modified'};
- &Apache::lonnet::del('syllabus', ['properties.last_modified'], $cdom, $cnum);
- delete $syllabus{'properties.v2_converted'};
- &Apache::lonnet::del('syllabus', ['properties.v2_converted'], $cdom, $cnum);
- delete $syllabus{'data.old_new_map'};
- &Apache::lonnet::del('syllabus', ['data.old_new_map'], $cdom, $cnum);
- delete $syllabus{'data.deleted_fields'};
- &Apache::lonnet::del('syllabus', ['data.deleted_fields'], $cdom, $cnum);
- %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); # load db
- $r->print("Flushed syllabus DB file.
");
- $r->print("Syllabus conflict: ".$syllabus{'properties.v2_conflict'}."
");
- }
- #$r->print("Existing fields: ".$syllabus{'data.fields'}."
");
- #$r->print("Old-new map: ".$syllabus{'data.old_new_map'}."
");
- #$r->print("Deleted fields: ".$syllabus{'data.deleted_fields'}."
");
- if (!exists($syllabus{'data.fields'})) {
- # convert existing 2.x data to new DB fields
- # which become new primary data source for document
- %data = %{convert_from_v2($r, \%syllabus, \%syllabusfields, 0)};
- #$r->print("New fields order: ".$data{'data.fields'}."
");
- &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);
- } elsif ( !exists($syllabus{'properties.v2_converted'}) &&
- exists($syllabus{'uploaded.lastmodified'}) &&
- exists($syllabus{'properties.last_modified'}) &&
- ($syllabus{'uploaded.lastmodified'} !=
- $syllabus{'properties.last_modified'})) {
- # if the document has been saved in 3.x and later edited in
- # 2.x, reconvert the existing document, with extra warning
- %data = %{convert_from_v2($r, \%syllabus, \%syllabusfields, 1)};
- delete $data{'properties.v2_converted'};
- &Apache::lonnet::del('syllabus', ['properties.v2_converted'], $cdom, $cnum);
- $data{'properties.v2_conflict'} = 1;
- &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);
} else {
- %data = %syllabus;
-
+ foreach my $field (keys(%syllabusfields)) {
+ if ($syllabus{$field} ne '') {
+ $displayfields{$field} = ' style="display:block;"';
+ } else {
+ $displayfields{$field} = ' style="display:none;"';
+ }
+ }
}
-# ----------------------------------------------------- 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 (($data{'uploaded.lastmodified'}) && (!$forceedit)) {
- $forcestudent='student';
+ 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');
+ my $link = $protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri;
+ $r->print('
'
+ .''
+ .''
+ .&mt('Public link (no log-in): [_1]',''.$link.'')
+ .' '.&Apache::loncommon::help_open_topic('Syllabus_ExtLink')
+ .''
+ .'
'."\n");
+ my $lonhost = $r->dir_config('lonHostID');
+ $r->print(&chooser($external,$uploaded,$minimal,$cdom,$cnum,$lonhost,
+ \%syllabusfields,\%syllabus));
+ }
+ } else {
+#--------------------------------------------- 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 ($forcestudent or $target eq 'tex') { $allowed=0; }
}
- #store what the user typed in
- my @fields = @{thaw($data{'data.fields'})};
- if (($allowed) && ($env{'form.delete'})) {
- my $field = $env{'form.delete'};
- chomp($field);
- #allow only numbers, underscores
- $field=~s/[^0-9_]//g;
- #check if the field exists
- #do not delete if file in v2 conversion mode
- if (exists($data{'data.field.'.$field}) &&
- !exists($data{'properties.v2_converted'})) {
- #$r->print("Field '$field' can be deleted.
");
- # linearly parse "data.fields" and remove it
- for (my $i = 0; $i < length(@fields); $i++) {
- if ($fields[$i] eq $field) {
- splice(@fields, $i, 1);
- #$r->print("Removed entry $i from 'data.fields'
");
- }
- }
- # if "data.deleted" does not exist, create it
- my @deleted;
- if (!exists($data{'data.deleted_fields'})) {
- @deleted = [];
- } else {
- @deleted = @{thaw($data{'data.deleted_fields'})};
- }
- # only if deleted does not exist in 'data.deleted', push it
- my $push = 1;
- for (my $i = 0; $i < length(@deleted); $i++) {
- if ($deleted[$i] eq $field) {
- $push = 0;
- last;
- }
- }
- unless (!$push) {
- push(@deleted, $field);
- }
- $data{'data.fields'} = freeze(\@fields);
- $data{'data.deleted_fields'} = freeze(\@deleted);
-
- &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);
- }
- }
- if (($allowed) && ($env{'form.rename'})) {
- my $field = $env{'form.rename'};
- my $new_title = "Hello, World!";
- chomp($field);
- $field=~s/[^0-9_]//g;
- #check if the field exists
- #do not delete if file in v2 conversion mode
- if (exists($data{'data.field.'.$field}) &&
- !exists($data{'properties.v2_converted'})) {
- #sanitize HTML content
- #$r->print("Rename -- field found.
");
- my %db_entry = %{thaw($data{'data.field.'.$field})};
- $new_title = &Apache::lonfeedback::clear_out_html($new_title, 1);
- $db_entry{title} = $new_title;
- $data{'data.field.'.$field} = freeze(\%db_entry);
- &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);
- }
- }
- if (($allowed) && ($env{'form.storesyl'})) {
- foreach my $syl_field (@fields) {
- my $field=$env{'form.'.$syl_field};
- my $type;
- my %field_hash;
- # only update a field if it already exists!
- if (exists($data{'data.field.'.$syl_field})) {
- #$r->print("Creating/updated field ".$syl_field."
");
- %field_hash = exists($data{'data.field.'.$syl_field}) ?
- %{thaw($data{'data.field.'.$syl_field})} : ();
- $type = exists($field_hash{type}) ? $field_hash{type} : TYPE_TEXT_HTML;
- chomp($field);
- $field=~s/\s+$//s;
- $field=~s/^\s+//s;
- $field=~s/\
$//s;
- $field=&Apache::lonfeedback::clear_out_html($field,1);
- $field_hash{content}=$field;
- if ($type eq TYPE_URL_INCLUDE) { # clean up included URLs
- my $field='';
- foreach my $value (split(/\n/,$field_hash{content})) {
- my $url=$value;
- # get rid of leading and trailing spaces
- $url=~s/^\s+//;
- $url=~s/\s+$//;
- if ($url=~m|^https?\://([^/]+)/(.+)$|) {
- my $host = $1;
- my $remainder=$2;
- # remove the hostname from internal URLs
- my $hostname = &Apache::lonnet::hostname($host);
- my %all_hostnames = &Apache::lonnet::all_hostnames();
- foreach my $possible_host (keys(%all_hostnames)) {
- if ($possible_host =~ /\Q$hostname\E/i) {
- $url=$remainder;
- }
- }
- }
- # norm internal URLs
- unless ($url=~/^https?\:/) {
- $url=&Apache::lonnet::clutter($url);
- }
- # re-assemble field
- if ($url) {
- $field.=$url."\n";
- }
- }
- $field_hash{content}=$field;
- $field_hash{type}=TYPE_URL_INCLUDE;
- }
- $data{'data.field.'.$syl_field} = freeze(\%field_hash);
- }
- }
- $data{'uploaded.domain'}=$env{'user.domain'};
- $data{'uploaded.name'}=$env{'user.name'};
- my $time = $^T;
- $data{'uploaded.lastmodified'}=$time;
- $data{'properties.last_modified'}=$time;
- delete $data{'properties.v2_converted'};
- delete $data{'properties.v2_conflict'};
- delete $data{'properties.v2_conflict_fail'};
- &Apache::lonnet::del('syllabus', ['properties.v2_converted',
- 'properties.v2_conflict', 'properties.v2_conflict_fail'], $cdom, $cnum);
-
- #2.x compatibility: write to old fields with new mapped fields
- my %old_new_map = %{thaw($data{'data.old_new_map'})};
- foreach my $old_field (keys(%old_new_map)) {
- #$r->print("Looking for: ".$old_field." at ".$old_new_map{$old_field}."
");
- if (exists($data{'data.field.'.$old_new_map{$old_field}})) {
- #$r->print("updating old field ".$old_field."
");
- my %new_field = %{thaw($data{'data.field.'.$old_new_map{$old_field}})};
- $data{$old_field} = $new_field{content};
- }
- }
-
- &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);
- }
- }
-
-#--------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(
- ''
- .&mt('Show Public View').''
- .&Apache::loncommon::help_open_topic(
- 'Uploaded_Templates_PublicView'));
- } else {
- $functions.=&Apache::lonhtmlcommon::add_item_funclist(
- ''
- .&mt('Show Public View').''
- .&Apache::loncommon::help_open_topic(
- 'Uploaded_Templates_PublicView'));
- }
- } elsif ($privileged) {
- if($env{'form.register'} == 1) {
- $functions.=&Apache::lonhtmlcommon::add_item_funclist(
- ''
- .&mt('Edit').'');
- } else {
- $functions.=&Apache::lonhtmlcommon::add_item_funclist(
- ''
- .&mt('Edit').'');
- }
+ if ($target ne 'tex') {
+ $r->print(''.&mt('Last updated').': '.
+ $lastmod . ' '.
+ ($who ? &mt('by').' '.$who
+ : '' ) .
+ '
' );
+ } else {
+ $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
+ ($who? &mt('by').'\\\\ '.
+ &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})
+ :'')
+ .'\\\\');
}
-
- $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(''
- .&mt('This syllabus can be publicly viewed at [_1]'
- ,''.$protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri.'')
- .' '.&Apache::loncommon::help_open_topic('Syllabus_ExtLink')
- .'
'
- .''
- .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].'
- ,'','')
- .'
'
- );
- #-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 = &Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($syllabus{'uploaded.name'},
- $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
- $syllabus{'uploaded.domain'});
+#-------------------------------------------------------------- Print Headtitle
if ($target ne 'tex') {
- $r->print(''.&mt('Last updated').': '.
- $lastmod . ' '.
- ($who ? &mt('by').' '.$who
- : '' ) .
- '
' );
-
- } else {
- $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
- ($who? &mt('by').'\\\\ '.
- &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})
- :'')
- .'\\\\');
- }
- if ($allowed && $data{'properties.v2_converted'} == 1) {
- $r->print("This document was created with LON-CAPA 2.x. Modifying it may cause it to not display correctly on older servers.
");
- }
- if ($allowed && $data{'properties.v2_conflict'} == 1) {
- $r->print("This document was saved with LON-CAPA 3.x, then further edited in LON-CAPA 2.x.
");
- if ($data{'properties.v2_conflict_fail'} == 1) {
- $r->print("Some fields in LON-CAPA 2.x no longer have an equivalent in LON-CAPA 3.x. These fields were appended; some fields may be duplicated or not match.
");
- } else {
- $r->print("These changes were automatically transferred to LON-CAPA 3.x");
- }
- }
-
-#----------------------------Print Headtitle
- if ($target ne 'tex') {
- $r->print(''.$courseenv{'description'}.'
');
- $r->print(''. &Apache::lonnet::domain($cdom,'description').'
');
+ my $display = 'block';
+ if ($external || $uploaded || $minimal) {
+ $display = 'none';
+ }
+ $r->print(''.
+ '
'.$courseenv{'description'}.'
');
+ if ($allowed) {
+ $r->print('
'.
+ '
'.&Apache::lonnet::domain($cdom,'description').'
'.
+ '');
+# Print Help Text if editing at right side of screen
+ $r->print('
'.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).
+ '
');
+ } else {
+ $r->print('
'.&Apache::lonnet::domain($cdom,'description').'
');
+ }
} else {
$r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
&Apache::lonnet::domain($cdom,'description').'}\\\\');
}
-
# -------------------------------------------------------- Get course personnel
- my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
- if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::start_pick_box());
- } else {
- $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
+ my $hidepersonnel;
+ if (($syllabus{'uploaded.fields'}) &&
+ (($syllabus{'uploaded.fields'} eq 'none') ||
+ ($syllabus{'uploaded.fields'} !~ /000/))) {
+ $hidepersonnel = 1;
}
- my @personnel=sort(keys(%coursepersonnel));
- my $lastpers=$personnel[$#personnel];
- foreach my $element (@personnel) {
- if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::row_title($element));
- } else {
- $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
- }
- foreach (split(/\,/,$coursepersonnel{$element})) {
- my ($puname,$pudom)=split(/\:/,$_);
- if ($target ne 'tex') {
- my $courseperson = &Apache::loncommon::plainname($puname,$pudom);
- if (($env{'user.name'} eq '') || ($env{'user.name'} eq 'public') ||
- ($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) {
- $r->print(' '.$courseperson);
- } else {
- $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson,
- $puname,$pudom));
- }
- } else {
- $r->print(' '.&Apache::loncommon::plainname($puname,
- $pudom).' ');
+ if ($target ne 'tex') {
+ if ($allowed) {
+ my $display = ' style="display:block;"';
+ if ($hidepersonnel) {
+ $display = ' style="display:none;"';
}
- }
- if ($target ne 'tex') {
- my $lastclose=$element eq $lastpers?1:0;
- $r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
+ &Apache::lontemplate::print_start_template($r,&mt('Personnel'),'LC_Box',
+ 'box_000_showpeople',$display);
+ $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,\%syllabus));
+ &Apache::lontemplate::print_end_template($r);
} else {
- $r->print('\\\\ \hline');
+ unless ($hidepersonnel) {
+ &Apache::lontemplate::print_start_template($r,&mt('Personnel'),'LC_Box');
+ $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,\%syllabus));
+ &Apache::lontemplate::print_end_template($r);
+ }
}
- }
- if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
} else {
- $r->print('\end{tabular}\\\\');
+ unless ($hidepersonnel) {
+ $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,%syllabus));
+ }
}
# -------------------------------------------------------------- Announcements?
my $day = &Apache::lonannounce::showday(time,2,
&Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
+ my $hidefeeds;
+ if (($syllabus{'uploaded.fields'}) &&
+ (($syllabus{'uploaded.fields'} eq 'none') ||
+ ($syllabus{'uploaded.fields'} !~ /111/))) {
+ $hidefeeds = 1;
+ }
if ($target ne 'tex') {
- if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
- $r->print("
");
- &print_field_sortable($r, \%data, $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML);
+ if ($allowed) {
+ my $display = ' style="display:block;"';
+ if ($hidefeeds) {
+ $display = ' style="display:none;"';
+ }
+ &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box',
+ 'box_111_showrssfeeds',$display);
+ my ($numfeeds,$hiddenfeeds,$rsslinktext);
+ my $feeds=&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit,\$numfeeds,
+ \$hiddenfeeds);
+ if ($numfeeds) {
+ $r->print($feeds);
+ $rsslinktext = &mt('New RSS Feed or Blog');
+ } else {
+ my $msg = '
'.
+ &mt("RSS Feeds and Blogs item is not included in a student's view of the syllabus.");
+ if ($hiddenfeeds) {
+ $r->print('
'.
+ &mt('All feeds currently hidden').
+ $msg.
+ '
');
+ } else {
+ $r->print('
'.
+ &mt('No current feeds').
+ $msg.
+ '
');
+ }
+ $rsslinktext = &mt('Manage Course RSS Feeds/Blogs');
+ if ($crstype eq 'Community') {
+ $rsslinktext = &mt('Manage Communiity RSS Feeds/Blogs');
+ }
+ }
+ my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
+ $r->print( '
'.$rsslinktext.'');
+ &Apache::lontemplate::print_end_template($r);
+ } else {
+ unless ($hidefeeds) {
+ my $feeds = &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit);
+ if ($feeds ne '') {
+ &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
+ $r->print($feeds);
+ &Apache::lontemplate::print_end_template($r);
+ }
+ }
}
- $r->print("
\n");
-
} else {
$r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
}
-
# ---------------------------------------------------------------- Get syllabus
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
if ($allowed) {
- $r->print('
'.
- &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
- }
- if ($target ne 'tex') {$r->print('
');}
- if ($allowed) {
- &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');
- $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
- my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
- $r->print( '
'.&mt('New RSS Feed or Blog').'');
- &Apache::lontemplate::print_end_template($r);
- } elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
- &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');
- $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
- &Apache::lontemplate::print_end_template($r);
+ &Apache::lonhtmlcommon::htmlareaselectactive());
}
} else {
- if ($target ne 'tex') {$r->print('
');} else {$r->print('\par ');}
+ if ($target ne 'tex') {$r->print('
');} else {$r->print('\par ');}
$r->print(&mt('No syllabus information provided.'));
if ($target ne 'tex') {$r->print('
');}
}
@@ -704,131 +477,1092 @@ ENDSCRIPT
return OK;
}
-sub print_field_sortable {
- my ($r, $data_ref, $target, $allowed, $default_rich_text, $group) = @_;
- my %data = %{$data_ref};
- my @fields = @{thaw($data{'data.fields'})};
- $r->print("
\n");
-}
-
-sub print_template_new_fields {
- my ($r, $data_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group) = @_;
- my @html_ids = ();
- my %data = %{$data_ref};
- my @fields = @{thaw($data{'data.fields'})};
- my %custom_handlers = %{$custom_handlers_ref};
-
- foreach my $key (@fields) {
- my %field = %{thaw($data{'data.field.'.$key})};
- my $title = $field{title};
- my $raw_message = $field{content};
- my $type = $field{type};
- my $message = $raw_message if (($raw_message=~/\w/) || ($allowed));
- if ((%custom_handlers) && exists($custom_handlers{$type})) {
- #$custom_handlers{$type}->($r, $field, $json_ref, $group, $target, $allowed);
- } else {
- if (($raw_message=~/\w/) || ($allowed)) {
- if (!&Apache::lonfeedback::contains_block_html($message)) {
- &Apache::lonfeedback::newline_to_br(\$message);
- } else {
- $message = &Apache::lonfeedback::tidy_html($message);
- }
- $message=&Apache::lonhtmlcommon::raw_href_to_link($message);
- if ($allowed) {
- $message=&Apache::lonspeller::markeduptext($message);
- }
- $message=&Apache::lontexconvert::msgtexconverted($message);
- if ($target ne 'tex') {
- #output of syllabusfields will be generated here.
- &Apache::lontemplate::print_start_template($r,$title,'LC_Box', 'box-'.$key);
- $r->print($message);
- if ($allowed) {
- $r->print("
");
- &Apache::lontemplate::print_textarea_template($r, $raw_message,
- $key, $default_rich_text);
- &Apache::lontemplate::print_saveall_template($r);
- if (!exists($data{'properties.v2_converted'})) {
- $r->print("
Delete ");
- $r->print("
Rename to \"Hello, World!\"");
- }
- $r->print("
");
- }
- &Apache::lontemplate::print_end_template($r);
- } else {
- my $safeinit;
- $r->print(&Apache::lonxml::xmlparse($r,'tex','
'.$title.'
'));
- $r->print(&Apache::lonxml::xmlparse($r,'tex',$message));
- }
- push(@html_ids,"hello");
- }
- }
- }
-
- return @html_ids;
-}
-
-sub convert_from_v2 {
- my ($r, $data_ref, $fields_ref, $conflict) = @_;
- my %data = %{$data_ref};
- my %fields = %{$fields_ref};
- my @fields_order = (!$conflict) ? () : @{thaw($data{'data.fields'})};
- my %old_new_map = (!$conflict) ? () : %{thaw($data{'data.old_new_map'})};
- my $repeat_int = 0; #ensure fields with created timestamp are unique
- foreach my $element (sort(keys(%fields))) {
- my %new_element = ();
- my $title = $fields{$element};
- my $title_hash = time."_".$$;
- if (exists($data{'data.field.'.$title_hash})) {
- $title_hash .= "_".$repeat_int++;
- }
- my $content = $data{$element};
- $new_element{title} = $title;
- $new_element{content} = $content;
- if ($element eq 'lll_includeurl') {
- $new_element{type} = TYPE_URL_INCLUDE;
- } else {
- $new_element{type} = TYPE_TEXT_HTML;
- }
- if (!$conflict) {
- $r->print("Creating new field with ID: ".$title_hash."
");
- $data{'data.field.'.$title_hash} = freeze(\%new_element);
- $old_new_map{$element} = $title_hash;
- push(@fields_order, $title_hash);
- } else {
- if (exists($old_new_map{$element})) {
- $r->print("Transferring old field ".$element." to new ID: ".$old_new_map{$element}."
");
- if (exists($data{'data.field.'.$old_new_map{$element}})) {
- my %new_field = %{thaw($data{'data.field.'.$old_new_map{$element}})};
- $new_field{content} = $content;
- $data{'data.field.'.$old_new_map{$element}} = freeze(\%new_field);
- }
- } else {
- $data{'data.field.'.$title_hash} = freeze(\%new_element);
- $old_new_map{$element} = $title_hash;
- $data{'properties.v2_conflict_fail'} = 1;
- push(@fields_order, $title_hash);
- }
- }
- }
- $data{'data.fields'} = freeze(\@fields_order);
- $data{'data.old_new_map'} = freeze(\%old_new_map);
- $data{'properties.last_modified'} = time;
- $data{'properties.v2_converted'} = 1;
- $data{'properties.type'} = 'syllabus';
-
- return \%data;
+sub print_header {
+ my ($r,$cnum,$cdom,$crstype,$allowed,$forceedit,$syllabus,$syllabusfields) = @_;
+ return unless ((ref($syllabus) eq 'HASH') || (ref($syllabusfields) eq 'HASH'));
+# ----------------------------------------------------------------- Make header
+ my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
+ my $js;
+ if ($env{'form.backto'} eq 'coursecatalog') {
+ $js .= <<"ENDSCRIPT";
+
+
+
+ENDSCRIPT
+ }
+ if ($allowed && $forceedit) {
+ my $check_uncheck = &Apache::loncommon::check_uncheck_jscript();
+ my @fieldnames = sort(keys(%{$syllabusfields}));
+ unshift(@fieldnames,'000_showpeople','111_showrssfeeds');
+ my (@checked,@unchecked);
+ if ($syllabus->{'uploaded.fields'} eq 'none') {
+ my $lastidx = scalar(@fieldnames)-1;
+ @unchecked = (0..$lastidx);
+ } elsif ($syllabus->{'uploaded.fields'}) {
+ my %included;
+ map { $included{$_} = 1; } split(/,/,$syllabus->{'uploaded.fields'});
+ for (my $i=0; $i<@fieldnames; $i++) {
+ my ($prefix) = split(/_/,$fieldnames[$i]);
+ if ($included{$prefix}) {
+ push(@checked,$i);
+ } else {
+ push(@unchecked,$i);
+ }
+ }
+ } else {
+ @checked = (0,1);
+ for (my $i=2; $i<@fieldnames; $i++) {
+ if ($syllabus->{$fieldnames[$i]}) {
+ push(@checked,$i);
+ } else {
+ push(@unchecked,$i);
+ }
+ }
+ }
+ my $fieldstr = "var fields = new Array('".join("','",@fieldnames)."');";
+ my $checkedstr = "var include = new Array('".join("','",@checked)."');";
+ my $uncheckedstr = "var exclude = new Array('".join("','",@unchecked)."');";
+ 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
+
+ $js .= <<"ENDSCRIPT";
+
+
+
+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();
+ my $brcrum = [{href=>"javascript:ToCatalog();",
+ text=>&mt('Course/Community Catalog'),
+ no_mt=>1}
+ ];
+ if ($env{'form.coursenum'} ne '') {
+ push(@{$brcrum},
+ {href=>"javascript:ToCatalog('details')",
+ text=>"Course details"});
+ }
+ push(@{$brcrum},
+ {href=>$r->uri,
+ text=>"Course syllabus"});
+ $args->{'bread_crumbs'} = $brcrum;
+ } else {
+ &get_breadcrumbs($cdom,$cnum,$crstype,$args);
+ }
+ if ($allowed) {
+ my %loaditem = (
+ onload => 'setTemplateBoxes();',
+ );
+ $args->{'add_entries'} = \%loaditem;
+ }
+ my $start_page =
+ &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args);
+ if ($start_page) {
+ $r->print($start_page);
+ }
+}
+
+sub get_breadcrumbs{
+ my ($cdom,$cnum,$crstype,$args) = @_;
+ return unless (ref($args) eq 'HASH');
+ if ($env{'form.folderpath'} =~ /^supplemental/) {
+ 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;
+ }
+ } else {
+ if ((&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus"))
+ && (($env{'form.symb'}) || ($env{'form.register'}))) {
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ } else {
+ $args->{'bread_crumbs'} = [
+ {'href' => "/public/$cdom/$cnum/syllabus",
+ 'text' => 'Syllabus'},
+ ];
+ }
+ }
+ return;
+}
+
+sub chooser {
+ my ($external,$uploaded,$minimal,$cdom,$cnum,$lonhost,$fields,$values) = @_;
+ my %lt = &Apache::lonlocal::texthash(
+ 'type' => 'Syllabus Type',
+ 'url' => 'External URL',
+ 'file' => 'Uploaded file',
+ 'minimal' => 'Minimal template',
+ 'template' => 'Standard template',
+ 'templateboxes' => 'Choose template items ... ',
+ 'curr' => 'Current:',
+ 'rep' => 'Replace:',
+ 'upl' => 'Upload:',
+ 'pr' => 'Preview',
+ 'save' => 'Save',
+ 'sved' => 'Save and Edit',
+ 'chourl' => 'External URL',
+ 'chofile' => 'Uploaded syllabus file',
+ 'parse' => 'Upload embedded images/multimedia files if HTML file',
+ );
+ my %checked = (
+ file => '',
+ minimal => '',
+ url => '',
+ template => '',
+ );
+ my %display = (
+ file => 'none',
+ minimal => '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';
+ } elsif ($minimal) {
+ $checked{'minimal'} = $check;
+ $display{'minimal'} = 'block';
+ } else {
+ $checked{'template'} = $check;
+ $checked{'templatebox'} = $check;
+ $display{'templatebox'} = 'block';
+ }
+
+ my $output =
+ '