--- loncom/interface/lonsimplepage.pm 2009/12/22 06:32:35 1.91
+++ loncom/interface/lonsimplepage.pm 2010/01/31 06:03:55 1.93
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.91 2009/12/22 06:32:35 faziophi Exp $
+# $Id: lonsimplepage.pm,v 1.93 2010/01/31 06:03:55 faziophi Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -328,7 +328,7 @@ sub handler {
}
#print the image
- my $image;
+ my $image='';
if ($syllabus{'uploaded.photourl'}) {
&Apache::lonnet::allowuploaded('/adm/smppg',
$syllabus{'uploaded.photourl'});
@@ -341,79 +341,46 @@ sub handler {
}
if ($allowed) {
- $r->print('');
- my $upload_photo_label = &mt('Upload a Photo');
- my $upload_button_label = &mt('Upload');
-
- my $content_for_upload_photo=<<"UPLOAD_PHOTO";
-
-
-
-UPLOAD_PHOTO
- &Apache::lontemplate::print_template($r, $upload_photo_label,$content_for_upload_photo,$allowed, 'LC_Box');
+ &Apache::lontemplate::print_start_template($r, &mt('Upload a Photo'),'LC_Box');
+ $r->print($image);
+ $r->print("
");
+ $r->print(
+ ''.
+ ''.
+ ''.
+ '');
+ &Apache::lontemplate::print_end_template($r);
+
# if ($syllabus{'uploaded.photourl'}) {
# $r->print('');
# }
}
- if ($allowed) {
- $r->print($image.'
');
- }
- if (!$allowed) {$r->print($image); }
-
- foreach my $field (sort(keys(%syllabusfields))) {
- if (($syllabus{$field}) || ($allowed) ||
- ($field eq 'abb_links' && $group ne '')) {
- my $message=$syllabus{$field};
- if (!&Apache::lonfeedback::contains_block_html($message)) {
- &Apache::lonfeedback::newline_to_br(\$message);
- }
- $message=~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g;
- if ($allowed) {
- $message=&Apache::lonspeller::markeduptext($message);
- }
- if ($target ne 'tex') {
- $message=&Apache::lontexconvert::msgtexconverted($message);
- }
- if ($field eq 'abb_links' && $group ne '') {
- $r->print('
');
- &display_group_links($r,$target,$group,'edit',$refarg,
- %groupinfo);
- $r->print('
');
- } elsif ($field eq 'aaa_title') {
- next;
- } else {
- if ($target ne 'tex') {
- if ($allowed) {
- } else {
- &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
- }
- } else {
- my $safeinit;
- $r->print(&Apache::lonxml::xmlparse($r,'tex',''.$syllabusfields{$field}.'
'));
- $r->print(&Apache::lonxml::xmlparse($r,'tex',$message));
- }
- if ($allowed) {
- if ($target ne 'tex') {
- #output of syllabusfields will be generated here.
- &Apache::lontemplate::print_start_template($r,$syllabusfields{$field},'LC_Box');
- $r->print($message);
- $r->print("
");
- &Apache::lontemplate::print_textarea_template($r, $syllabus{$field},
- $field, Apache::lontemplate->RICH_TEXT_DETECT_HTML);
- &Apache::lontemplate::print_saveall_template($r);
- $r->print("
");
- &Apache::lontemplate::print_end_template($r);
- } else {
- my $safeinit;
- $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
- }
- }
- }
- }
- }
+ #Image in Student view and printout.
+ else {
+ $r->print($image);
+ }
+
+ my $links_handler = sub {
+ my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed) = @_;
+ if ($group ne '') {
+ my %data = %{$data_ref};
+ my %fields = %{$fields_ref};
+ $r->print('
');
+ &display_group_links($r, $target, $group, 'edit', $refarg, %groupinfo);
+ $r->print('
');
+ }
+ };
+ my $title_handler = sub {};
+ my %custom_handlers = (
+ 'abb_links' => $links_handler,
+ 'aaa_title' => $title_handler
+ );
+ &Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields,
+ $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_handlers, $group);
+
if ($allowed && ($env{'form.grade_target'} ne 'tex')) {
$r->print(&Apache::lonhtmlcommon::htmlareaselectactive
('bbb_content').'');