--- rat/lonpage.pm	2020/03/04 16:33:31	1.135
+++ rat/lonpage.pm	2020/03/06 20:04:01	1.138
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.135 2020/03/04 16:33:31 raeburn Exp $
+# $Id: lonpage.pm,v 1.138 2020/03/06 20:04:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -368,7 +368,7 @@ sub handler {
                                           if (($hash{'encrypted_'.$_}) && ($symb) && (!$env{'request.role.adv'})) {
                                               $showsrc .= '?symb='.&Apache::lonenc::encrypted($symb);
                                           } elsif ($anchor) {
-                                              $showsrc .= $anchor
+                                              $showsrc .= $anchor;
                                           }
                                           $ssibody{$_} = <<ENDEXT;
 <iframe src="$showsrc" width="100%" height="300px">No iframe support!</iframe>
@@ -939,20 +939,31 @@ ENDEXT
 sub get_buttons {
     my ($hash,$rid,$buttonshide,$hostname) = @_;
 
-    my $metainfo = '';
-    my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
     my ($mapid,$resid)=split(/\./,$rid);
     my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid},
 					  $resid,
 					  $hash->{'src_'.$rid});
+    my $aname;
+    if (($hash->{'encrypted_'.$rid}) && (!$env{'request.role.adv'})) {
+        $aname = 'LC_'.$rid;
+    } else {
+        my $shownsymb = $symb;
+        if ($symb =~ /\#([^\#]+)$/) {
+            my $escan = &escape('#');
+            $shownsymb =~ s/#([^\#]+)$/$escan$1/;
+        }
+        $aname = &escape($shownsymb);
+    }
+    my $metainfo = '<a name="'.$aname.'"></a>';
     unless ($env{'request.role.adv'}) {
         if ($buttonshide->{$symb} eq 'yes') {
-            return;
+            return $metainfo;
         }
     }
     my $crs_sec = $env{'request.course.id'} . (($env{'request.course.sec'} ne '')
                                                ? "/$env{'request.course.sec'}"
                                                : '');
+    my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
     if ($hash->{'encrypted_'.$rid}) {
 	$esrc=&Apache::lonenc::encrypted($esrc);
     }
@@ -961,8 +972,8 @@ sub get_buttons {
 	&& !$env{'request.enc'}
 	&& ($env{'request.role.adv'}
 	    || !$hash->{'encrypted_'.$rid})) { 
-	$metainfo .='<a name="'.&escape($symb).'"></a>'.
-	    '<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'.
+	$metainfo .= '<a href="'.$hash->{'src_'.$rid}.'.meta'.'" '.
+	    'target="LONcatInfo">'.
             '<img src="/res/adm/pages/catalog.png" class="LC_icon"'.
             ' alt="'.&mt('Show Metadata').'"'.
             ' title="'.&mt('Show Metadata').'" />'.