--- loncom/interface/lonsimplepage.pm 2009/02/16 10:33:32 1.66
+++ loncom/interface/lonsimplepage.pm 2009/03/01 13:23:12 1.74
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.66 2009/02/16 10:33:32 biermanm Exp $
+# $Id: lonsimplepage.pm,v 1.74 2009/03/01 13:23:12 neumanie Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -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::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 ||
@@ -289,6 +299,7 @@ sub handler {
$image=&Apache::lonxml::xmlparse($r,'tex',$image);
}
}
+
if ($allowed) {
$r->print(
'');
@@ -410,7 +412,7 @@ 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'}} = (
@@ -459,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));