'.&mt('Last updated').': '.
$lastmod . ' '.
@@ -446,18 +310,6 @@ ENDSCRIPT
:'')
.'\\\\');
}
- 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'}.'
');
@@ -466,7 +318,6 @@ ENDSCRIPT
$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') {
@@ -482,22 +333,24 @@ ENDSCRIPT
} else {
$r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
}
+ my @coursepersonlist;
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);
+ push(@coursepersonlist,$courseperson);
} else {
- $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson,
+ push(@coursepersonlist,&Apache::loncommon::aboutmewrapper($courseperson,
$puname,$pudom));
}
} else {
- $r->print(' '.&Apache::loncommon::plainname($puname,
+ push(@coursepersonlist,&Apache::loncommon::plainname($puname,
$pudom).' ');
}
}
+ $r->print(join(", ",@coursepersonlist));
if ($target ne 'tex') {
my $lastclose=$element eq $lastpers?1:0;
$r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
@@ -515,13 +368,13 @@ ENDSCRIPT
&Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
if ($target ne 'tex') {
if ($allowed) {
- &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');
+ &Apache::lontemplate::print_start_template($r,&mt('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');
+ &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);
}
@@ -529,19 +382,18 @@ ENDSCRIPT
} else {
$r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
}
-
# ---------------------------------------------------------------- Get syllabus
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
if ($allowed) {
$r->print('
'.
- &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
+ &Apache::lonhtmlcommon::htmlareaselectactive());
}
} else {
if ($target ne 'tex') {$r->print('
');} else {$r->print('\par ');}
@@ -602,113 +453,5 @@ ENDSCRIPT
return OK;
}
-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');
- $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;
-}
-
1;
__END__