--- loncom/interface/lonsimplepage.pm 2008/12/17 09:44:04 1.62 +++ loncom/interface/lonsimplepage.pm 2009/03/27 13:50:36 1.76 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.62 2008/12/17 09:44:04 ehlerst Exp $ +# $Id: lonsimplepage.pm,v 1.76 2009/03/27 13:50:36 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -139,9 +139,9 @@ sub handler { # --------------------------------------- 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, @@ -214,28 +214,7 @@ 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,6 +253,37 @@ 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){ + &Apache::lontemplate::start_functionslist($r); + if($allowed){ + &Apache::lontemplate::item_functionslist($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::item_functionslist($r,''.$edittext.''); + if ($group ne '') { + if ($group_edit_perm) { + &Apache::lontemplate::item_functionslist($r,'   '. + ''. + &mt('Edit Group Settings').''); + } + } + } + &Apache::lontemplate::end_functionslist($r); + } + } + # ---------------------------------------------------------------- Get syllabus if ((($syllabus{'uploaded.lastmodified'}) && (($group ne '' && ($group_home_view || $group_edit_perm || @@ -284,11 +294,12 @@ sub handler { $syllabus{'uploaded.photourl'}); $image=''; + />'; if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); } } + if ($allowed) { $r->print( '
'. @@ -297,14 +308,13 @@ sub handler { ''. ''. '
'. - ' -
'); - } - &Apache::lontemplate::start_columnSection($r); + ''. + '
' ); + } if($allowed){ - $r->print($image.'
 
'); - } - &Apache::lontemplate::start_ContentBox($r,$allowed); + $r->print($image.'
 
'); + } + foreach my $field (sort(keys(%syllabusfields))) { if (($syllabus{$field}) || ($allowed) || ($field eq 'abb_links' && $group ne '')) { @@ -329,27 +339,28 @@ sub handler { 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').'

'); + 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{$field},$safeinit)); } - } + } + if(!$allowed) {$r->print($image); } } else { if ($target ne 'tex') { 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 +378,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 +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') { @@ -411,11 +412,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 +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}).'
'. - &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 { @@ -449,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)); @@ -467,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]',