--- loncom/interface/lonnotify.pm	2008/12/05 17:41:34	1.32
+++ 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.32 2008/12/05 17:41:34 schafran 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'".')">'.
-              &mt('Send a new e-mail to selected users from this domain').'</a></td></tr><tr>'.
-              '<td><a href="javascript:next_page('."'view'".')">'.
-              &mt('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;
 
@@ -467,7 +483,7 @@ function setCourseCat(formname) {
     $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();