--- loncom/interface/lonaboutme.pm	2009/05/18 21:51:26	1.70.4.1
+++ loncom/interface/lonaboutme.pm	2008/11/20 13:11:36	1.74
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.70.4.1 2009/05/18 21:51:26 raeburn Exp $
+# $Id: lonaboutme.pm,v 1.74 2008/11/20 13:11:36 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,7 @@
 
 =head1 NAME
 
-Apache::lonaboutme
+pache::lonaboutme
 
 =head1 SYNOPSIS
 
@@ -72,6 +72,7 @@ described at http://www.lon-capa.org.
 
 =cut
 
+
 package Apache::lonaboutme;
 
 use strict;
@@ -83,6 +84,7 @@ use Apache::lonfeedback;
 use Apache::lonrss();
 use Apache::lonlocal;
 use Apache::lonmsgdisplay();
+use Apache::lontemplate;
 use HTML::Entities();
 
 sub handler {
@@ -106,34 +108,10 @@ sub handler {
         $is_course = &Apache::lonnet::is_course($cdom,$cnum);
     }
 
-    my $candisplay = 1;
-    if (!$is_course) {
-        if ($action ne 'portfolio') {
-            $candisplay = &Apache::lonnet::usertools_access($cnum,$cdom,'aboutme');
-            if ((!$candisplay) && ($env{'request.course.id'})) {
-                $candisplay = &aboutme_access($cnum,$cdom);
-            }
-            if (!$candisplay) {
-                if ($target eq 'tex') {
-                    $r->print('\noindent{\large\textbf{'.&mt('No user home page available').'}}\\\\\\\\');
-                } else {
-                    $r->print(&Apache::loncommon::start_page("Personal Information Page"));
-                    $r->print('<h2>'.&mt('No personal information page available') .'</h2>'.
-                              &mt('This is a result of one of the following:').'<ul>'.
-                              '<li>'.&mt('The administrator of this domain has disabled personal information page functionality for this specific user.').'</li>'.
-                              '<li>'.&mt('The domain has been configured to disable, by default, personal information page functionality for all users in the domain.').'</li>'.
-                              '</ul>');
-                    $r->print(&Apache::loncommon::end_page());
-                }
-                return OK;
-            }
-        }
-    }
-
 # --------------------------------------------------------- The syllabus fields
     my %syllabusfields=&Apache::lonlocal::texthash(
        'aaa_contactinfo'   => 'Contact Information',
-       'bbb_aboutme'       => 'Personal Information',
+       'bbb_aboutme'       => 'About Me',
        'ccc_webreferences' => 'Web References');
 
 # ------------------------------------------------------------ Get Query String
@@ -144,39 +122,28 @@ sub handler {
 # ----------------------------------------------- Available Portfolio file display 
     if (($target ne 'tex') && ($action eq 'portfolio')) {
         &display_portfolio_header($r,$is_course);
-        if ((!$is_course) && (!&Apache::lonnet::usertools_access($cnum,$cdom,'portfolio'))) {
-            $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.
-                      &mt('This is a result of one of the following:').'<ul>'.
-                      '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'.
-                      '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'.
-                      '</ul>');
+        my ($blocked,$blocktext) = 
+           &Apache::loncommon::blocking_status('port',$cnum,$cdom);
+        if (!$blocked) {
+            &display_portfolio_files($r,$is_course);
         } else {
-            my ($blocked,$blocktext) =
-                &Apache::loncommon::blocking_status('port',$cnum,$cdom);
-            if (!$blocked) {
-                &display_portfolio_files($r,$is_course);
-            } else {
-                $r->print($blocktext);
-            }
-            $r->print(&Apache::loncommon::end_page());
-            return OK;
+            $r->print($blocktext);
         }
+        $r->print(&Apache::loncommon::end_page());
+        return OK;
     }
 
     if ($is_course) {
         if ($target ne 'tex') {
-	    my $brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"},
-			  {href=>"/adm/aboutme",text=>"Course Information"}];
             my $start_page =
                 &Apache::loncommon::start_page(
                     "Course Information",
                      undef,
                      {'function' => $env{'forcestudent'},
                       'domain'   => $cdom,
-                      'force_register' => $env{'forceregister'},
-                      'bread_crumbs' => $brcrum});
+                      'force_register' => $env{'forceregister'},});
             $r->print($start_page);
-            $r->print('<h2>'.&mt('Group Portfolio').'</h2>');
+            $r->print('<h2>'.&mt('Group files').'</h2>');
             &print_portfiles_link($r,$is_course);
             $r->print(&Apache::loncommon::end_page());
         }
@@ -201,11 +168,9 @@ sub handler {
                     'force_register' => $forceregister};
         if ($env{'form.popup'}) {
             $args->{'no_nav_bar'} = 1;
-        } else {
-	    $args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme",text=>"Personal Information Page"}];
         }
 	my $start_page = 
-	    &Apache::loncommon::start_page("Personal Information Page",$rss_link,$args);
+	    &Apache::loncommon::start_page("Personal Information",$rss_link,$args);
 	$r->print($start_page);
 	$r->print('<h1>'.&Apache::loncommon::plainname($cnum,$cdom).'</h1>');
     } else {
@@ -217,8 +182,7 @@ sub handler {
          '&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').'}\\\\');
     }
