--- loncom/interface/lonmsgdisplay.pm	2010/01/25 16:46:12	1.144
+++ loncom/interface/lonmsgdisplay.pm	2010/01/26 13:08:08	1.147
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.144 2010/01/25 16:46:12 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.147 2010/01/26 13:08:08 wenzelju Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1844,9 +1844,9 @@ sub retrieve_instructor_comments {
 
 sub disfacetoface {
     my ($r,$user,$domain,$target)=@_;
-	if ($target eq '') {
-    	my $target=$env{'form.grade_target'};
-	}
+    if ($target eq '') {
+        $target=$env{'form.grade_target'};
+    }
     unless ($env{'request.course.id'}) { return; }
     if  (!&Apache::lonnet::allowed('dff',$env{'request.course.id'})
 	 && ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
@@ -2249,7 +2249,7 @@ END
                            $setuname,$setudom);
         $r->print(&Apache::loncommon::start_data_table_row());
         $r->print(<<"END");
-        <td>$ltext->{'star'}:&nbsp;$startform<br/>$ltext->{'endd'}:&nbsp;&nbsp;$endform</td>
+        <td>$ltext->{'star'}:&nbsp;$startform<br />$ltext->{'endd'}:&nbsp;&nbsp;$endform</td>
         <td>$settername</td>
         <td><input type="text" name="title_$parmcount" size="15" value="$title" /><input type="hidden" name="key_$parmcount" value="$record" /></td>
         <td>
@@ -2259,13 +2259,13 @@ END
             if ($blocks->{$block} eq 'on') {
                 $blockstatus = 'checked="checked"';
             }
-            $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label><br />');
+            $r->print('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label></span><br />');
         }
         $r->print(<<"END");
         </td>      
         <td><span class="LC_nobreak"><label>
         <input type="checkbox" name="modify_$parmcount" />$lt{'modi'}
-        </label><br />
+        </label></span><br /><span class="LC_nobreak">
         <label>
         <input type="checkbox" name="cancel_$parmcount" />$lt{'canc'}
         </label></span>
@@ -2315,13 +2315,13 @@ END
      <td>
 END
     foreach my $block (@{$typeorder}) {
-        $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label><br />');
+        $r->print('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label></span><br />');
      }
      $r->print(<<"END");
-     </td> 
-     <td><label>
+     </td>
+     <td><span class="LC_nobreak"><label>
      <input type="checkbox" name="add_$parmcount" value="1" />$lt{'addb'}
-     </label></td>
+     </label></span></td>
 END
     $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());
@@ -3287,7 +3287,7 @@ sub sendoffmail {
 	        }
             } else {
                 my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1);
-                $message .= '<br/>'.&mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus);
+                $message .= '<br />'.&mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus);
                 $message = &Apache::loncommon::confirmwrapper($message);
                 $r->print($message);
             }
@@ -3409,7 +3409,7 @@ sub handler {
 	    &statuschange($env{'form.markdel'},'deleted',$folder);
 	if (!$result) {
             my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete the message.'),1);
-            $message .= '<p class="LC_error">'.$msg.'</p>';
+            $message .= '<p class="LC_error" style="font-size: inherit;">'.$msg.'</p>';
             $message = &Apache::loncommon::confirmwrapper($message);
             $r->print($message);
 	}
@@ -3476,8 +3476,8 @@ sub handler {
             my $message = '';
             if ($failed) {
                 $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to move [quant,_1,message]',$failed),1);
-                $message .= '<p class="LC_error">'.
-		            join("</p>\n<p class=\"LC_error\">",@failed_msg).
+                $message .= '<p class="LC_error" style="font-size: inherit;">'.
+		            join("</p>\n<p class=\"LC_error\" style=\"font-size: inherit;\">",@failed_msg).
 		            "</p>\n";
             }
             $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Moved [quant,_1,message]',$total));
@@ -3504,8 +3504,8 @@ sub handler {
         my $message = '';
 	if ($failed) {
             $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete [quant,_1,message]',$failed),1);
-            $message .= '<p class="LC_error">'.
-		      join("</p>\n<p class=\"LC_error\">",@failed_msg).
+            $message .= '<p class="LC_error" style="font-size: inherit;">'.
+		      join("</p>\n<p class=\"LC_error\" style=\"font-size: inherit;\">",@failed_msg).
 		      "</p>\n";
 	}
         $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Deleted [quant,_1,message]',$total));
@@ -3575,7 +3575,7 @@ sub handler {
                 my $count = keys(%forwardfail);
                 my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not forward [quant,_1,message].',$count),1);
                 foreach my $key (keys(%forwardfail)) {
-                    $message .= '<br/>'.&mt('Could not deliver forwarded message.').'</span> '.
+                    $message .= '<br />'.&mt('Could not deliver forwarded message.').'</span> '.
                                 &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';
                 }
                 $message = &Apache::loncommon::confirmwrapper($message);