--- loncom/interface/lonaboutme.pm	2012/10/04 13:41:10	1.149
+++ loncom/interface/lonaboutme.pm	2012/11/08 18:37:44	1.150
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.149 2012/10/04 13:41:10 bisitz Exp $
+# $Id: lonaboutme.pm,v 1.150 2012/11/08 18:37:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,8 +50,6 @@ described at http://www.lon-capa.org.
 
 =item handler()
 
-=item in_course()
-
 =item aboutme_info()
 
 =item print_portfiles_link()
@@ -168,7 +166,7 @@ sub handler {
 
     if ($is_course) {
         if ($target ne 'tex') {
-            my $args = {'function'       => $env{'forcestudent'},
+            my $args = {'function'       => undef,
                         'domain'         => $cdom};
             if ($env{'form.register'}) {
                 $args->{'force_register'} = $env{'form.register'};
@@ -192,17 +190,24 @@ sub handler {
         return OK;
     }
 
-# --------------------------------------------------------------- Force Student
-    my $forcestudent='';
-    if ($env{'form.forcestudent'}) { $forcestudent='student'; };
-
 #------------Get rights
     my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
-     my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
-    my $allowed=0;
-      my $privleged=$allowed=(($env{'user.name'} eq $cnum) &&
-                   ($env{'user.domain'} eq $cdom));
-    if ($forcestudent or $target eq 'tex') { $allowed=0; }
+    my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
+    my ($allowed,$coursedomain,$coursenum);
+    if ($env{'request.course.id'}) {
+        $coursedomain = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $coursenum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    }
+    my ($cfile) = 
+        &Apache::lonnet::can_edit_resource($env{'request.noversionuri'},
+                                           $coursenum,$coursedomain,
+                                           $env{'request.noversionuri'},
+                                           $env{'request.symb'});
+    if ($cfile ne '') {
+        $allowed = 1;
+    }
+
+    if (!$env{'form.forceedit'} or $target eq 'tex') { $allowed=0; }
 
 # --------------------------------------- There is such a user, get environment
 
@@ -222,53 +227,8 @@ sub handler {
         $r->print($start_page);
    }
 
-#----------------Print Functions
-    if ($target ne 'tex') {
-        my $functions=&Apache::lonhtmlcommon::start_funclist();
-        if ($allowed) {
-            my $query_string = &build_query_string(
-                                   {'forcestudent' => '1',
-                                    'popup' => $env{'form.popup'}});
-            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
-                            '<a href="'.$r->uri.$query_string.'">'
-                           .&mt('Show Public View').'</a>'
-                           .&Apache::loncommon::help_open_topic(
-                                'Uploaded_Templates_PublicView'));
-        } elsif ($privleged) {
-            my $query_string = &build_query_string(
-                                   {'forceedit' => '1',
-                                    'popup' => $env{'form.popup'}});
-            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
-                            '<a href="'.$r->uri.$query_string.'">'
-                            .&mt('Edit').'</a>');
-        }
-        $functions.=&Apache::lonhtmlcommon::add_item_funclist(
-                        &Apache::lontemplate::send_message($r,$cnum,$cdom));
-
-        if ($env{'request.course.id'} &&
-            &Apache::lonnet::allowed('srm',$env{'request.course.id'}) &&
-            &in_course($cdom,$cnum)) {
-            if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) ||
-                &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
-                $functions.=&Apache::lonhtmlcommon::add_item_funclist(
-                     &Apache::loncommon::track_student_link(
-                         'View recent activity by this student',$cnum,$cdom));
-            }
-            if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) ||
-                &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
-                $functions.=&Apache::lonhtmlcommon::add_item_funclist(
-                    &Apache::loncommon::slot_reservations_link(
-                        'Slot reservation history',$cnum,$cdom));
-            }
-            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
-                           &Apache::loncommon::noteswrapper(
-                               &mt('Add Records'),$cnum,$cdom));
-        }
-        $functions.=&Apache::lonhtmlcommon::end_funclist();
-        $r->print(&Apache::loncommon::head_subbox($functions));
-    }
+#----------------Print Privacy note (edit mode) or last modified date. 
 
