--- loncom/interface/lonaboutme.pm	2007/05/23 21:44:11	1.63
+++ loncom/interface/lonaboutme.pm	2008/11/11 10:45:22	1.71
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.63 2007/05/23 21:44:11 albertel Exp $
+# $Id: lonaboutme.pm,v 1.71 2008/11/11 10:45:22 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,7 +69,7 @@ sub handler {
 # ------------------------------------------------------------ Get Query String
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['forceedit','forcestudent',
-					     'register']);
+					     'register','popup']);
 
 # ----------------------------------------------- Available Portfolio file display 
     if (($target ne 'tex') && ($action eq 'portfolio')) {
@@ -114,12 +114,15 @@ sub handler {
 # --------------------------------------- There is such a user, get environment
     my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
     if ($target ne 'tex') {
+	my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
+        my $args = {'function' => $forcestudent,
+                    'domain'   => $cdom,
+                    'force_register' => $forceregister};
+        if ($env{'form.popup'}) {
+            $args->{'no_nav_bar'} = 1;
+        }
 	my $start_page = 
-	    &Apache::loncommon::start_page("Personal Information",undef,
-					   {'function'       => $forcestudent,
- 					    'domain'         => $cdom,
-					    'force_register' =>
-						            $forceregister,});
+	    &Apache::loncommon::start_page("Personal Information",$rss_link,$args);
 	$r->print($start_page);
 	$r->print('<h1>'.&Apache::loncommon::plainname($cnum,$cdom).'</h1>');
     } else {
@@ -131,8 +134,7 @@ sub handler {
          '&quot;</h2>');
     }
     if ($target ne 'tex') {
-	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>'.
-		  '<p>'.&Apache::loncommon::messagewrapper('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').'}\\\\');
     }
@@ -146,14 +148,14 @@ sub handler {
        if ($forcestudent or $target eq 'tex') { $allowed=0; }
  
        if ($allowed) {
-           my $query_string = &build_query_string({'forcestudent' => '1',});
+           my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
 	   $r->print('<p><b>'.&mt('Privacy Note').':</b> '.
 		     &mt('The information you submit can be viewed by anybody who is logged into LON-CAPA. Do not provide information that you are not ready to share publicly.').
 		     '</p>'.
-		     &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'</p><p><a href="'.$r->uri.$query_string.'">Show Public View</a>'.
+		     &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p><p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.
 		     &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
        } elsif ($privleged && $target ne 'tex') {
-           my $query_string = &build_query_string({'forceedit' => '1',});
+           my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
 	   $r->print('<p><a href="'.$r->uri.$query_string.'"><font size="+1">'.
 		     &mt('Edit').'</font></a></p>');
        }
@@ -188,33 +190,42 @@ sub handler {
            &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(
 	 '<form method="post">
-               <input type="submit" name="delupl" value="Delete Photo" />
+               <input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />
           </form>'.
 	 '<form method="post" enctype="multipart/form-data">'.
          '<h3>'.&mt('Upload a Photo').'</h3>'.
-         '<input type="file" name="uploaddoc" size="50">'.
-         '<input type="submit" name="storeupl" value="Upload">'.
+         '<input type="file" name="uploaddoc" size="50" />'.
+         '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
+         '<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.
 	 '</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};
@@ -226,8 +237,15 @@ sub handler {
 	      }
 	      $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).'\\\\');
@@ -240,7 +258,32 @@ sub handler {
 	      }
 	  }
        }
+       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="'.
+                         $env{'form.popup'}.'" />');
+           }
 	   $r->print('</form>');
        }
        if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}
@@ -249,7 +292,8 @@ sub handler {
     }
 
     if ($target ne 'tex') {
-        &print_portfiles_link($r,$is_course);
+        # &print_portfiles_link($r,$is_course); #old Print files
+
     }
 
     if ($env{'request.course.id'}
@@ -280,10 +324,18 @@ sub handler {
 	}
     }
     if ($target ne 'tex') {
+        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;
 }
 
@@ -327,7 +379,8 @@ sub aboutme_info {
 sub print_portfiles_link {
     my ($r,$is_course) = @_;
     my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);
-    my $filecounts = &portfolio_files($r,'showlink',undef,$is_course);
+    my $filecounts = &portfolio_files($r,'showlink',undef,$is_course,
+                                      $cdom,$cnum,$name);
     my $query_string = &build_query_string();
     my $output;
     my %lt = &Apache::lonlocal::texthash(
@@ -336,7 +389,10 @@ sub print_portfiles_link {
                          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 />';
@@ -360,6 +416,7 @@ sub print_portfiles_link {
 	    $output .= '<li>'.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'</li>';
         }
         $output .= '</ul>';
+	$output .='</fieldset>';
     }
     $r->print($output);
     return;
@@ -459,7 +516,8 @@ sub display_portfolio_files {
                &mt('Update display').'" />';
     $output .= '</form><br /><br />';
     $r->print($output);
-    my $filecounts = &portfolio_files($r,'listfiles',\%lt,$is_course);
+    my $filecounts = &portfolio_files($r,'listfiles',\%lt,$is_course,
+                                      $cdom,$cnum,$name);
     if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) {
         my $query_string = &build_query_string();
         $r->print('<br /><br /><a href="/adm/'.$cdom.'/'.$cnum.
@@ -475,8 +533,7 @@ sub display_portfolio_files {
 }
 
 sub portfolio_files {
-    my ($r,$mode,$lt,$is_course) = @_;
-    my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);
+    my ($r,$mode,$lt,$is_course,$cdom,$cnum,$name) = @_;
     my $filecounts = {
                        withpass    => 0,
                        withoutpass => 0,
@@ -608,9 +665,10 @@ sub parse_directory {
 
     my $portfolio_root = &Apache::portfolio::get_portfolio_root($cdom,$cnum,
                                                                 $group);
+    my $getpropath = 1;
     my %dirlist = map {
 	    ((split('&',$_,2))[0],1)
-	} &Apache::lonnet::dirlist($path,$cdom,$cnum,$portfolio_root);
+	} &Apache::lonnet::dirlist($portfolio_root.$path,$cdom,$cnum,$getpropath);
     foreach my $item (sort(keys(%{$currhash}))) {
         $output .= &portfolio_row_start();
         $output .= '<td style="padding-left: '.($depth*25).'px">';