--- rat/lonpage.pm	2007/05/23 14:57:51	1.78
+++ rat/lonpage.pm	2007/06/25 23:10:26	1.82
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.78 2007/05/23 14:57:51 www Exp $
+# $Id: lonpage.pm,v 1.82 2007/06/25 23:10:26 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -338,7 +338,7 @@ sub handler {
                                   $output=~s/\<form[^\>]*\>//gsi;
                                   $output=~s/\<\/form[^\>]*\>//gsi;
                                   $output=~
-				      s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([\w\.\:]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
+				      s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
                               }
                               $thisdir=~s/\/[^\/]*$//;
 			      foreach (@rlinks) {
@@ -432,42 +432,45 @@ sub handler {
 				  $symb=&Apache::lonenc::encrypted($symb);
 				  $esrc=&Apache::lonenc::encrypted($esrc);
 			      }
-                              unless ($hash{'src_'.$rid} =~ m-^/uploaded/-) { 
+                              if ($hash{'src_'.$rid} !~ m-^/uploaded/-
+				  && !$env{'request.enc'}
+				  && ($env{'request.role.adv'}
+				      || !$hash{'encrypted_'.$rid})) { 
                                   $metainfo ='<a name="'.&escape($symb).'" />'.
                                   '<a href="'.$metalink{$rid}.'" target="LONcatInfo">'.
-                                  '<img src="/adm/lonMisc/cat_button.'.$extension.'" border=0>'.
-                                  '</img></a>';
+                                  '<img src="/adm/lonMisc/cat_button.'.$extension.'" class="LC_icon" />'.
+                                  '</a>';
                               }
                               $metainfo .= '<a href="/adm/evaluate?postdata='.
 				  &escape($esrc).
                                   '" target="LONcatInfo">'.
-                                  '<img src="/adm/lonMisc/eval_button.'.$extension.'" border=0>'.
-                                  '</img></a>';
+                                  '<img src="/adm/lonMisc/eval_button.'.$extension.'" class="LC_icon" />'.
+                                  '</a>';
                               if (
  ($hash{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
  (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && 
  ($hash{'src_'.$rid} !~ m-^/uploaded/-)) {
 				  my ($mapid,$resid)=split(/\./,$rid);
-                                 my $symb=
-                &Apache::lonnet::declutter($hash{'map_id_'.$mapid}).
-                '___'.$resid.'___'.
-		&Apache::lonnet::declutter($hash{'src_'.$rid});
-                                 $metainfo.=
+				  my $symb= &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid});
+				  if ($hash{'encrypted_'.$resid}) { 
+				      $symb = &Apache::lonenc::encrypt($symb);
+				  }
+				  $metainfo.=
                   '<a href="/adm/grades?symb='.&escape($symb).
 #                 '&command=submission" target="LONcatInfo">'.
                   '&command=submission">'.
-                          '<img src="/adm/lonMisc/subm_button.'.$extension.'" border=0>'.
-			  '</img></a>'.
+                          '<img src="/adm/lonMisc/subm_button.'.$extension.'" class="LC_icon" />'.
+			  '</a>'.
                   '<a href="/adm/grades?symb='.&escape($symb).
 #                  '&command=gradingmenu" target="LONcatInfo">'.
                   '&command=gradingmenu">'.
-                          '<img src="/adm/lonMisc/pgrd_button.'.$extension.'" border=0>'.
-			  '</img></a>'.
+                          '<img src="/adm/lonMisc/pgrd_button.'.$extension.'" class="LC_icon" />'.
+			  '</a>'.
                   '<a href="/adm/parmset?symb='.&escape($symb).
 #                          '" target="LONcatInfo">'.
                           '" >'.
-                          '<img src="/adm/lonMisc/pprm_button.'.$extension.'" border=0>'.
-			      '</img></a>';
+                          '<img src="/adm/lonMisc/pprm_button.'.$extension.'" class="LC_icon" />'.
+			      '</a>';
                               }
                               $metainfo.='<br></br>';
 			    unless ($target eq 'tex') {