version 1.423.2.3, 2010/02/10 16:45:31
|
version 1.423.4.2, 2009/09/23 14:30:45
|
Line 597 sub getLinkForResource {
|
Line 597 sub getLinkForResource {
|
my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb()); |
my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb()); |
if ($map=~/\.page$/) { |
if ($map=~/\.page$/) { |
my $url=&Apache::lonnet::clutter($map); |
my $url=&Apache::lonnet::clutter($map); |
$anchor=&escape($res->shown_symb()); |
$anchor=&escape($src->shown_symb()); |
return ($url,$res->shown_symb(),$anchor); |
return ($url,$res->shown_symb(),$anchor); |
} |
} |
} |
} |
Line 695 sub getDescription {
|
Line 695 sub getDescription {
|
return &mt("Excused by instructor"); |
return &mt("Excused by instructor"); |
} |
} |
if ($status == $res->ATTEMPTED) { |
if ($status == $res->ATTEMPTED) { |
return &mt("Answer submitted, not yet graded"); |
if ($res->src() eq '/res/gci/gci/internal/submission.problem') { |
|
return &mt('Question(s) submitted for review'); |
|
} else { |
|
return &mt("Answer submitted, not yet graded"); |
|
} |
} |
} |
if ($status == $res->TRIES_LEFT) { |
if ($status == $res->TRIES_LEFT) { |
my $tries = $res->tries($part); |
my $tries = $res->tries($part); |
Line 715 sub getDescription {
|
Line 719 sub getDescription {
|
} |
} |
} |
} |
if ($status == $res->ANSWER_SUBMITTED) { |
if ($status == $res->ANSWER_SUBMITTED) { |
return &mt('Answer submitted'); |
if ($res->src() eq '/res/gci/gci/internal/submission.problem') { |
|
return &mt('Question(s) submitted for review'); |
|
} else { |
|
return &mt('Answer submitted'); |
|
} |
} |
} |
} |
} |
|
|
Line 880 sub render_resource {
|
Line 888 sub render_resource {
|
my $link = $params->{"resourceLink"}; |
my $link = $params->{"resourceLink"}; |
|
|
# The URL part is not escaped at this point, but the symb is... |
# The URL part is not escaped at this point, but the symb is... |
|
# The stuff to the left of the ? must have ' replaced by \' since |
|
# it will be quoted with ' in the href. |
|
|
|
my ($left,$right) = split(/\?/, $link); |
|
$link = $left.'?'.$right; |
|
|
my $src = $resource->src(); |
my $src = $resource->src(); |
my $it = $params->{"iterator"}; |
my $it = $params->{"iterator"}; |
Line 3498 sub navHash {
|
Line 3511 sub navHash {
|
my $self = shift; |
my $self = shift; |
my $param = shift; |
my $param = shift; |
my $id = shift; |
my $id = shift; |
my $arg = $param . ($id?$self->{ID}:""); |
return $self->{NAV_MAP}->navhash($param . ($id?$self->{ID}:"")); |
if (defined($arg)) { |
|
return $self->{NAV_MAP}->navhash($arg); |
|
} |
|
return; |
|
} |
} |
|
|
=pod |
=pod |