@@ -2148,7 +2164,7 @@ END
foreach my $block (@{$typeorder}) {
my $blockstatus = '';
if ($blocks->{$block} eq 'on') {
- $blockstatus = 'checked="true"';
+ $blockstatus = 'checked="checked"';
}
$r->print('
');
}
@@ -2215,7 +2231,7 @@ END
sub blocktype_text {
my %types = &Apache::lonlocal::texthash(
'com' => 'Messaging',
- 'chat' => 'Chat',
+ 'chat' => 'Chat Room',
'boards' => 'Discussion',
'port' => 'Portfolio',
'groups' => 'Groups',
@@ -2278,61 +2294,46 @@ sub displaymessage {
&printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
-# Functions and Actions
- my $li_start='• ';
- my $li_end=' ';
-
# Prepare available functions
- my $functionlist='';
+ my @functionlist;
if (!$content{'noreplies'}) {
- $functionlist.=$li_start
- .''
+ push(@functionlist,''
.&mt('Reply')
- .''
- .$li_end;
+ .'');
}
- $functionlist.=$li_start
- .''
+ push(@functionlist,''
.&mt('Forward')
- .''
- .$li_end;
- $functionlist.=$li_start
- .''
+ .'');
+ push(@functionlist,''
.&mt('Mark Unread')
- .''
- .$li_end;
- $functionlist.=$li_start
- .''
+ .'');
+ push(@functionlist,''
.&mt('Delete')
- .''
- .$li_end;
- $functionlist.=$li_start
- .''
+ .'');
+ push(@functionlist,''
.&mt('Back to Folder Display')
- .''
- .$li_end;
+ .'');
if ($counter > 0){
- $functionlist.=$li_start
- .''
- .&mt('Previous')
- .''
- .$li_end;
+ push(@functionlist,''
+ .&mt('Previous')
+ .'');
}
if ($counter < $number_of_messages - 1){
- $functionlist.=$li_start
- .''
- .&mt('Next')
- .''
- .$li_end;
+ push(@functionlist,''
+ .&mt('Next')
+ .'');
}
# Print functions
+ my $legendtext=''
+ .&mt('Functions')
+ .'';
$r->print(''
- .'
'
+ .&Apache::lontemplate::start_functionslist($legendtext)
+ );
+ foreach my $item (@functionlist) {
+ $r->print(&Apache::lontemplate::item_functionslist($item));
+ }
+ $r->print(&Apache::lontemplate::end_functionslist()
.''
);
@@ -2344,36 +2345,43 @@ sub displaymessage {
$symb=&Apache::lonnet::symbread($content{'baseurl'});
}
if ($env{'user.adv'}) {
- my $actionlist='';
+ my @actionlist;
if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
- $actionlist.=$li_start
- .&Apache::loncommon::track_student_link(
- &mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check')
- .$li_end;
+ push(@actionlist,&Apache::loncommon::track_student_link(
+ &mt('View recent activity')
+ ,$content{'sendername'}
+ ,$content{'senderdomain'}
+ ,'check'));
}
if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) {
- $actionlist.=$li_start
- .&Apache::loncommon::pprmlink(
- &mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
- .$li_end;
+ push(@actionlist,&Apache::loncommon::pprmlink(
+ &mt('Set/Change parameters')
+ ,$content{'sendername'}
+ ,$content{'senderdomain'}
+ ,$symb
+ ,'check'));
}
if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) {
- $actionlist.=$li_start
- .&Apache::loncommon::pgrdlink(
- &mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
- .$li_end;
+ push(@actionlist,&Apache::loncommon::pgrdlink(
+ &mt('Set/Change grades')
+ ,$content{'sendername'}
+ ,$content{'senderdomain'}
+ ,$symb
+ ,'check'));
}
# Print actions
- if ($actionlist) {
+ if (@actionlist) {
+ $legendtext=&mt('[_1]Currently available actions[_2] (will open extra window):'
+ ,'','');
$r->print(''
- .'
'
+ .&Apache::lontemplate::start_functionslist($legendtext)
+ );
+ foreach my $item (@actionlist) {
+ $r->print(&Apache::lontemplate::item_functionslist($item));
+ }
+ $r->print(&Apache::lontemplate::end_functionslist()
.''
);
}
@@ -2800,15 +2808,14 @@ sub displayresource {
sub header {
my ($r,$title,$baseurl)=@_;
-
my $extra = &Apache::loncommon::studentbrowser_javascript();
if ($baseurl) {
$extra .= "";
}
- $r->print(&Apache::loncommon::start_page('Communication and Messages',
+ $r->print(&Apache::loncommon::start_page('Communication',
$extra));
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (($title?$title:'Communication and Messages')));
+ (($title?$title:'Send and Receive Messages')));
}
# ---------------------------------------------------------------- Print header
@@ -3179,7 +3186,7 @@ sub sendoffmail {
&Apache::loncommunicate::menu($r);
}
} else {
- $r->print(''.&mt('Could not deliver message').' '.
+ $r->print('
'.&Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1).'
'.
&mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus).'
');
}
}
@@ -3483,7 +3490,7 @@ sub handler {
my $showfolder = $env{'form.newfolder'};
my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
if ($makeresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" created.',$showfolder).'
');
+ $r->print(&mt('Folder "[_1]" created.',$showfolder).'
');
} else {
$r->print(&mt('Creation failed.').' '.$makeresult.'
'.
$warning);
@@ -3498,7 +3505,7 @@ sub handler {
my $showfolder = '';
my $delresult = &deletefolder($folder);
if ($delresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'
');
+ $r->print(&mt('Folder "[_1]" deleted.',$folder).'
');
$env{'form.folder'} = '';
} else {
$r->print(&mt('Deletion failed.').' '.$delresult.'
');
@@ -3511,7 +3518,7 @@ sub handler {
my $showfolder = $env{'form.renamed'};
my $renresult = &renamefolder($folder);
if ($renresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).'
');
+ $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).'
');
} else {
$r->print(&mt('Renaming failed.').' '.$renresult.'
');
$showfolder = $folder;
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.