--- rat/lonpage.pm 2007/06/22 22:30:45 1.81
+++ rat/lonpage.pm 2007/06/25 23:27:10 1.83
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.81 2007/06/22 22:30:45 albertel Exp $
+# $Id: lonpage.pm,v 1.83 2007/06/25 23:27:10 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -206,8 +206,6 @@ sub handler {
my %ssivlink=();
my %ssialink=();
- my %metalink=();
-
my %cellemb=();
my $allscript='';
@@ -230,7 +228,6 @@ sub handler {
if ($hash{'encrypted_'.$_}) {
$src=&Apache::lonenc::encrypted($src);
}
- $metalink{$_}=$src.'.meta';
$cellemb{$_}=
&Apache::loncommon::fileembstyle($extension);
if ($cellemb{$_} eq 'ssi') {
@@ -411,9 +408,6 @@ sub handler {
} else {
$r->print('
');
}
-# which icons do we use?
- my $extension='png';
- if ($env{'environment.icons'} eq 'classic') { $extension='gif'; }
# generate rows
for ($i=0;$i<=$#rows;$i++) {
if ($rows[$i]) {
@@ -424,55 +418,8 @@ sub handler {
my $avespan=$lcm/($#colcont+1);
for ($j=0;$j<=$#colcont;$j++) {
my $rid=$colcont[$j];
- 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});
- if ($hash{'encrypted_'.$rid}) {
- $symb=&Apache::lonenc::encrypted($symb);
- $esrc=&Apache::lonenc::encrypted($esrc);
- }
- if ($hash{'src_'.$rid} !~ m-^/uploaded/-
- && !$env{'request.enc'}
- && ($env{'request.role.adv'}
- || !$hash{'encrypted_'.$rid})) {
- $metainfo =''.
- ''.
- '
'.
- '';
- }
- $metainfo .= ''.
- '
'.
- '';
- 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.=
- ''.
- '&command=submission">'.
- '
'.
- ''.
- ''.
- '&command=gradingmenu">'.
- '
'.
- ''.
- ''.
- '" >'.
- '
'.
- '';
- }
- $metainfo.='
';
+
+ my $metainfo =&get_buttons(\%hash,$rid).'
';
unless ($target eq 'tex') {
$r->print('{'src_'.$rid});
+ my ($mapid,$resid)=split(/\./,$rid);
+ my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid},
+ $resid,
+ $hash->{'src_'.$rid});
+ if ($hash->{'encrypted_'.$rid}) {
+ $symb=&Apache::lonenc::encrypted($symb);
+ $esrc=&Apache::lonenc::encrypted($esrc);
+ }
+ if ($hash->{'src_'.$rid} !~ m-^/uploaded/-
+ && !$env{'request.enc'}
+ && ($env{'request.role.adv'}
+ || !$hash->{'encrypted_'.$rid})) {
+ $metainfo .=''.
+ ''.
+ ' '.
+ '';
+ }
+ $metainfo .= ''.
+ ' '.
+ '';
+ if (($hash->{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
+ ($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {
+
+ if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
+ $metainfo.=
+ ''.
+ '&command=submission">'.
+ ' '.
+ ''.
+ ''.
+ '&command=gradingmenu">'.
+ ' '.
+ '';
+ }
+ if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
+ $metainfo.=
+ ''.
+ '" >'.
+ ' '.
+ '';
+ }
+ }
+ return $metainfo;
+}
+
1;
__END__
|