--- loncom/interface/lonsimplepage.pm 2007/09/10 19:22:22 1.52 +++ loncom/interface/lonsimplepage.pm 2009/12/08 12:20:49 1.88 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.52 2007/09/10 19:22:22 raeburn Exp $ +# $Id: lonsimplepage.pm,v 1.88 2009/12/08 12:20:49 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; @@ -50,10 +51,10 @@ sub get_db_name { my $db_name; if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) { - $marker =~ s/\W//g; - $db_name = 'grppage_'.$marker; + $marker =~ s/\W//g; + $db_name = 'grppage_'.$marker; } else { - $marker=~s/\D//g; + $marker=~s/\D//g; $db_name = 'smppage_'.$marker; } return if (!defined($marker)); @@ -69,17 +70,17 @@ sub handler { my $target=$env{'form.grade_target'}; # ------------------------------------------------------------ Print the screen if ($target eq 'tex') { - $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); - } + $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); + } # Is this even in a course? unless ($env{'request.course.id'}) { - if ($target ne 'tex') { - &Apache::loncommon::simple_error_page($r,'','Not in a course'); - } else { - $r->print('\textbf{Not in a course}\end{document}'); - } - return OK; + if ($target ne 'tex') { + &Apache::loncommon::simple_error_page($r,'','Not in a course'); + } else { + $r->print('\textbf{Not in a course}\end{document}'); + } + return OK; } my $db_name = &get_db_name($r->uri); @@ -92,20 +93,20 @@ sub handler { my %groupinfo = (); if ($db_name =~ /^grppage_/) { $group = (split(m{/},$r->uri))[4]; - $group =~ s/\W//g; + $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'); - return OK; + &Apache::loncommon::simple_error_page($r,'','Invalid group name'); + return OK; } - %groupinfo = - &Apache::longroup::get_group_settings($curr_groups{$group}); + %groupinfo = + &Apache::longroup::get_group_settings($curr_groups{$group}); $group_desc = &unescape($groupinfo{'description'}); } if (!$db_name) { - &Apache::loncommon::simple_error_page($r,'','Invalid call'); - return OK; + &Apache::loncommon::simple_error_page($r,'','Invalid call'); + return OK; } # --------------------------------------------------------- The syllabus fields @@ -132,23 +133,23 @@ 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 = - &Apache::loncommon::start_page($title,undef, - {'function' => $forcestudent, - 'domain' => $dom, - 'force_register' => - $env{'form.register'},}); - $r->print($start_page); + my $start_page = + &Apache::loncommon::start_page($title,undef, + {'function' => $forcestudent, + 'domain' => $dom, + 'force_register' => + $env{'form.register'},}); + $r->print($start_page); } if ($group ne '') { @@ -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,17 +179,17 @@ sub handler { return OK; } } else { - my $msg = - &mt('You do not currently have rights to view this group.'); + my $msg = + &mt('You do not currently have rights to view this group.'); if ($target ne 'tex') { - $r->print("
$msg
". - &Apache::loncommon::end_page()); + $r->print(''.$msg.'
'. + &Apache::loncommon::end_page()); } else { $r->print('\textbf{'.$msg.'}\end{document}'); } - return OK; + return OK; } - my ($blocked,$blocktext) = + my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('groups'); if ($blocked) { $r->print($blocktext); @@ -198,176 +199,227 @@ 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; if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { - $forcestudent='student'; + $forcestudent='student'; } 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').'
No page information provided.
')); + my $text=&mt('No page information provided.'); + if ($target ne 'tex') { + $r->print(''.$text.'
'); + } else { + $r->print($text) + } } } if ($env{'form.grade_target'} ne 'tex') { - $r->print(&Apache::loncommon::end_page()); + $r->print(&Apache::loncommon::end_page()); } else { - $r->print('\end{document}'); + $r->print('\end{document}'); } return OK; } @@ -377,7 +429,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, ); @@ -386,16 +438,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))) { @@ -404,16 +456,27 @@ sub display_group_links { } } if (@available > 0) { - my $output = ''.&mt($menu{$tool}{text}).' | '; + $output .= '
'.&mt($menu{$tool}{text}).' | '. - $menu{$tool}{text}.' | '; + $output .= &Apache::loncommon::start_data_table_row() + .'' + .&mt($menu{$tool}{text}).' | ' + .&Apache::loncommon::end_data_table_row(); } } - $output .= '
The server encountered an internal error or misconfiguration and was unable to complete your request.
Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.
More information about this error may be available in the server error log.