--- loncom/interface/lonsimplepage.pm 2009/07/10 15:05:28 1.85 +++ 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.85 2009/07/10 15:05:28 bisitz 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) && @@ -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}; @@ -257,19 +259,28 @@ sub handler { if ($target ne 'tex') { if ($allowed || $privileged) { 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) { + $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'); } $functions.=&Apache::lonhtmlcommon::add_item_funclist( - '' + '' .$edittext.''); if ($group ne '') { if ($group_edit_perm) { @@ -299,7 +310,36 @@ 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('