-# Print Privacy Note
     if ($target ne 'tex') {
         #Print Privacy Note
         if ($allowed) {
@@ -277,36 +237,36 @@ sub handler {
                 .&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.')
                 .'</div>'
             );
-        }
-    }
-
-#Print last modified
-
-    if ($target ne 'tex') {
-        my $lastmod;
-        if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
-            $lastmod=$syllabus{'uploaded.lastmodified'};
+        } elsif ($syllabus{'uploaded.lastmodified'}) {
+        #Print last modified
+            my $lastmod=$syllabus{'uploaded.lastmodified'};
             $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
             $r->print('<div class="LC_info">');
-             $r->print(&mt('Last updated').': '.$lastmod . '');
+            $r->print(&mt('Last updated').': '.$lastmod . '');
             $r->print('</div>');
         }
     }
-#Print Help Text
-    if ($target ne 'tex') {
-        if($allowed){
-            $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
-        }
-    }
 
 #------Print Headtitle
      if ($target ne 'tex') {
-        $r->print('<div class="LC_Box">');
-        $r->print('<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
-         if ($courseenv{'nickname'}) {
-               $r->print('<h2>&quot;'.$courseenv{'nickname'}.'&quot;</h2>');
-        }
-        $r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
+         $r->print('<div class="LC_Box">'.
+                   '<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
+         if ($allowed) {
+             $r->print('<div style="margin: 0; float:left;">');
+             if ($courseenv{'nickname'}) {
+                 $r->print('<h2>&quot;'.$courseenv{'nickname'}.'&quot;</h2>');
+             }
+             $r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3></div>');
+             #Print Help Text
+             $r->print('<div style="margin: 0; float:right;">'.
+                       &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).
+                       '</div><br clear="all" />');
+         } else {
+             if ($courseenv{'nickname'}) {
+                 $r->print('<h2>&quot;'.$courseenv{'nickname'}.'&quot;</h2>');
+             }
+             $r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
+         }
      } else {
         $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
         $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
@@ -414,7 +374,7 @@ sub handler {
 
     if ($env{'request.course.id'}
         && &Apache::lonnet::allowed('srm',$env{'request.course.id'})
-        && &in_course($cdom,$cnum)) {
+        && &Apache::lonnet::in_course($cdom,$cnum)) {
         if ($target ne 'tex') {
             $r->print('<a name="coursecomment" />');
             &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_Box');
@@ -444,31 +404,6 @@ sub handler {
     return OK;
 }
 
-sub in_course {
-    my ($udom,$uname,$cdom,$cnum,$type) = @_;
-    $type ||= 'any';
-    if (!defined($cdom) || !defined($cnum)) {
-        my $cid  = $env{'request.course.id'};
-        $cdom = $env{'course.'.$cid.'.domain'};
-        $cnum = $env{'course.'.$cid.'.num'};
-    }
-    my $typesref;
-    if ($type eq 'all') {
-        $typesref = ['active','previous','future'];
-    } elsif ($type eq 'previous' || $type eq 'future') {
-        $typesref = [$type];
-    }
-    my %roles = &Apache::lonnet::get_my_roles($uname,$udom,'userroles',
-                                             $typesref,undef,[$cdom]);
-    my ($tmp) = keys(%roles);
-    return 0 if ($tmp =~ /^(con_lost|error|no_such_host)/i);
-    my @course_roles = grep(/^\Q$cnum\E:\Q$cdom\E:/, keys(%roles));
-    if (@course_roles > 0) {
-        return 1;
-    }
-    return 0;
-}
-
 sub aboutme_info {
     my ($r,$is_course) = @_;
     my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
@@ -852,7 +787,7 @@ sub aboutme_access {
     }
     if ((&Apache::lonnet::allowed('srm',$privcheck)) ||
         (&Apache::lonnet::allowed('dff',$privcheck))) {
-        if (&in_course($uname,$udom,$cnum,$cdom)) {
+        if (&Apache::lonnet::in_course($uname,$udom,$cnum,$cdom)) {
             return 1;
         }
     }