--- loncom/interface/lonnotify.pm 2008/09/16 03:30:30 1.28
+++ loncom/interface/lonnotify.pm 2010/05/14 18:29:52 1.36
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Sending messages
#
-# $Id: lonnotify.pm,v 1.28 2008/09/16 03:30:30 raeburn Exp $
+# $Id: lonnotify.pm,v 1.36 2010/05/14 18:29:52 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -118,7 +118,7 @@ sub start_page {
$start_page
$breadcrumbs
<br />
-<form name="$formname" method="POST">
+<form name="$formname" method="post" action="">
ENDONE
return $output;
@@ -143,19 +143,35 @@ function next_page(caller) {
}
|;
- my $output = &start_page(&add_script($jscript),
- 'Broadcast e-mail to Domain', $formname);
-
- $output .= '<input type="hidden" name="command" />';
- $output .= '<table class="LC_notify_front_page">'.
- '<tr><td><a href="javascript:next_page('."'new'".')">'.
- 'Send a new e-mail message to selected users from this domain</a></td></tr><tr>'.
- '<td><a href="javascript:next_page('."'view'".')">'.
- 'Display e-mail sent by Domain Coordinators in this domain'.
- '</a></td></tr></table>';
- $output .= &end_page();
- $r->print($output);
+ my @menu=
+ ({ categorytitle=>'Broadcast e-mail to Domain',
+ items =>[
+ { linktext => 'Send e-mail to selected users',
+ url => 'javascript:next_page('."'new'".')',
+ permission => 1,
+ #help => '',
+ icon => 'mail-reply-all.png',
+ linktitle => 'Send a new e-mail to selected users from this domain'
+ },
+ { linktext => 'Display sent e-mails',
+ url => 'javascript:next_page('."'view'".')',
+ permission => 1,
+ #help => '',
+ icon => 'messalog.png',
+ linktitle => 'Display e-mail sent by Domain Coordinators in this domain'
+ },
+ ]
+ },
+ );
+
+ $r->print(
+ &start_page(&add_script($jscript),
+ 'Broadcast e-mail to Domain', $formname)
+ .'<input type="hidden" name="command" />'
+ .&Apache::lonhtmlcommon::generate_menu(@menu)
+ .&end_page()
+ );
return;
}
@@ -164,7 +180,7 @@ sub print_display_option_form {
&Apache::lonhtmlcommon::add_breadcrumb({text=>"Display options"});
my $cmd = 'display';
- my $submit_text = 'Display e-mail';
+ my $submit_text = &mt('Display e-mail');
my @roles = ('dc');
my $now = time;
@@ -378,7 +394,7 @@ sub print_selection_form {
'buil' => 'Building valid e-mail address from username, if missing from preferences:',
'kerb' => 'Kerberos: enter default for each realm used in the domain, with comma separation of entries',
'infs' => 'Internal, Filesystem and Local authentication: enter single default.',
- 'comp' => 'Compose Message'
+ 'comp' => 'Compose E-mail'
);
&Apache::lonhtmlcommon::add_breadcrumb
({text=>"Select Audience"});
@@ -464,10 +480,10 @@ function setCourseCat(formname) {
</ul>'."\n";
my $submit_text = $lt{'comp'};
my $cmd = 'compose';
- $output .= &Apache::lonhtmlcommon::role_select_row(\@roles,'Roles');
- $output .= &Apache::lonhtmlcommon::course_select_row('Courses',$formname,$totcodes,\@codetitles,\%idlist,\%idlist_titles);
+ $output .= &Apache::lonhtmlcommon::role_select_row(\@roles,&mt('Roles'));
+ $output .= &Apache::lonhtmlcommon::course_select_row(&mt('Courses'),$formname,$totcodes,\@codetitles,\%idlist,\%idlist_titles);
$output .= &Apache::lonhtmlcommon::status_select_row(\%longtypes,&mt('Access status'));
- $output .= &Apache::lonhtmlcommon::email_default_row(\%authtypes,&mt('Username -> Email conversion'),$descrip);
+ $output .= &Apache::lonhtmlcommon::email_default_row(\%authtypes,&mt('Username -> E-mail conversion'),$descrip);
$output .= &Apache::lonhtmlcommon::submit_row(&mt('Submit'),$cmd,$submit_text);
$output .= &Apache::lonhtmlcommon::end_pick_box();
$output .= &end_page();
@@ -480,7 +496,7 @@ sub print_composition_form {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:goBack('pick_target')",
text=>"Select Audience"},
- {text=>"Compose Message"});
+ {text=>"Compose E-mail"});
my $jscript = &Apache::loncommon::check_uncheck_jscript();
$jscript .= qq|
function goBack(target) {
@@ -642,7 +658,7 @@ function goBack(target) {
$output .= &Apache::lonhtmlcommon::row_title(&mt('Sender e-mail address'));
$output .= '<input type="text" name="sender" value="'.$sender.'" />';
$output .= &Apache::lonhtmlcommon::row_closure();
- $output .= &Apache::lonhtmlcommon::submit_row(&mt('Submit'),'process',&mt('Send Message'));
+ $output .= &Apache::lonhtmlcommon::submit_row(&mt('Submit'),'process',&mt('Send'));
$output .= &Apache::lonhtmlcommon::end_pick_box();
} else {
$output .= $lt{'nore'}."\n".
@@ -674,7 +690,7 @@ ENDSCRIPT
text=>"Select audience"});
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:goBack('compose')",
- text=>"Compose Message"});
+ text=>"Compose E-mail"});
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/notify?command=process",
text=>"Outcome"});
@@ -710,7 +726,7 @@ ENDSCRIPT
} else {
$output .= 'No mail sent - no recipients identified';
}
- $output .= '<br /><a href="/adm/notify">Send another message?</a>'."\n";
+ $output .= '<br /><a href="/adm/notify">'.&mt('Send another e-mail').'</a>'."\n";
$output .= '<input type="hidden" name="command" />'."\n".
'<input type="hidden" name="origin" value="'.$formname.'" />'."\n";
$output .= &Apache::lonhtmlcommon::echo_form_input(['command','origin']);
@@ -769,9 +785,9 @@ sub get_user_info {
sub form_elements {
my ($longtypes,$authtypes) = @_;
%{$longtypes} = (
- active => 'Currently has access',
- previous => 'Previously had access',
- future => 'Will have future access',
+ active => &mt('Currently has access'),
+ previous => &mt('Previously had access'),
+ future => &mt('Will have future access'),
);
%{$authtypes} = (
krb4 => 'Kerberos 4',