--- rat/lonpage.pm	2001/08/13 17:36:32	1.24
+++ rat/lonpage.pm	2001/11/05 19:28:54	1.28
@@ -6,7 +6,7 @@
 # 05/29/00,05/30 Gerd Kortemeyer)
 # 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
 # 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16,
-# 08/13/01 Gerd Kortemeyer
+# 08/13/01,08/30,10/1 Gerd Kortemeyer
 
 package Apache::lonpage;
 
@@ -248,7 +248,11 @@ sub handler {
 					  $xmlbody=$token->[4];
                                       }
                                   } elsif ($token->[1] eq 'meta') {
+				    if ($token->[4] !~ m:/>$:) {
 				      $allmeta.="\n".$token->[4].'</meta>';
+				    } else {
+				      $allmeta.="\n".$token->[4];
+				    }
                                   } elsif (($token->[1] eq 'script') &&
                                            ($bodydef==0)) {
 				      $allscript.="\n\n"
@@ -309,7 +313,7 @@ sub handler {
 			  $r->print("\n<script language='JavaScript'>\n".
                                    $allscript."\n</script>\n");
                       }
-                      $r->print(&Apache::lonxml::registerurl);
+                      $r->print(&Apache::lonxml::registerurl(1));
                       $r->print("\n</head>\n");
 # ------------------------------------------------------------------ Start body
                       if ($isxml) {
@@ -336,7 +340,29 @@ sub handler {
                               my $metainfo='<a href="'.
                                     $metalink{$rid}.'" target="LONcatInfo">'.
                           '<img src="/adm/lonMisc/cat_button.gif" border=0>'.
-			  '</img></a><br></br>';
+			  '</img></a>';
+                              if (
+ ($hash{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
+ (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) {
+				  my ($mapid,$resid)=split(/\./,$rid);
+                                 my $symb=
+                &Apache::lonnet::declutter($hash{'map_id_'.$mapid}).
+                '___'.$resid.'___'.
+		&Apache::lonnet::declutter($hash{'src_'.$rid});
+                                 $metainfo.=
+                  '<a href="/adm/grades?symb='.$symb.
+                  '&command=submission" target="LONcatInfo">'.
+                          '<img src="/adm/lonMisc/subm_button.gif" border=0>'.
+			  '</img></a>'.
+                  '<a href="/adm/grades?symb='.$symb.
+                  '&command=viewgrades" target="LONcatInfo">'.
+                          '<img src="/adm/lonMisc/pgrd_button.gif" border=0>'.
+			  '</img></a>'.
+                  '<a href="/adm/parmset?symb='.$symb.'" target="LONcatInfo">'.
+                          '<img src="/adm/lonMisc/pprm_button.gif" border=0>'.
+			      '</img></a>';
+                              }
+                              $metainfo.='<br></br>';
                               $r->print('<td colspan="'.$avespan.'"');
                               if ($cellemb{$rid} eq 'ssi') {
 				  if ($ssibgcolor{$rid}) {
@@ -377,7 +403,7 @@ sub handler {
 	                  '<input name="all_submit" value="Submit All" type="'.
 			  (($nforms>1)?'submit':'hidden').'"></input></form>');
                       }
-                      $r->print('</body></html>');
+                      $r->print('</body>'.&Apache::lonxml::xmlend());
 # -------------------------------------------------------------------- End page
                   }                  
 # ------------------------------------------------------------- End render page