--- loncom/interface/lonsimplepage.pm 2008/12/22 00:00:51 1.63 +++ loncom/interface/lonsimplepage.pm 2009/05/11 13:34:10 1.80 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.63 2008/12/22 00:00:51 riegler Exp $ +# $Id: lonsimplepage.pm,v 1.80 2009/05/11 13:34:10 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,7 +71,7 @@ sub handler { # ------------------------------------------------------------ Print the screen if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); - } + } # Is this even in a course? unless ($env{'request.course.id'}) { @@ -99,7 +99,7 @@ sub handler { &Apache::loncommon::simple_error_page($r,'','Invalid group name'); return OK; } - %groupinfo = + %groupinfo = &Apache::longroup::get_group_settings($curr_groups{$group}); $group_desc = &unescape($groupinfo{'description'}); } @@ -133,17 +133,17 @@ sub handler { if ($env{'form.ref'}) { $refarg = '&ref='.$env{'form.ref'}; } - + my %syllabus=&Apache::lonnet::dump($db_name,$dom,$crs); - + # --------------------------------------- There is such a user, get environment if ($target ne 'tex') { - my $title = 'Course Page'; + my $title = 'Simple Course Page'; if ($group ne '') { - $title = 'Group Page'; + $title = 'Simple Group Page'; } - my $start_page = + my $start_page = &Apache::loncommon::start_page($title,undef, {'function' => $forcestudent, 'domain' => $dom, @@ -163,12 +163,12 @@ sub handler { $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 || + 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) && + if ((!$group_home_edit) && (!$group_home_view) && (!$group_view_perm) && (!$group_edit_perm)) { &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); if ($env{'form.grade_target'} ne 'tex') { @@ -179,7 +179,7 @@ sub handler { return OK; } } else { - my $msg = + my $msg = &mt('You do not currently have rights to view this group.'); if ($target ne 'tex') { $r->print("

$msg

". @@ -189,7 +189,7 @@ sub handler { } return OK; } - my ($blocked,$blocktext) = + my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('groups'); if ($blocked) { $r->print($blocktext); @@ -199,13 +199,13 @@ sub handler { } my $allowed; - + if ($group ne '') { $allowed = $group_edit_perm; if (!$allowed) { - $allowed = $group_home_edit; + $allowed = $group_home_edit; } - } else { + } else { $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); } my $privileged=$allowed; @@ -215,27 +215,6 @@ sub handler { if ($forcestudent or $target eq 'tex') { $allowed=0; } - if ($allowed) { - $r->print('

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

'); - } elsif ($privileged and $target ne 'tex') { - 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)) { if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { @@ -274,21 +253,56 @@ 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()); + if ($allowed) { + $r->print(&Apache::lontemplate::item_functionslist( + ''.&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.'')); + if ($group ne '') { + if ($group_edit_perm) { + $r->print(&Apache::lontemplate::item_functionslist( + '' + .&mt('Edit Group Settings').'')); + } + } + } + $r->print(&Apache::lontemplate::end_functionslist()); + } + } + # ---------------------------------------------------------------- Get syllabus - if ((($syllabus{'uploaded.lastmodified'}) && - (($group ne '' && ($group_home_view || $group_edit_perm || + if ((($syllabus{'uploaded.lastmodified'}) && + (($group ne '' && ($group_home_view || $group_edit_perm || $group_view_perm)) || ($group eq ''))) || ($allowed)) { my $image; if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/smppg', $syllabus{'uploaded.photourl'}); - + $image=''; + />'; if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); } } + if ($allowed) { $r->print( '
'. @@ -297,16 +311,17 @@ sub handler { ''. ''. '
'. - ''. - '' ); - } - &Apache::lontemplate::start_columnSection($r); - if($allowed){ - $r->print($image.'
 
'); + ''); + if ($syllabus{'uploaded.photourl'}) { + $r->print('' ); } - &Apache::lontemplate::start_ContentBox($r,$allowed); + } + if ($allowed) { + $r->print($image.'
 
