--- loncom/interface/lonsimplepage.pm 2009/05/19 09:59:48 1.82 +++ loncom/interface/lonsimplepage.pm 2010/10/27 01:00:38 1.97 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.82 2009/05/19 09:59:48 amueller Exp $ +# $Id: lonsimplepage.pm,v 1.97 2010/10/27 01:00:38 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,6 +39,7 @@ use Apache::lonlocal; use Apache::lonprintout; use Apache::lonxml; use Apache::longroup; +use Apache::lonnavmaps(); use HTML::Entities(); use LONCAPA; @@ -165,7 +166,8 @@ sub handler { $env{'request.course.id'}.'/'.$group); if ($group_view_perm || $group_edit_perm || $group_home_view || $group_home_edit || &Apache::longroup::check_group_access($group)) { - if (($env{'form.ref'} eq 'grouplist') && ($target ne 'tex')) { + if (($env{'form.ref'} eq 'grouplist') && ($target ne 'tex') && + (!$env{'form.register'})) { $r->print(&grouppage_breadcrumbs($dom,$crs,$group,$group_desc)); } if ((!$group_home_edit) && (!$group_home_view) && @@ -182,7 +184,7 @@ sub handler { my $msg = &mt('You do not currently have rights to view this group.'); if ($target ne 'tex') { - $r->print("

$msg

". + $r->print('

'.$msg.'

'. &Apache::loncommon::end_page()); } else { $r->print('\textbf{'.$msg.'}\end{document}'); @@ -223,22 +225,22 @@ sub handler { } if ($group ne '') { $syllabus{'uploaded.photourl'}=&Apache::lonnet::userfileupload( - 'uploaddoc',1,"grouppage/$group"); + 'uploaddoc','coursedoc',"grouppage/$group"); } else { $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage'); + &Apache::lonnet::userfileupload('uploaddoc','coursedoc','simplepage'); } } $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); } - if ($allowed && $env{'form.delupl'}) { - if ($syllabus{'uploaded.photourl'}) { - &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); - delete($syllabus{'uploaded.photourl'}); - &Apache::lonnet::del('simplepage',['uploaded.photourl']); - } - } +# if ($allowed && $env{'form.delupl'}) { +# if ($syllabus{'uploaded.photourl'}) { +# &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); +# delete($syllabus{'uploaded.photourl'}); +# &Apache::lonnet::del('simplepage',['uploaded.photourl']); +# } +# } if (($allowed) && ($env{'form.storesyl'})) { foreach my $syl_field (keys(%syllabusfields)) { my $field=$env{'form.'.$syl_field}; @@ -253,37 +255,54 @@ sub handler { &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); } -#---Print help Text - if($target ne 'tex'){ - if ($allowed) { - $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); - } - } #---Print Function if ($target ne 'tex') { if ($allowed || $privileged) { - $r->print(&Apache::lontemplate::start_functionslist()); + my $functions=&Apache::lonhtmlcommon::start_funclist(); + my $url = $r->uri; + if ($group ne '') { + my $navmap=Apache::lonnavmaps::navmap->new(); + if (ref($navmap)) { + $url = &Apache::longroup::get_group_link($dom,$crs,$group,$navmap); + } + } if ($allowed) { - $r->print(&Apache::lontemplate::item_functionslist( - ''.&mt('Show Student View').'' - .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'))); + $url .= (($url=~/\?/)?'&':'?').'forcestudent=1'; + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + '' + .&mt('Show Student View').'' + .&Apache::loncommon::help_open_topic( + 'Uploaded_Templates_PublicView')); } elsif ($privileged) { my $edittext = &mt('Edit'); - if ($group ne '') { + $url .= (($url=~/\?/)?'&':'?').'forceedit=edit'.$refarg; + if ($group ne '') { $edittext = &mt('Edit Group Homepage'); } - $r->print(&Apache::lontemplate::item_functionslist( - ''.$edittext.'')); + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + '' + .$edittext.''); if ($group ne '') { if ($group_edit_perm) { - $r->print(&Apache::lontemplate::item_functionslist( - '' - .&mt('Edit Group Settings').'')); + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + '' + .&mt('Edit Group Settings') + .''); } } } - $r->print(&Apache::lontemplate::end_functionslist()); + $functions.=&Apache::lonhtmlcommon::end_funclist(); + $r->print(&Apache::loncommon::head_subbox($functions)); + } + } + +#---Print help Text + if($target ne 'tex'){ + if ($allowed) { + $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); } } @@ -291,108 +310,103 @@ sub handler { if ((($syllabus{'uploaded.lastmodified'}) && (($group ne '' && ($group_home_view || $group_edit_perm || $group_view_perm)) || ($group eq ''))) || ($allowed)) { - my $image; + #Print the title + my $titletext=&HTML::Entities::encode($syllabus{'aaa_title'},'<>&"'); + if ($target ne 'tex') { + if ($allowed) { + } + $r->print('

'.$titletext.'

'); + } else { + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$titletext.'

')); + } + if ($allowed) { + if ($env{'form.grade_target'} ne 'tex') { + #editbox for title + $r->print('
'); + &Apache::lontemplate::print_start_template($r,&mt('Title'),'LC_Box'); + $r->print($titletext); + $r->print("
"); + &Apache::lontemplate::print_textarea_template($r, $syllabus{'aaa_title'}, + 'aaa_title', Apache::lontemplate->RICH_TEXT_ALWAYS_OFF); + &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{'aaa_title'},$safeinit)); + } + } + + #print the image + my $image=''; if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/smppg', $syllabus{'uploaded.photourl'}); - $image=''; + $image=''.&mt('Image').''; if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); } } if ($allowed) { + &Apache::lontemplate::print_start_template($r, &mt('Upload a Photo'),'LC_Box'); + $r->print($image); + $r->print("

"); $r->print( - ''. - ''. - '

'.&mt('Upload a Photo').'

'. - ''. - ''. - '
'. - ''); - if ($syllabus{'uploaded.photourl'}) { - $r->print('' ); - } - } - 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}; - &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') { - if ($target ne 'tex') { - if ($allowed) { - $r->print('

'); - } - $r->print('

'.$message.'

'); - } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$message.'

')); - } - if ($allowed) { - if ($env{'form.grade_target'} ne 'tex') { - &Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_ContentBoxSpecial'); - &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); - $r->print('

'); - } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); - } - } - if (!$allowed) {$r->print($image); } - } else { - if ($target ne 'tex') { - if ($allowed) { - $r->print('

'); - } - &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial'); - } 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') { - &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); - $r->print('

'); - } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); - } - } - } - } - } + ''. + ''. + ''. + ''); + &Apache::lontemplate::print_end_template($r); + + +# if ($syllabus{'uploaded.photourl'}) { +# $r->print(''); +# } + } + #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').''); + $r->print(&Apache::lonhtmlcommon::htmlareaselectactive(). + ''); } - if ($env{'form.grade_target'} ne 'tex') {$r->print('

');} } else { if ($group ne '') { &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); } else { - $r->print('

'.&mt('No page information provided.').'

'); + my $text=&mt('No page information provided.'); + if ($target ne 'tex') { + $r->print('

'.$text.'

'); + } else { + $r->print($text) + } } } if ($env{'form.grade_target'} ne 'tex') {