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

raeburn raeburn at source.lon-capa.org
Sun Oct 26 09:10:38 EDT 2014


raeburn		Sun Oct 26 13:10:38 2014 EDT

  Modified files:              
    /loncom/interface	lonmsgdisplay.pm 
  Log:
  - disfacetoface output enclosed in <div></div> for web target, not tex target.
  
  
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.176 loncom/interface/lonmsgdisplay.pm:1.177
--- loncom/interface/lonmsgdisplay.pm:1.176	Wed May 21 19:03:04 2014
+++ loncom/interface/lonmsgdisplay.pm	Sun Oct 26 13:10:38 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.176 2014/05/21 19:03:04 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.177 2014/10/26 13:10:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1900,7 +1900,7 @@
 			 $env{'course.'.$env{'request.course.id'}.'.domain'},
 			 $env{'course.'.$env{'request.course.id'}.'.num'},
                          '%255b'.$user.'%253a'.$domain.'%255d');
-    my $result='<div>';
+    my $result='';
     foreach my $key (sort(keys(%records))) {
         my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
@@ -1965,11 +1965,11 @@
 	} else {
 	    $r->print('\textbf{'.&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this '.$lctype.'.').'}\\\\');
 	}
-    } elsif ($target ne 'tex') {
-       $r->print($result.'</div>');
+    } elsif ($target eq 'tex') {
+        $r->print(&Apache::lonxml::xmlparse($r,$target,$result));
     } else {
-		$r->print(&Apache::lonxml::xmlparse($r, 'tex', $result));
-	}
+        $r->print('<div>'.$result.'</div>');
+    }
 }
 
 sub general_message {




More information about the LON-CAPA-cvs mailing list