--- loncom/interface/loncommon.pm	2012/12/22 16:03:25	1.1075.2.22
+++ loncom/interface/loncommon.pm	2013/01/09 16:33:56	1.1075.2.27
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.22 2012/12/22 16:03:25 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.27 2013/01/09 16:33:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,6 +67,8 @@ use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
 use Apache::lontexconvert();
 use Apache::lonclonecourse();
+use Apache::lonuserutils();
+use Apache::lonuserstate();
 use LONCAPA qw(:DEFAULT :match);
 use DateTime::TimeZone;
 use DateTime::Locale::Catalog;
@@ -6627,7 +6629,7 @@ ol.LC_docs_parameters li.LC_docs_paramet
 }
 
 ul#LC_secondary_menu {
-  clear: both;
+  clear: right;
   color: $fontmenu;
   background: $tabbg;
   list-style: none;
@@ -7492,7 +7494,10 @@ sub start_page {
 		}else{
 			$result .= &Apache::lonhtmlcommon::breadcrumbs();
 		}
-    } elsif ($env{'request.noversionuri'} =~ m{^/res/}) {
+    } elsif (($env{'environment.remote'} eq 'on') &&
+             ($env{'form.inhibitmenu'} ne 'yes') &&
+             ($env{'request.noversionuri'} =~ m{^/res/}) &&
+             ($env{'request.noversionuri'} !~ m{^/res/adm/pages/})) {
         $result .= '<div style="padding:0;margin:0;clear:both"><hr /></div>';
     }
     return $result;
@@ -13293,6 +13298,26 @@ sub commit_studentrole {
     return $result;
 }
 
+sub show_role_extent {
+    my ($scope,$context,$role) = @_;
+    $scope =~ s{^/}{};
+    my @courseroles = &Apache::lonuserutils::roles_by_context('course',1);
+    push(@courseroles,'co');
+    my @authorroles = &Apache::lonuserutils::roles_by_context('author');
+    if (($context eq 'course') || (grep(/^\Q$role\E/,@courseroles))) {
+        $scope =~ s{/}{_};
+        return '<span class="LC_cusr_emph">'.$env{'course.'.$scope.'.description'}.'</span>';
+    } elsif (($context eq 'author') || (grep(/^\Q$role\E/,@authorroles))) {
+        my ($audom,$auname) = split(/\//,$scope);
+        return &mt('[_1] Author Space','<span class="LC_cusr_emph">'.
+                   &Apache::loncommon::plainname($auname,$audom).'</span>');
+    } else {
+        $scope =~ s{/$}{};
+        return &mt('Domain: [_1]','<span class="LC_cusr_emph">'.
+                   &Apache::lonnet::domain($scope,'description').'</span>');
+    }
+}
+
 ############################################################
 ############################################################
 
@@ -14099,6 +14124,32 @@ sub update_content_constraints {
     return;
 }
 
+sub allmaps_incourse {
+    my ($cdom,$cnum,$chome,$cid) = @_;
+    if ($cdom eq '' || $cnum eq '' || $chome eq '' || $cid eq '') {
+        $cid = $env{'request.course.id'};
+        $cdom = $env{'course.'.$cid.'.domain'};
+        $cnum = $env{'course.'.$cid.'.num'};
+        $chome = $env{'course.'.$cid.'.home'};
+    }
+    my %allmaps = ();
+    my $lastchange =
+        &Apache::lonnet::get_coursechange($cdom,$cnum);
+    if ($lastchange > $env{'request.course.tied'}) {
+        my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
+        unless ($ferr) {
+            &update_content_constraints($cdom,$cnum,$chome,$cid);
+        }
+    }
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    if (defined($navmap)) {
+        foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) {
+            $allmaps{$res->src()} = 1;
+        }
+    }
+    return \%allmaps;
+}
+
 sub parse_supplemental_title {
     my ($title) = @_;
 
@@ -14308,7 +14359,7 @@ sub check_captcha {
                       output_folder => $captcha_params{'output_dir'},
                       data_folder   => $captcha_params{'db_dir'},
                   );
-    my $captcha_chk = $captcha->check_code($code,$md5sum);
+    $captcha_chk = $captcha->check_code($code,$md5sum);
     my %captcha_hash = (
                         0       => 'Code not checked (file error)',
                        -1      => 'Failed: code expired',