--- loncom/interface/lonsimplepage.pm 2008/01/18 16:41:27 1.53
+++ loncom/interface/lonsimplepage.pm 2008/12/16 19:01:45 1.60
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.53 2008/01/18 16:41:27 raeburn Exp $
+# $Id: lonsimplepage.pm,v 1.60 2008/12/16 19:01:45 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;
@@ -215,9 +216,14 @@ 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'))
+ .'
');
+# .'
'
+ # .''.&mt('Show Student View').''.
+# &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'');
} elsif ($privileged and $target ne 'tex') {
my $edittext = &mt('Edit');
if ($group ne '') {
@@ -268,27 +274,33 @@ sub handler {
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(
'');
@@ -378,7 +390,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,
);
@@ -387,16 +399,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))) {
@@ -411,7 +423,7 @@ sub display_group_links {
$output .= ''.&mt($menu{$tool}{text}).' | ';
} else {
$output .= ''.
- $menu{$tool}{text}.' | ';
+ &mt($menu{$tool}{text}).'';
}
}
$output .= '';
@@ -425,7 +437,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));