--- loncom/interface/lonsimplepage.pm 2006/04/10 19:59:54 1.38 +++ loncom/interface/lonsimplepage.pm 2006/07/20 15:03:01 1.46 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.38 2006/04/10 19:59:54 albertel Exp $ +# $Id: lonsimplepage.pm,v 1.46 2006/07/20 15:03:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,6 +37,8 @@ use Apache::lonfeedback; use Apache::lonlocal; use Apache::lonprintout; use Apache::lonxml; +use Apache::longroup; +use LONCAPA; sub handler { my $r = shift; @@ -48,7 +50,7 @@ sub handler { 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); + my (undef,undef,$udom,$uname,$marker)=split(/\//,$r->uri); # Is this even in a course? unless ($env{'request.course.id'}) { if ($target ne 'tex') { @@ -61,23 +63,23 @@ sub handler { my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $grp_view_permission = &Apache::lonnet::allowed('vcg', - $env{'request.course.id'}); - my $namespace; - + my ($namespace,$group,$group_desc,$group_home_view,$group_home_edit, + $group_view_perm,$group_edit_perm); my %curr_group = (); my %groupinfo = (); - if ($caller eq 'grppg') { + if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) { $marker =~ s/\W//g; - $namespace = 'grppage_'.$marker; - my %curr_groups; - if (!&Apache::loncommon::coursegroups(\%curr_groups,$dom,$crs,$marker)) { + $group = $marker; + my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$group); + if (!%curr_groups) { &Apache::loncommon::simple_error_page($r,'','Invalid group name'); return OK; } %groupinfo = - &Apache::loncommon::get_group_settings($curr_groups{$marker}); - } else { + &Apache::longroup::get_group_settings($curr_groups{$group}); + $group_desc = &unescape($groupinfo{'description'}); + $namespace = 'grppage_'.$group; + } else { $marker=~s/\D//g; $namespace = 'smppage_'.$marker; } @@ -92,20 +94,25 @@ sub handler { 'aaa_title' => 'Page Title', 'bbb_content' => 'Content', 'ccc_webreferences' => 'Web References'); - if ($caller eq 'grppg') { - $syllabusfields{'abb_links'} = &mt('Functionality'); + if ($group ne '') { + $syllabusfields{'abb_links'} = &mt('Available Group Tools'); } # ------------------------------------------------------------ Get query string &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','forceedit','register']); + ($ENV{'QUERY_STRING'},['forcestudent','forceedit', + 'register','ref']); # --------------------------------------------------------------- Force Student my $forcestudent=''; if ($env{'form.forcestudent'} || $target eq 'tex' ) { $forcestudent='student'; }; my $forceedit=''; if ($env{'form.forceedit'}) { $forceedit='edit'; } + my $refarg; + if ($env{'form.ref'}) { + $refarg = '&ref='.$env{'form.ref'}; + } my %syllabus=&Apache::lonnet::dump($namespace,$dom,$crs); @@ -113,7 +120,7 @@ sub handler { if ($target ne 'tex') { my $title = 'Course Page'; - if ($caller eq 'grppg') { + if ($group ne '') { $title = 'Group Page'; } my $start_page = @@ -125,12 +132,25 @@ sub handler { $r->print($start_page); } - if ($caller eq 'grppg') { - if (($grp_view_permission) || - (&Apache::loncommon::check_group_access($caller))) { - unless(&Apache::lonnet::allowed('vgh', - $env{'request.course.id'}.'/'.$marker)) { - &display_group_links($r,$target,$marker,'view',%groupinfo); + if ($group ne '') { + my $group_view_perm = + &Apache::lonnet::allowed('vcg',$env{'request.course.id'}. + ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); + $group_edit_perm = + &Apache::lonnet::allowed('mdg',$env{'request.course.id'}. + ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); + $group_home_view = &Apache::lonnet::allowed('vgh', + $env{'request.course.id'}.'/'.$group); + $group_home_edit = &Apache::lonnet::allowed('mgh', + $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')) { + $r->print(&grouppage_breadcrumbs($dom,$crs,$group,$group_desc)); + } + if ((!$group_home_edit) && (!$group_home_view) && + (!$group_view_perm) && (!$group_edit_perm)) { + &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); return OK; } } else { @@ -147,11 +167,11 @@ sub handler { } my $allowed; - if ($caller eq 'grppg') { - $allowed = $grp_view_permission; - unless ($allowed) { - $allowed = &Apache::lonnet::allowed('mgh',$env{'request.course.id'}. - '/'.$marker); + + if ($group ne '') { + $allowed = $group_edit_perm; + if (!$allowed) { + $allowed = $group_home_edit; } } else { $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); @@ -162,13 +182,25 @@ sub handler { } if ($forcestudent or $target eq 'tex') { $allowed=0; } - + if ($allowed) { $r->print('

