--- loncom/interface/lonsimplepage.pm 2009/05/19 09:59:48 1.82 +++ loncom/interface/lonsimplepage.pm 2010/01/07 14:45:08 1.92 @@ -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.92 2010/01/07 14:45:08 wenzelju Exp $ # # Copyright Michigan State University Board of Trustees # @@ -182,7 +182,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}'); @@ -232,13 +232,13 @@ sub handler { $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 +253,45 @@ 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(); if ($allowed) { - $r->print(&Apache::lontemplate::item_functionslist( - ''.&mt('Show Student View').'' - .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'))); + $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 '') { $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,40 +299,76 @@ 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(''.&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') {