'); + } + foreach my $field (sort(keys(%syllabusfields))) { - if (($syllabus{$field}) || ($allowed) || + if (($syllabus{$field}) || ($allowed) || ($field eq 'abb_links' && $group ne '')) { my $message=$syllabus{$field}; &Apache::lonfeedback::newline_to_br(\$message); @@ -326,30 +341,31 @@ sub handler { $r->print('
'); } elsif ($field eq 'aaa_title') { if ($target ne 'tex') { - if($allowed){ + if ($allowed) { $r->print('

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

'.$message.'

'); + $r->print('

'.$message.'

'); } else { my $safeinit; $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$message.'

')); } if ($allowed) { if ($env{'form.grade_target'} ne 'tex') { - $r->print('

'.&mt('Title').'

'); - &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); + &Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_ContentBoxSpecial'); + &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); $r->print('

'); } else { my $safeinit; $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); } } + if(!$allowed) {$r->print($image); } } else { if ($target ne 'tex') { - if($allowed){ + if ($allowed) { $r->print('

'); - } - &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed); + } + &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial'); } else { my $safeinit; $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$syllabusfields{$field}.'

')); @@ -367,16 +383,6 @@ sub handler { } } } - &Apache::lontemplate::end_ContentBox($r); - if(!$allowed){ - $r->print($image); - } - &Apache::lontemplate::end_columnSection($r); - if ($allowed) { - $r->print('

'.'
' - .''.&mt('Show Student View').''. - &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); - } if ($allowed && ($env{'form.grade_target'} ne 'tex')) { $r->print(&Apache::lonhtmlcommon::htmlareaselectactive ('bbb_content').'
'); @@ -386,7 +392,7 @@ sub handler { if ($group ne '') { &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); } else { - $r->print(&mt('

No page information provided.

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

'.&mt('No page information provided.').'

'); } } if ($env{'form.grade_target'} ne 'tex') { @@ -411,11 +417,11 @@ sub display_group_links { href => '/adm/groupboards?group='.$group.$refarg, ); %{$menu{'chat'}} = ( - text => 'Group Chat', + text => 'Group Chat Room', href => "javascript:group_chat('$group')", ); %{$menu{'files'}} = ( - text => 'File Repository', + text => 'Group Portfolio', href => '/adm/coursegrp_portfolio?group='.$group. $refarg, ); @@ -429,16 +435,27 @@ sub display_group_links { } } if (@available > 0) { - my $output = ''; + my $output = ''; + if ($target eq 'tex') { + $output = '
'; + } else { + $output = &Apache::loncommon::start_data_table(); + } foreach my $tool (@available) { if ($target eq 'tex') { - $output .= ''; + $output .= ''; } else { - $output .= ''; + $output .= &Apache::loncommon::start_data_table_row() + .'' + .&Apache::loncommon::end_data_table_row(); } } - $output .= '
'.&mt($menu{$tool}{text}).'
'.&mt($menu{$tool}{text}).'
'. - &mt($menu{$tool}{text}).'' + .&mt($menu{$tool}{text}).'
'; + if ($target eq 'tex') { + $output .= ''; + } else { + $output .= &Apache::loncommon::end_data_table(); + } if ($target eq 'tex') { $r->print(&Apache::lonxml::xmlparse($r,'tex',&mt('Available functions').'

'.$output)); } else { @@ -448,8 +465,8 @@ sub display_group_links { my $output; if ($context eq 'edit') { $output = &mt('No group functionality.'); - } else { - $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'}).''); + } else { + $output = &mt('No group functionality (e.g., e-mail, discussion, chat room 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)); @@ -467,7 +484,7 @@ sub grouppage_breadcrumbs { text=>"Groups", title=>"Display Groups"}, {href=>"/adm/$cdom/$cnum/$group/smppg?ref=grouplist", - text=>"Group: $description", + text=>&mt('Group:')." $description", title=>"Go to group's home page"}, ); my $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Group page - [_1]',