--- loncom/interface/lonnotify.pm 2009/02/02 13:27:39 1.33 +++ loncom/interface/lonnotify.pm 2010/11/10 14:44:50 1.38 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Sending messages # -# $Id: lonnotify.pm,v 1.33 2009/02/02 13:27:39 schafran Exp $ +# $Id: lonnotify.pm,v 1.38 2010/11/10 14:44:50 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -118,7 +118,7 @@ sub start_page { $start_page $breadcrumbs
-
+ 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 .= ''; - $output .= ''. - ''. - '
'. - &mt('Send a new e-mail to selected users from this domain').'
'. - &mt('Display e-mail sent by Domain Coordinators in this domain'). - '
'; - $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) + .'' + .&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; @@ -397,6 +413,7 @@ sub print_selection_form { $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,@codetitles); } } + my @standardnames = &Apache::loncommon::get_standard_codeitems(); my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($cdom); @@ -420,7 +437,7 @@ function setCourseCat(formname) { if (formname.Year.options[formname.Year.selectedIndex].value == -1) { return; } - courseSet('Year'); + courseSet('$codetitles[0]'); for (var j=0; j E-mail conversion'),$descrip); $output .= &Apache::lonhtmlcommon::submit_row(&mt('Submit'),$cmd,$submit_text); @@ -510,20 +527,15 @@ function goBack(target) { %courses = &Apache::lonnet::courseiddump($cdom,'.','.','.','.','.', undef,undef,'Course'); } elsif ($coursefilter eq 'category') { - my $instcode = ''; - my @cats = ('Semester','Year','Department','Number'); - foreach my $category (@cats) { - if (defined($env{'form.'.$category})) { - unless ($env{'form.'.$category} eq '-1') { - $instcode .= $env{'form.'.$category}; - } - } - } + my $instcode = &Apache::courseclassifier::instcode_from_selectors($cdom); + my $regexp = ''; if ($instcode eq '') { $instcode = '.'; + } else { + $regexp = 1; } %courses = &Apache::lonnet::courseiddump($cdom,'.','.',$instcode,'.','.', - undef,undef,'Course'); + undef,undef,'Course',$regexp); } elsif ($coursefilter eq 'specific') { if ($env{'form.coursetotal'} > 1) { my @course_ids = split(/&&/,$env{'form.courselist'}); @@ -730,6 +742,7 @@ sub broadcast_email { $msg->to($to); $msg->subject($subject); $msg->add('From',"$from"); + $msg->add('Content-type','text/plain; charset=UTF-8'); if (my $fh = $msg->open()) { print $fh $message; $fh->close;