[LON-CAPA-cvs] cvs: loncom /interface lonmsgdisplay.pm

raeburn raeburn@source.lon-capa.org
Sun, 14 Dec 2008 02:45:48 -0000


raeburn		Sun Dec 14 02:45:48 2008 EDT

  Modified files:              
    /loncom/interface	lonmsgdisplay.pm 
  Log:
  - Use a single row for Functions and Actions fieldselects if window allows.
  - Additional e-mail -> message changes.
  - Remove line feed from within &mt() to aid localization.
  - Bold Actions title in fieldset.
  
  
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.103 loncom/interface/lonmsgdisplay.pm:1.104
--- loncom/interface/lonmsgdisplay.pm:1.103	Sun Dec 14 00:33:35 2008
+++ loncom/interface/lonmsgdisplay.pm	Sun Dec 14 02:45:48 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.103 2008/12/14 00:33:35 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.104 2008/12/14 02:45:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -353,7 +353,7 @@
         }
     } else {
         $outcome = 
-	    &mt('Error - could not obtain lock on e-mail folders record.');
+	    &mt('Error - could not obtain lock on message folders record.');
     }
     return ($outcome,$warning);
 }
@@ -559,8 +559,7 @@
     my $result;
     #  Needs to be in a course
     if (!($env{'request.course.fn'})) {
-        $result = &mt('Error: you must have a course role selected to be able to send a broadcast 
-e-mail to a group in the course.');
+        $result = &mt('Error: you must have a course role selected to be able to send a broadcast message to a group in the course.');
         return $result;
     }
     if ($cdom eq '' || $cnum eq '') {
@@ -2312,7 +2311,7 @@
               .$li_end;
     }
 # Print functions
-    $r->print('<div>'
+    $r->print('<div class="LC_left_float">'
              .'<fieldset>'
              .'<legend><span class="LC_mail_functions">'
              .&mt('Functions')
@@ -2353,10 +2352,10 @@
 
 # Print actions
         if ($actionlist) {
-            $r->print('<div>'
+            $r->print('<div class="LC_left_float">'
                      .'<fieldset>'
                      .'<legend>'
-                     .&mt('Currently available actions (will open extra window):')
+                     .&mt('[_1]Currently available actions[_2] (will open extra window):','<span class="LC_mail_functions">','</span>')
                      .'</legend>'
                      .$actionlist
                      .'</fieldset>'
@@ -2400,8 +2399,9 @@
     if (defined($content{'baseurl'})) {
         $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
     }
+    $r->print('<div class="LC_clear_float_footer">');
     if ($from_student && $see_anonymous ) {
-	$r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));
+	$r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}).'</br>');
     }
 
     my $broadcast_link;
@@ -2414,7 +2414,7 @@
 
     # Display LON-CAPA Message (Start)
     # Subject
-    $r->print('<br />'
+    $r->print('</div>'
              .&Apache::lonhtmlcommon::start_pick_box()
              .&Apache::lonhtmlcommon::row_title(&mt('Subject'))
              .$content{'subject'}