[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface lonsimplepage.pm
raeburn
raeburn@source.lon-capa.org
Wed, 20 May 2009 02:37:30 -0000
raeburn Wed May 20 02:37:30 2009 EDT
Modified files: (Branch: version_2_9_X)
/loncom/interface lonsimplepage.pm
Log:
- Backport 1.64, 1.66 (part), 1.71, 1.75.
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.59 loncom/interface/lonsimplepage.pm:1.59.2.1
--- loncom/interface/lonsimplepage.pm:1.59 Wed Dec 3 22:00:41 2008
+++ loncom/interface/lonsimplepage.pm Wed May 20 02:37:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.59 2008/12/03 22:00:41 schafran Exp $
+# $Id: lonsimplepage.pm,v 1.59.2.1 2009/05/20 02:37:30 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -138,7 +138,7 @@
# --------------------------------------- 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';
}
@@ -391,11 +391,11 @@
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,
);
@@ -409,16 +409,27 @@
}
}
if (@available > 0) {
- my $output = '<table cellspacing="4" cellpadding="4"><tr>';
+ my $output = '';
+ if ($target eq 'tex') {
+ $output = '<table cellspacing="4" cellpadding="4">';
+ } else {
+ $output = &Apache::loncommon::start_data_table();
+ }
foreach my $tool (@available) {
if ($target eq 'tex') {
- $output .= '<td>'.&mt($menu{$tool}{text}).'</td>';
+ $output .= '<tr><td>'.&mt($menu{$tool}{text}).'</td></tr>';
} else {
- $output .= '<td><a href="'.$menu{$tool}{href}.'">'.
- &mt($menu{$tool}{text}).'</a></td>';
+ $output .= &Apache::loncommon::start_data_table_row()
+ .'<td><a href="'.$menu{$tool}{href}.'">'
+ .&mt($menu{$tool}{text}).'</a></td>'
+ .&Apache::loncommon::end_data_table_row();
}
}
- $output .= '</tr></table>';
+ if ($target eq 'tex') {
+ $output .= '</table>';
+ } else {
+ $output .= &Apache::loncommon::end_data_table();
+ }
if ($target eq 'tex') {
$r->print(&Apache::lonxml::xmlparse($r,'tex',&mt('Available functions').'<br /><br />'.$output));
} else {
@@ -429,7 +440,7 @@
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].','<b>'.&unescape($groupinfo{'description'}).'</b>');
+ $output = &mt('No group functionality (e.g., e-mail, discussion, chat room or file upload) is currently available to you in this group: [_1].','<b>'.&unescape($groupinfo{'description'}).'</b>');
}
if ($target eq 'tex') {
$r->print(&Apache::lonxml::xmlparse($r,'tex',$output));
@@ -447,11 +458,12 @@
text=>"Groups",
title=>"Display Groups"},
{href=>"/adm/$cdom/$cnum/$group/smppg?ref=grouplist",
- text=>"Group: $description",
- title=>"Go to group's home page"},
+ text=>&mt('Group:')." $description",
+ title=>&mt("Go to group's home page"),
+ no_mt=>1,},
);
my $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Group page - [_1]',
- $description));
+ $description),undef,undef,undef,undef,1);
return $output;
}