--- loncom/interface/lonsimplepage.pm 2006/07/08 01:12:53 1.44 +++ loncom/interface/lonsimplepage.pm 2006/07/20 03:11:52 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.44 2006/07/08 01:12:53 raeburn Exp $ +# $Id: lonsimplepage.pm,v 1.45 2006/07/20 03:11:52 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,7 +50,7 @@ sub handler { if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } - my (undef,undef,$udom,$uname,$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') { @@ -63,10 +63,8 @@ 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,$group,$grp_desc); - + my ($namespace,$group,$group_desc,$group_home_view,$group_home_edit, + $group_view_perm,$group_edit_perm); my %curr_group = (); my %groupinfo = (); if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) { @@ -79,7 +77,7 @@ sub handler { } %groupinfo = &Apache::longroup::get_group_settings($curr_groups{$group}); - $grp_desc = &unescape($groupinfo{'description'}); + $group_desc = &unescape($groupinfo{'description'}); $namespace = 'grppage_'.$group; } else { $marker=~s/\D//g; @@ -97,7 +95,7 @@ sub handler { 'bbb_content' => 'Content', 'ccc_webreferences' => 'Web References'); if ($group ne '') { - $syllabusfields{'abb_links'} = &mt('Functionality'); + $syllabusfields{'abb_links'} = &mt('Available Group Tools'); } @@ -111,6 +109,10 @@ sub handler { 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); @@ -131,20 +133,24 @@ sub handler { } if ($group ne '') { - if (($grp_view_permission) || - (&Apache::longroup::check_group_access($caller))) { - if ((!&Apache::lonnet::allowed('vgh', - $env{'request.course.id'}.'/'.$marker)) - && (!&Apache::lonnet::allowed('mdg', - $env{'request.course.id'}.'/'.$marker))) { - if ($env{'form.ref'} eq 'grouplist') { - my $gpterm = &Apache::loncommon::group_term(); - my $ucgpterm = $gpterm; - $ucgpterm =~ s/^(\w)/uc($1)/e; - $r->print(&grouppage_breadcrumbs($dom,$crs,$group,$gpterm, - $ucgpterm,$grp_desc)); - } - &display_group_links($r,$target,$marker,'view',%groupinfo); + 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 { @@ -161,11 +167,11 @@ sub handler { } my $allowed; + if ($group ne '') { - $allowed = &Apache::lonnet::allowed('mdg',$env{'request.course.id'}); + $allowed = $group_edit_perm; if (!$allowed) { - $allowed = &Apache::lonnet::allowed('mgh',$env{'request.course.id'}. - '/'.$marker); + $allowed = $group_home_edit; } } else { $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); @@ -179,10 +185,22 @@ sub handler { 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)) { @@ -190,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'); @@ -216,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='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') { @@ -305,7 +326,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()); @@ -316,33 +341,30 @@ sub handler { } sub display_group_links { - my ($r,$target,$marker,$context,%groupinfo) = @_; - my $refarg; - if ($env{'form.ref'} eq 'grouplist') { - $refarg = '&ref=grouplist'; - } + my ($r,$target,$group,$context,$refarg,%groupinfo) = @_; my @available = (); my %menu = (); %{$menu{'email'}} = ( text => 'Group e-mail', - href => '/adm/email?compose=group&group='.$marker. - $refarg, + href => '/adm/email?compose=group&group='.$group. + $refarg, ); %{$menu{'discussion'}} = ( text => 'Discussion Boards', - href => '/adm/groupboards?group='.$marker.$refarg, + 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.$refarg, + href => '/adm/coursegrp_portfolio?group='.$group. + $refarg, ); %{$menu{'roster'}} = ( text => 'Membership roster', - href => '/adm/grouproster?group='.$marker.$refarg, + href => '/adm/grouproster?group='.$group.$refarg, ); foreach my $tool (sort(keys(%menu))) { if ($groupinfo{functions}{$tool} eq 'on') { @@ -353,7 +375,7 @@ sub display_group_links { my $output = ''; foreach my $tool (@available) { if ($target eq 'tex') { - $output .= ''; + $output .= ''; } else { $output .= ''; @@ -361,16 +383,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)); @@ -381,17 +403,18 @@ sub display_group_links { } sub grouppage_breadcrumbs { - my ($cdom,$cnum,$group,$gpterm,$ucgpterm,$description) = @_; + my ($cdom,$cnum,$group,$description) = @_; &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/coursegroups", - text=>"$ucgpterm".'s', - title=>"Display $ucgpterm".'s'}, + text=>"Groups", + title=>"Display Groups"}, {href=>"/adm/$cdom/$cnum/$group/smppg?ref=grouplist", - text=>"$ucgpterm: $description", + text=>"Group: $description", title=>"Go to group's home page"}, ); - my $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('[_1] page - [_2]',$gpterm,$description)); + my $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Group page - [_1]', + $description)); return $output; }