--- loncom/interface/lonsimplepage.pm 2008/12/22 00:00:51 1.63
+++ loncom/interface/lonsimplepage.pm 2009/02/20 15:09:28 1.68
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.63 2008/12/22 00:00:51 riegler Exp $
+# $Id: lonsimplepage.pm,v 1.68 2009/02/20 15:09:28 amueller 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,
@@ -216,25 +216,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').'');
- }
- }
+ $r->print(''.&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')) .'
');
}
if (($env{'form.uploaddoc.filename'} and $target ne 'tex') &&
($env{'form.storeupl'}) && ($allowed)) {
@@ -284,11 +266,33 @@ sub handler {
$syllabus{'uploaded.photourl'});
$image='
';
+ />';
if ($target eq 'tex') {
$image=&Apache::lonxml::xmlparse($r,'tex',$image);
}
}
+ if ($target ne 'tex') {
+ &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);
+ }
if ($allowed) {
$r->print(
'');
@@ -386,7 +389,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') {
@@ -429,16 +432,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 .= ''.&mt($menu{$tool}{text}).' | ';
+ $output .= ''.&mt($menu{$tool}{text}).' |
';
} else {
- $output .= ''.
- &mt($menu{$tool}{text}).' | ';
+ $output .= &Apache::loncommon::start_data_table_row()
+ .''
+ .&mt($menu{$tool}{text}).' | '
+ .&Apache::loncommon::end_data_table_row();
}
}
- $output .= '
';
+ 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 {
@@ -467,7 +481,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]',