--- loncom/interface/lonsimplepage.pm 2007/05/02 01:33:49 1.50 +++ loncom/interface/lonsimplepage.pm 2008/12/17 00:44:53 1.61 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.50 2007/05/02 01:33:49 albertel Exp $ +# $Id: lonsimplepage.pm,v 1.61 2008/12/17 00:44:53 ehlerst 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,7 +134,7 @@ 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 @@ -197,9 +216,11 @@ 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').'

'); + $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 '') { @@ -230,7 +251,7 @@ 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.storesyl'})) { foreach my $syl_field (keys(%syllabusfields)) { @@ -243,33 +264,39 @@ sub handler { $syllabus{$syl_field}=$field; } $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put($namespace,\%syllabus,$dom,$crs); + &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); } # ---------------------------------------------------------------- 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=''; if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); - } - $r->print($image); - } + } + } if ($allowed) { $r->print( '
'. ''. - '

Upload a Photo

'. + '

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

'. ''. - ''. - '
'); + ''. + '
'. + ''); } + &Apache::lontemplate::start_columnSection($r); + if($allowed){ + $r->print($image.'
 
'); + } + &Apache::lontemplate::start_ContentBox($r,$allowed); foreach my $field (sort(keys(%syllabusfields))) { if (($syllabus{$field}) || ($allowed) || ($field eq 'abb_links' && $group ne '')) { @@ -280,7 +307,9 @@ sub handler { if ($allowed) { $message=&Apache::lonspeller::markeduptext($message); } - $message=&Apache::lontexconvert::msgtexconverted($message); + if ($target ne 'tex') { + $message=&Apache::lontexconvert::msgtexconverted($message); + } if ($field eq 'abb_links' && $group ne '') { $r->print('
'); @@ -289,6 +318,9 @@ sub handler { $r->print('
'); } elsif ($field eq 'aaa_title') { if ($target ne 'tex') { + if($allowed){ + $r->print('

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

'.$message.'

'); } else { my $safeinit; @@ -296,36 +328,29 @@ sub handler { } if ($allowed) { if ($env{'form.grade_target'} ne 'tex') { - $r->print( - '
Title
'); + $r->print('

'.&mt('Title').'

'); + &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); + $r->print('

'); } else { my $safeinit; $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); } } } 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); } 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)); @@ -334,6 +359,16 @@ 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').'
'); @@ -359,7 +394,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, ); @@ -368,16 +403,16 @@ sub display_group_links { href => '/adm/groupboards?group='.$group.$refarg, ); %{$menu{'chat'}} = ( - text => 'Group chat', + text => 'Group Chat', href => "javascript:group_chat('$group')", ); %{$menu{'files'}} = ( - text => 'File repository', + text => 'File Repository', 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))) { @@ -392,7 +427,7 @@ sub display_group_links { $output .= ''.&mt($menu{$tool}{text}).''; } else { $output .= ''. - $menu{$tool}{text}.''; + &mt($menu{$tool}{text}).''; } } $output .= ''; @@ -406,7 +441,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 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));