--- loncom/interface/lonsimplepage.pm 2009/05/20 02:37:30 1.59.2.1 +++ loncom/interface/lonsimplepage.pm 2009/05/07 16:20:37 1.79 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.59.2.1 2009/05/20 02:37:30 raeburn Exp $ +# $Id: lonsimplepage.pm,v 1.79 2009/05/07 16:20:37 amueller Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,7 @@ package Apache::lonsimplepage; use strict; use Apache::Constants qw(:common); use Apache::loncommon; +use Apache::lontemplate; use Apache::lonnet; use Apache::lontexconvert; use Apache::lonfeedback; @@ -70,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'}) { @@ -98,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'}); } @@ -132,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 = '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, @@ -162,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') { @@ -178,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

". @@ -188,7 +189,7 @@ sub handler { } return OK; } - my ($blocked,$blocktext) = + my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('groups'); if ($blocked) { $r->print($blocktext); @@ -198,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; @@ -214,27 +215,6 @@ sub handler { if ($forcestudent or $target eq 'tex') { $allowed=0; } - if ($allowed) { - $r->print('

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

'); - } 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) { @@ -252,6 +232,13 @@ sub handler { $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.storesyl'})) { foreach my $syl_field (keys(%syllabusfields)) { my $field=$env{'form.'.$syl_field}; @@ -266,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'}); - - my $image=''; + + $image=''; if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); - } - $r->print($image); - } + } + } + if ($allowed) { $r->print( '
'. @@ -290,9 +312,16 @@ sub handler { ''. '
'. ''); + if($syllabus{'uploaded.photourl'}) { + $r->print('' ); + } } + 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); @@ -312,43 +341,40 @@ sub handler { $r->print('
'); } elsif ($field eq 'aaa_title') { if ($target ne 'tex') { - $r->print('

'.$message.'

'); + if($allowed){ + $r->print('

'); + } + $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_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 (($field ne 'bbb_content') || ($allowed)) { - if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$field}.'

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

'.$syllabusfields{$field}.'

')); - } - } if ($target ne 'tex') { - $r->print('
'. - $message.'
'); + if($allowed){ + $r->print('

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

'.$syllabusfields{$field}.'

')); $r->print(&Apache::lonxml::xmlparse($r,'tex',$message)); } if ($allowed) { if ($target ne 'tex') { - $r->print('
'); + &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); + $r->print('

'); } else { my $safeinit; $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); @@ -366,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') { @@ -439,7 +465,7 @@ sub display_group_links { my $output; if ($context eq 'edit') { $output = &mt('No group functionality.'); - } else { + } 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') { @@ -459,11 +485,10 @@ sub grouppage_breadcrumbs { title=>"Display Groups"}, {href=>"/adm/$cdom/$cnum/$group/smppg?ref=grouplist", text=>&mt('Group:')." $description", - title=>&mt("Go to group's home page"), - no_mt=>1,}, + title=>"Go to group's home page"}, ); my $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Group page - [_1]', - $description),undef,undef,undef,undef,1); + $description)); return $output; }