--- loncom/interface/lonsimplepage.pm 2005/11/16 12:47:59 1.29 +++ loncom/interface/lonsimplepage.pm 2006/05/09 14:38:10 1.39 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.29 2005/11/16 12:47:59 raeburn Exp $ +# $Id: lonsimplepage.pm,v 1.39 2006/05/09 14:38:10 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -45,25 +45,18 @@ sub handler { return OK if $r->header_only; my $target=$env{'form.grade_target'}; # ------------------------------------------------------------ Print the screen - if ($target ne 'tex') { - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA -ENDDOCUMENT - } else { + if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } my (undef,undef,undef,undef,$marker,$caller)=split(/\//,$r->uri); # Is this even in a course? unless ($env{'request.course.id'}) { if ($target ne 'tex') { - $r->print('Not in a course'); - return OK; + &Apache::loncommon::simple_error_page($r,'','Not in a course'); } else { $r->print('\textbf{Not in a course}\end{document}'); } + return OK; } my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; @@ -77,20 +70,21 @@ ENDDOCUMENT if ($caller eq 'grppg') { $marker =~ s/\W//g; $namespace = 'grppage_'.$marker; - unless(&Apache::lonnet::get_coursegroups($dom,$crs,\%curr_group, - $marker)) { - $r->print('Invalid group name'); - return OK; + my %curr_groups = &Apache::loncommon::coursegroups($dom,$crs,$marker); + if (!%curr_groups) { + &Apache::loncommon::simple_error_page($r,'','Invalid group name'); + return OK; } - %groupinfo = &Apache::loncommon::get_group_settings($curr_group{$marker}); + %groupinfo = + &Apache::loncommon::get_group_settings($curr_groups{$marker}); } else { $marker=~s/\D//g; $namespace = 'smppage_'.$marker; } - unless ($marker) { - $r->print('Invalid call'); - return OK; + if (!$marker) { + &Apache::loncommon::simple_error_page($r,'','Invalid call'); + return OK; } # --------------------------------------------------------- The syllabus fields @@ -106,18 +100,11 @@ ENDDOCUMENT # ------------------------------------------------------------ Get query string &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['forcestudent','forceedit','register']); -# ----------------------------------------------------- Force menu registration - my $addentries=''; - if ($env{'form.register'}) { - $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). - '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; - $r->print(&Apache::lonmenu::registerurl(1)); - } # --------------------------------------------------------------- Force Student my $forcestudent=''; if ($env{'form.forcestudent'} || $target eq 'tex' ) { $forcestudent='student'; }; - my $forceedit=''; - if ($env{'form.forceedit'}) { $forceedit='edit'; } + my $forceedit=''; + if ($env{'form.forceedit'}) { $forceedit='edit'; } my %syllabus=&Apache::lonnet::dump($namespace,$dom,$crs); @@ -129,9 +116,13 @@ ENDDOCUMENT if ($caller eq 'grppg') { $title = 'Group Page'; } - $r->print(&Apache::lonhtmlcommon::htmlareaheaders(). - ''.&Apache::loncommon::bodytag - ($title,$forcestudent,$addentries,'',$dom,$env{'form.register'})); + my $start_page = + &Apache::loncommon::start_page($title,undef, + {'function' => $forcestudent, + 'domain' => $dom, + 'force_register' => + $env{'form.register'},}); + $r->print($start_page); } if ($caller eq 'grppg') { @@ -139,18 +130,19 @@ ENDDOCUMENT (&Apache::loncommon::check_group_access($caller))) { unless(&Apache::lonnet::allowed('vgh', $env{'request.course.id'}.'/'.$marker)) { - &display_group_links($r,$target,$marker,%groupinfo,'view'); + &display_group_links($r,$target,$marker,'view',%groupinfo); return OK; } } else { + my $msg = + &mt('You do not currently have rights to view this group.'); if ($target ne 'tex') { - $r->print('You do not currently have rights to - view this group. - '); - return OK; + $r->print("

$msg

". + &Apache::loncommon::end_page()); } else { - $r->print('\textbf{You do not currently have rights to view this group}\end{document}'); + $r->print('\textbf{'.$msg.'}\end{document}'); } + return OK; } } @@ -193,7 +185,7 @@ ENDDOCUMENT } } $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put($caller.'_'.$marker,\%syllabus,$dom,$crs); + &Apache::lonnet::put($namespace,\%syllabus,$dom,$crs); } if (($allowed) && ($env{'form.storesyl'})) { foreach (keys %syllabusfields) { @@ -206,7 +198,7 @@ ENDDOCUMENT $syllabus{$_}=$field; } $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put($caller.'_'.$marker,\%syllabus,$dom,$crs); + &Apache::lonnet::put($namespace,\%syllabus,$dom,$crs); } # ---------------------------------------------------------------- Get syllabus @@ -244,7 +236,7 @@ ENDDOCUMENT if ($_ eq 'abb_links' && $caller eq 'grppg') { $r->print('
'); - &display_group_links($r,$target,$marker,%groupinfo,'edit'); + &display_group_links($r,$target,$marker,'edit',%groupinfo); $r->print('
'); } elsif ($_ eq 'aaa_title') { if ($target ne 'tex') { @@ -302,7 +294,7 @@ ENDDOCUMENT $r->print('

No page information provided.

'); } if ($env{'form.grade_target'} ne 'tex') { - $r->print(''); + $r->print(&Apache::loncommon::end_page()); } else { $r->print('\end{document}'); } @@ -310,13 +302,12 @@ ENDDOCUMENT } sub display_group_links { - my ($r,$target,$marker,%groupinfo,$context) = @_; + my ($r,$target,$marker,$context,%groupinfo) = @_; my @available = (); - my %menu = (); %{$menu{'email'}} = ( text => 'Group e-mail', - href => '/adm/email?group='.$marker, + href => '/adm/email?compose=group&group='.$marker, ); %{$menu{'discussion'}} = ( text => 'Discussion Boards', @@ -328,7 +319,7 @@ sub display_group_links { ); %{$menu{'files'}} = ( text => 'File repository', - href => '/adm/portfolio?group='.$marker, + href => '/adm/coursegrp_portfolio?group='.$marker, ); %{$menu{'roster'}} = ( text => 'Membership roster', @@ -360,7 +351,7 @@ sub display_group_links { if ($context eq 'edit') { $output = 'No group functionality'; } else { - $output = 'No group functionality (e.g., e-mail, discussion,chat or file upload) is currently available to you in this group: '.$marker; + $output = 'No group functionality (e.g., e-mail, discussion, chat or file upload) is currently available to you in this group: '.$marker; } if ($target eq 'tex') { $r->print(&Apache::lonxml::xmlparse($r,'tex',$output));