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

amueller lon-capa-cvs-allow@mail.lon-capa.org
Tue, 11 Nov 2008 10:45:22 -0000


amueller		Tue Nov 11 10:45:22 2008 EDT

  Modified files:              
    /loncom/interface	lonaboutme.pm lonrss.pm 
  Log:
  View Changes in lonaboutme.pm by Niels Neumann
  
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.70 loncom/interface/lonaboutme.pm:1.71
--- loncom/interface/lonaboutme.pm:1.70	Thu Sep 11 02:07:27 2008
+++ loncom/interface/lonaboutme.pm	Tue Nov 11 10:45:22 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.70 2008/09/11 02:07:27 raeburn Exp $
+# $Id: lonaboutme.pm,v 1.71 2008/11/11 10:45:22 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -134,8 +134,7 @@
          '&quot;</h2>');
     }
     if ($target ne 'tex') {
-	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>'.
-		  '<p>'.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
+	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');#OLD SendMessage POS
     } else {
 	$r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
     }
@@ -191,20 +190,22 @@
            &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
        }
 
+my $lastmod;
+my $image; 
 # ---------------------------------------------------------------- Get syllabus
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
-       my $lastmod=$syllabus{'uploaded.lastmodified'};
+       $lastmod=$syllabus{'uploaded.lastmodified'};
        $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
-       $r->print(&mt('Last updated').': '.$lastmod);
+       # $r->print(&mt('Last updated').': '.$lastmod); #Old Last Modifi Pos
        if ($syllabus{'uploaded.photourl'}) {
 	   &Apache::lonnet::allowuploaded('/adm/aboutme',
 					  $syllabus{'uploaded.photourl'});
-	   my $image=
-               qq{<img src="$syllabus{'uploaded.photourl'}" align="right" />};
+	   $image=
+               qq{<img src="$syllabus{'uploaded.photourl'}" style="vertical-align:text-top;float:right;" />};
 	   if ($target eq 'tex') {
 	       $image=&Apache::lonxml::xmlparse($r,'tex',$image);
 	   }
-	   $r->print($image);
+	  # $r->print($image); #Print old Image
        }
        if ($allowed) {
            $r->print(
@@ -219,6 +220,12 @@
 	 '</form><form method="post">');
 
        }
+
+       if($target ne 'tex')
+       {
+		$r->print('<div style="left:0;  width:75%">');
+       } 
+	
        foreach my $field (sort(keys(%syllabusfields))) {
           if (($syllabus{$field}) || ($allowed)) {
               my $message=$syllabus{$field};
@@ -230,8 +237,15 @@
 	      }
 	      $message=&Apache::lontexconvert::msgtexconverted($message);
 	      if ($target ne 'tex') {
-		  $r->print('<h3>'.$syllabusfields{$field}.'</h3><blockquote>'.
-                            $message.'</blockquote>');
+		
+			# Start Neu
+		  $r->print('<fieldset><legend><b>'.$syllabusfields{$field}.'</b></legend>');
+		  $r->print($message);
+		  $r->print('</fieldset><br />');
+ 		#Ende NEU	        
+  
+		  # $r->print('<h3>'.$syllabusfields{$field}. 'MESSAGE ____' .'</h3><blockquote>'.
+                  #          $message.'</blockquote>');
 	      } else {
 		     $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
 			       &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
@@ -244,6 +258,27 @@
 	      }
 	  }
        }
+       if($target ne 'tex')
+       {
+		
+		         &print_portfiles_link($r,$is_course);
+ 
+      		 $r->print('</div>');
+			$r->print('<div style="margin:0 0 0 75">');
+        $r->print($image);
+
+	$r->print('<p style="clear:both">');
+	$r->print('<div style="border:1px solid #000000;float:right">');
+	$r->print('<div style="border-bottom:1px solid #000000; background-color:#efefef;">');
+	$r->print('Kontakt');
+	$r->print('</div>');
+	$r->print('safasf@dsf.de');
+	$r->print(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
+
+	$r->print('</div></div>');
+
+       }
+
        if ($allowed) {
            if ($env{'form.popup'}) {
                $r->print('<input type="hidden" name="popup" value="'.
@@ -257,7 +292,8 @@
     }
 
     if ($target ne 'tex') {
-        &print_portfiles_link($r,$is_course);
+        # &print_portfiles_link($r,$is_course); #old Print files
+
     }
 
     if ($env{'request.course.id'}
@@ -291,10 +327,15 @@
         if ($env{'form.popup'}) {
             $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');
         }
+	$r->print('<br />'.&mt('Last updated').': '.$lastmod);
+
 	$r->print(&Apache::loncommon::end_page());
     } else {
 	$r->print('\end{document}');
     }
+
+  
+	
     return OK;
 }
 
@@ -348,7 +389,10 @@
                          difl => 'Display file listing',
              );                     
     if ($filecounts->{'both'} > 0) {
-        $output = '<h3>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h3>';
+	$output = '<fieldset><legend><b>';
+	$output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</b></legend><br />';
+        
+	#$output = '<h3>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h3>';
         $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.
                    $query_string.'">'.$lt{'difl'}.
                    '</a><br /><br />';
@@ -372,6 +416,7 @@
 	    $output .= '<li>'.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'</li>';
         }
         $output .= '</ul>';
+	$output .='</fieldset>';
     }
     $r->print($output);
     return;
Index: loncom/interface/lonrss.pm
diff -u loncom/interface/lonrss.pm:1.37 loncom/interface/lonrss.pm:1.38
--- loncom/interface/lonrss.pm:1.37	Fri Jul 27 00:17:17 2007
+++ loncom/interface/lonrss.pm	Tue Nov 11 10:45:22 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # RSS Feeder
 #
-# $Id: lonrss.pm,v 1.37 2007/07/27 00:17:17 albertel Exp $
+# $Id: lonrss.pm,v 1.38 2008/11/11 10:45:22 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -106,8 +106,8 @@
 	    }
 	} else {
 	    $feeds.='<li><b>'.$feednames{$feed}.
-		'</b><br />'.($edit?&mt('Edit'):'HTML').': <a href="'.$htmlurl.'"><tt>'.$htmlurl.'</tt></a>'.
-		'<br />'.&mt('Public RSS/podcast (subscribe to)').': <a href="'.$feedurl.'"><tt>'.$feedurl.'</tt></a></li>';
+		'</b><br />'.($edit?&mt('Edit'):'HTML').': <a href="'.$htmlurl.'"><tt>'.$feednames{$feed}.' HTML</tt></a>'.
+		'<br />'.&mt('Public RSS/podcast (subscribe to)').': <a href="'.$feedurl.'"><tt>'.$feednames{$feed}.' RSS/Podcast</tt></a></li>';
 	}
     }
     if ($feeds) {