@@ -233,7 +197,7 @@ sub handler {
  
        if ($allowed) {
            my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
-	   $r->print('<p class="LC_info"><b>'.&mt('Privacy Note:').'</b> '.
+	   $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',&mt('Help with filling in text boxes')).'</p><p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.
@@ -274,20 +238,23 @@ 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 name="userPhoto" 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(
@@ -302,6 +269,8 @@ sub handler {
 	 '</form><form method="post">');
 
        }
+
+	
        foreach my $field (sort(keys(%syllabusfields))) {
           if (($syllabus{$field}) || ($allowed)) {
               my $message=$syllabus{$field};
@@ -313,20 +282,35 @@ sub handler {
 	      }
 	      $message=&Apache::lontexconvert::msgtexconverted($message);
 	      if ($target ne 'tex') {
-		  $r->print('<h3>'.$syllabusfields{$field}.'</h3><blockquote>'.
-                            $message.'</blockquote>');
+				
+		Apache::lontemplate::print_template($r,$syllabusfields{$field},$message);
+				
+				
+				
 	      } else {
 		     $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
 			       &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
 	      }
               if ($allowed) {
-                 $r->print('<br /><textarea cols="80" rows="6" name="'.$field.'">'.
-			   &HTML::Entities::encode($syllabus{$field},'"&<>').
-           '</textarea><input type="submit" name="storesyl" value="'.
-			   &mt('Save').'" />');
+		Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);
 	      }
 	  }
        }
+       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('Kontakt');
+	$r->print(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
+
+
+       }
+
        if ($allowed) {
            if ($env{'form.popup'}) {
                $r->print('<input type="hidden" name="popup" value="'.
@@ -340,7 +324,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'}
@@ -349,10 +334,10 @@ sub handler {
 	if ($target ne 'tex') {
 	    $r->print('<a name="coursecomment" />');
 	    $r->print('<hr /><h3>'.
-		      &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'</h3><span class="LC_info">'.
+		      &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'</h3>'.
 		      &mt('Shared by course faculty and staff').
 		      &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message").
-		      '</span><br />');
+		      '<br />');
 	    &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
 	    $r->print('<hr />');
 	    if (&Apache::lonnet::allowed('vsa',
@@ -364,27 +349,25 @@ sub handler {
 			  ('View recent activity by this student',
 			   $cnum,$cdom).('&nbsp;'x2));
 	    }
-	    $r->print(&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom));
+	    $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom));
 	} else {
 	    $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\');
 	    &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
 	}
     }
     if ($target ne 'tex') {
-        if ($env{'request.course.id'}) {
-            if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) || 
-                &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.
-                                         $env{'request.course.sec'})) {
-                $r->print('<hr />'.&Apache::loncommon::slot_reservations_link('Slot reservation history',$cnum,$cdom));
-            }
-        }
         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;
 }
 
@@ -433,12 +416,15 @@ sub print_portfiles_link {
     my $query_string = &build_query_string();
     my $output;
     my %lt = &Apache::lonlocal::texthash(
-        vpfi => 'Viewable portfolio files',
-        vgpf => 'Viewable group portfolio files',
-        difl => 'Display file listing',
-    );                     
+                         vpfi => 'Viewable portfolio files',
+                         vgpf => 'Viewable group portfolio files',
+                         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 />';
@@ -462,6 +448,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;
@@ -519,11 +506,11 @@ sub display_portfolio_header {
                                              'domain'   => $cdom,});
         if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) {
             &Apache::lonhtmlcommon::add_breadcrumb
-                ({href  => "/adm/$cdom/$cnum/aboutme".$query_string,
-                  text  => &mt('Personal information Page - [_1]',$name),
-                  title => &mt('Go to personal information page for [_1]',$name)},                 {href=>"/adm/$cdom/$cnum/aboutme/portfolio",
-                  text  => &mt('Viewable files - [_1]',$name),
-                  title => &mt('Viewable portfolio files for [_1]',$name)}
+                ({href=>"/adm/$cdom/$cnum/aboutme".$query_string,
+                  text=>"Personal information - $name",
+                  title=>"Go to personal information page for $name"},                 {href=>"/adm/$cdom/$cnum/aboutme/portfolio",
+                  text=>"Viewable files - $name",
+                  title=>"Viewable portfolio files for $name"}
             );
             $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.'));
         }
@@ -536,11 +523,10 @@ sub display_portfolio_header {
 sub display_portfolio_files {
     my ($r,$is_course) = @_;
     my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);
-    my %lt = &Apache::lonlocal::texthash(
-         withoutpass => 'passphrase not required',
-	 withpass    => 'passphrase protected',
-	 both        => 'all access types ',
-    );
+    my %lt = ( withoutpass => 'passphrase not required',
+	       withpass    => 'passphrase protected',
+	       both        => 'all access types ',);
+    %lt = &Apache::lonlocal::texthash(%lt);
 
     my $portaccess = 'withoutpass';
     if (exists($env{'form.portaccess'})) {
@@ -756,7 +742,7 @@ sub parse_directory {
 		'&nbsp;'.$showname.'</a>';
 	    $output.='</td><td>';
 	    if ($have_meta) {
-		$output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Metadata').'" src="'.
+		$output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Catalog Information').'" src="'.
 		&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').
 		'" class="LC_icon" /></a>';
 	    }
@@ -766,29 +752,5 @@ sub parse_directory {
     return $output;
 }
 
-sub aboutme_access {
-    my ($uname,$udom) = @_;
-    my $privcheck = $env{'request.course.id'};
-    my $sec;
-    if ($env{'request.course.sec'} ne '') {
-        $sec = $env{'request.course.sec'};
-        $privcheck .= '/'.$sec;
-    }
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    if (($cdom eq '') || ($cnum eq '')) {
-        my %coursehash = &coursedescription($env{'request.course.id'});
-        $cdom = $coursehash{'domain'};
-        $cnum = $coursehash{'cnum'};
-    }
-    if ((&Apache::lonnetallowed('srm',$privcheck)) || 
-        (&Apache::lonnet::allowed('dff',$privcheck))) {
-        if (&in_course($uname,$udom,$cnum,$cdom)) {
-            return 1;
-        }
-    }
-    return;
-}
-
 1;
 __END__