--- loncom/interface/lonsimplepage.pm 2006/08/16 19:40:46 1.47 +++ loncom/interface/lonsimplepage.pm 2009/03/08 21:49:33 1.75 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.47 2006/08/16 19:40:46 albertel Exp $ +# $Id: lonsimplepage.pm,v 1.75 2009/03/08 21:49:33 weissno 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; @@ -41,6 +42,26 @@ use Apache::longroup; use HTML::Entities(); use LONCAPA; +sub get_db_name { + my ($url) = @_; + my ($udom,$uname,$marker)=(split(m{/},$url))[2,3,4]; + my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; + + my $db_name; + + if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) { + $marker =~ s/\W//g; + $db_name = 'grppage_'.$marker; + } else { + $marker=~s/\D//g; + $db_name = 'smppage_'.$marker; + } + return if (!defined($marker)); + + return $db_name; +} + sub handler { my $r = shift; &Apache::loncommon::content_type($r,'text/html'); @@ -51,7 +72,7 @@ sub handler { if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } - my (undef,undef,$udom,$uname,$marker)=split(/\//,$r->uri); + # Is this even in a course? unless ($env{'request.course.id'}) { if ($target ne 'tex') { @@ -62,15 +83,17 @@ sub handler { return OK; } + my $db_name = &get_db_name($r->uri); + my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; - my ($namespace,$group,$group_desc,$group_home_view,$group_home_edit, + my ($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)) { - $marker =~ s/\W//g; - $group = $marker; + if ($db_name =~ /^grppage_/) { + $group = (split(m{/},$r->uri))[4]; + $group =~ s/\W//g; my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$group); if (!%curr_groups) { &Apache::loncommon::simple_error_page($r,'','Invalid group name'); @@ -79,13 +102,9 @@ sub handler { %groupinfo = &Apache::longroup::get_group_settings($curr_groups{$group}); $group_desc = &unescape($groupinfo{'description'}); - $namespace = 'grppage_'.$group; - } else { - $marker=~s/\D//g; - $namespace = 'smppage_'.$marker; } - if (!$marker) { + if (!$db_name) { &Apache::loncommon::simple_error_page($r,'','Invalid call'); return OK; } @@ -115,14 +134,14 @@ sub handler { $refarg = '&ref='.$env{'form.ref'}; } - my %syllabus=&Apache::lonnet::dump($namespace,$dom,$crs); + 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 = &Apache::loncommon::start_page($title,undef, @@ -150,8 +169,13 @@ sub handler { $r->print(&grouppage_breadcrumbs($dom,$crs,$group,$group_desc)); } if ((!$group_home_edit) && (!$group_home_view) && - (!$group_view_perm) && (!$group_edit_perm)) { + (!$group_view_perm) && (!$group_edit_perm)) { &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); + if ($env{'form.grade_target'} ne 'tex') { + $r->print(&Apache::loncommon::end_page()); + } else { + $r->print('\end{document}'); + } return OK; } } else { @@ -165,6 +189,13 @@ sub handler { } return OK; } + my ($blocked,$blocktext) = + &Apache::loncommon::blocking_status('groups'); + if ($blocked) { + $r->print($blocktext); + $r->print(&Apache::loncommon::end_page()); + return OK; + } } my $allowed; @@ -183,26 +214,7 @@ 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_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) { @@ -218,105 +230,149 @@ sub handler { } } $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put($namespace,\%syllabus,$dom,$crs); + &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 (keys %syllabusfields) { - my $field=$env{'form.'.$_}; + foreach my $syl_field (keys(%syllabusfields)) { + my $field=$env{'form.'.$syl_field}; chomp($field); $field=~s/\s+$//s; $field=~s/^\s+//s; $field=~s/\$//s; $field=&Apache::lonfeedback::clear_out_html($field,1); - $syllabus{$_}=$field; + $syllabus{$syl_field}=$field; } $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put($namespace,\%syllabus,$dom,$crs); + &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){ + &Apache::lontemplate::print_start_page_functions($r); + if($allowed){ + &Apache::lontemplate::print_functions_content($r,''.&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'); + } + &Apache::lontemplate::print_functions_content($r,''.$edittext.''); + if ($group ne '') { + if ($group_edit_perm) { + &Apache::lontemplate::print_functions_content($r,'   '. + ''. + &mt('Edit Group Settings').''); + } + } + } + &Apache::lontemplate::print_end_page_functions($r); + } + } + # ---------------------------------------------------------------- Get syllabus 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( '
'. ''. - '

Upload a Photo

'. - ''. - ''. - '
'); - } - foreach (sort keys %syllabusfields) { - if (($syllabus{$_}) || ($allowed) || - ($_ eq 'abb_links' && $group ne '')) { - my $message=$syllabus{$_}; + '

'.&mt('Upload a Photo').'

'. + ''. + ''. + '
'. + ''. + '' ); + } + if($allowed){ + $r->print($image.'
 
'); + } + + foreach my $field (sort(keys(%syllabusfields))) { + if (($syllabus{$field}) || ($allowed) || + ($field eq 'abb_links' && $group ne '')) { + my $message=$syllabus{$field}; &Apache::lonfeedback::newline_to_br(\$message); $message =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; if ($allowed) { $message=&Apache::lonspeller::markeduptext($message); } - $message=&Apache::lontexconvert::msgtexconverted($message); - if ($_ eq 'abb_links' && $group ne '') { - $r->print('
'); + if ($target ne 'tex') { + $message=&Apache::lontexconvert::msgtexconverted($message); + } + if ($field eq 'abb_links' && $group ne '') { + $r->print('
'); &display_group_links($r,$target,$group,'edit',$refarg, %groupinfo); $r->print('
'); - } elsif ($_ eq 'aaa_title') { + } 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( - '
Title
'); + if ($env{'form.grade_target'} ne 'tex') { + &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{$_},$safeinit)); + $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); } - } + } + if(!$allowed) {$r->print($image); } } else { - if (($_ ne 'bbb_content') || ($allowed)) { - if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$_}.'

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

'.$syllabusfields{$_}.'

')); - } - } 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{$_},$safeinit)); + $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); } } } @@ -331,7 +387,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') { @@ -347,7 +403,7 @@ sub display_group_links { my @available = (); my %menu = (); %{$menu{'email'}} = ( - text => 'Group e-mail', + text => 'Group Message', href => '/adm/email?compose=group&group='.$group. $refarg, ); @@ -356,16 +412,16 @@ 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, ); %{$menu{'roster'}} = ( - text => 'Membership roster', + text => 'Membership Roster', href => '/adm/grouproster?group='.$group.$refarg, ); foreach my $tool (sort(keys(%menu))) { @@ -374,16 +430,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}).'
'. - $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 { @@ -394,7 +461,7 @@ sub display_group_links { 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'})); + $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)); @@ -412,7 +479,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]',