'. - &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'
'.&mt('Show Student View').''. + &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'
'.&mt('Show Student View').''. &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); } elsif ($privileged and $target ne 'tex') { - $r->print(''.&mt('Edit').''); + my $edittext = &mt('Edit'); + if ($group ne '') { + $edittext = &mt('Edit Group Homepage'); + } + $r->print(''.$edittext.''); + if ($group ne '') { + if ($group_edit_perm) { + $r->print('   '. + ''. + &mt('Edit Group Settings').''); + } + } } if (($env{'form.uploaddoc.filename'} and $target ne 'tex') && ($env{'form.storeupl'}) && ($allowed)) { @@ -176,9 +208,9 @@ sub handler { if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); } - if ($caller eq 'grppage') { + if ($group ne '') { $syllabus{'uploaded.photourl'}=&Apache::lonnet::userfileupload( - 'uploaddoc',1,"grouppage/$marker"); + 'uploaddoc',1,"grouppage/$group"); } else { $syllabus{'uploaded.photourl'}= &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage'); @@ -202,9 +234,11 @@ sub handler { } # ---------------------------------------------------------------- Get syllabus - if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { + if ((($syllabus{'uploaded.lastmodified'}) && + (($group ne '' && ($group_home_view || $group_edit_perm || + $group_view_perm)) || ($group eq ''))) || ($allowed)) { if ($syllabus{'uploaded.photourl'}) { - &Apache::lonnet::allowuploaded('/adm/'.$caller, + &Apache::lonnet::allowuploaded('/adm/smppg', $syllabus{'uploaded.photourl'}); my $image='
'); } foreach (sort keys %syllabusfields) { - if (($syllabus{$_}) || ($allowed)) { + if (($syllabus{$_}) || ($allowed) || + ($_ eq 'abb_links' && $group ne '')) { my $message=$syllabus{$_}; &Apache::lonfeedback::newline_to_br(\$message); $message @@ -233,10 +268,11 @@ sub handler { $message=&Apache::lonspeller::markeduptext($message); } $message=&Apache::lontexconvert::msgtexconverted($message); - if ($_ eq 'abb_links' && $caller eq 'grppg') { + if ($_ eq 'abb_links' && $group ne '') { $r->print('
'); - &display_group_links($r,$target,$marker,'edit',%groupinfo); + &display_group_links($r,$target,$group,'edit',$refarg, + %groupinfo); $r->print('
'); } elsif ($_ eq 'aaa_title') { if ($target ne 'tex') { @@ -291,7 +327,11 @@ sub handler { } if ($env{'form.grade_target'} ne 'tex') {$r->print('

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

No page information provided.

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

No page information provided.

')); + } } if ($env{'form.grade_target'} ne 'tex') { $r->print(&Apache::loncommon::end_page()); @@ -302,28 +342,30 @@ sub handler { } sub display_group_links { - my ($r,$target,$marker,$context,%groupinfo) = @_; + my ($r,$target,$group,$context,$refarg,%groupinfo) = @_; my @available = (); my %menu = (); %{$menu{'email'}} = ( text => 'Group e-mail', - href => '/adm/email?compose=group&group='.$marker, + href => '/adm/email?compose=group&group='.$group. + $refarg, ); %{$menu{'discussion'}} = ( text => 'Discussion Boards', - href => '/adm/groupboards?group='.$marker, + href => '/adm/groupboards?group='.$group.$refarg, ); %{$menu{'chat'}} = ( text => 'Group chat', - href => "javascript:group_chat('$marker')", + href => "javascript:group_chat('$group')", ); %{$menu{'files'}} = ( text => 'File repository', - href => '/adm/coursegrp_portfolio?group='.$marker, + href => '/adm/coursegrp_portfolio?group='.$group. + $refarg, ); %{$menu{'roster'}} = ( text => 'Membership roster', - href => '/adm/grouproster?group='.$marker, + href => '/adm/grouproster?group='.$group.$refarg, ); foreach my $tool (sort(keys(%menu))) { if ($groupinfo{functions}{$tool} eq 'on') { @@ -334,7 +376,7 @@ sub display_group_links { my $output = ''; foreach my $tool (@available) { if ($target eq 'tex') { - $output .= ''; + $output .= ''; } else { $output .= ''; @@ -342,16 +384,16 @@ sub display_group_links { } $output .= '
'.$menu{$tool}{text}.''.&mt($menu{$tool}{text}).''. $menu{$tool}{text}.'
'; if ($target eq 'tex') { - $r->print(&Apache::lonxml::xmlparse($r,'tex','Available functions

'.$output)); + $r->print(&Apache::lonxml::xmlparse($r,'tex',&mt('Available functions').'

'.$output)); } else { - $r->print('

Functions

'.$output); + $r->print('

'.&mt('Available Group Tools').'

'.$output); } } else { my $output; if ($context eq 'edit') { - $output = 'No group functionality'; + $output = &mt('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 = &mt('No group functionality (e.g., e-mail, discussion, chat or file upload) is currently available to you in this group: [_1].',&unescape($groupinfo{'description'})); } if ($target eq 'tex') { $r->print(&Apache::lonxml::xmlparse($r,'tex',$output)); @@ -360,7 +402,22 @@ sub display_group_links { } } } - + +sub grouppage_breadcrumbs { + my ($cdom,$cnum,$group,$description) = @_; + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/coursegroups", + text=>"Groups", + title=>"Display Groups"}, + {href=>"/adm/$cdom/$cnum/$group/smppg?ref=grouplist", + text=>"Group: $description", + title=>"Go to group's home page"}, + ); + my $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Group page - [_1]', + $description)); + return $output; +} 1; __END__