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

[albertel]

albertel		Wed May 12 15:25:15 2004 EDT

  Modified files:              
    /loncom/interface	lonaboutme.pm lonsimplepage.pm 
  Log:
  - even more readable
  
  
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.26 loncom/interface/lonaboutme.pm:1.27
--- loncom/interface/lonaboutme.pm:1.26	Wed May 12 15:00:20 2004
+++ loncom/interface/lonaboutme.pm	Wed May 12 15:25:15 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.26 2004/05/12 19:00:20 sakharuk Exp $
+# $Id: lonaboutme.pm,v 1.27 2004/05/12 19:25:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -153,13 +153,12 @@
        if ($syllabus{'uploaded.photourl'}) {
 	   &Apache::lonnet::allowuploaded('/adm/aboutme',
 					  $syllabus{'uploaded.photourl'});
-	   if ($target ne 'tex') {
-	       $r->print('<img src="'.$syllabus{'uploaded.photourl'}.
-			 '" align="right" />');
-	   } else {
-	       $r->print(&Apache::lonxml::xmlparse($r,'tex','<img src="'.$syllabus{'uploaded.photourl'}.
-			 '" align="right" />'));
+	   my $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
+                           align="right" />';
+	   if ($target eq 'tex') {
+	       $image=&Apache::lonxml::xmlparse($r,'tex',$image);
 	   }
+	   $r->print($image);
        }
        if ($allowed) {
            $r->print(
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.19 loncom/interface/lonsimplepage.pm:1.20
--- loncom/interface/lonsimplepage.pm:1.19	Wed May 12 14:53:35 2004
+++ loncom/interface/lonsimplepage.pm	Wed May 12 15:25:15 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.19 2004/05/12 18:53:35 sakharuk Exp $
+# $Id: lonsimplepage.pm,v 1.20 2004/05/12 19:25:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -151,14 +151,13 @@
 	if ($syllabus{'uploaded.photourl'}) {
 	    &Apache::lonnet::allowuploaded('/adm/smppg',
 					   $syllabus{'uploaded.photourl'});
-
-	    if ($target ne 'tex') {
-		$r->print('<img src="'.$syllabus{'uploaded.photourl'}.
-			  '" align="right" />');
-	    } else {
-		$r->print(&Apache::lonxml::xmlparse($r,'tex','<img src="'.$syllabus{'uploaded.photourl'}.
-			  '" align="right" />'));
+	    
+	    my $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
+                            align="right" />';
+	    if ($target eq 'tex') {
+		$image=&Apache::lonxml::xmlparse($r,'tex',$image);
 	    }
+	    $r->print($image);
 	}
 	if ($allowed) {
 	    $r->print(