--- loncom/interface/lonnavmaps.pm 2010/11/15 22:46:47 1.440.2.3
+++ loncom/interface/lonnavmaps.pm 2009/12/27 01:31:05 1.441
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.440.2.3 2010/11/15 22:46:47 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.441 2009/12/27 01:31:05 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
@@ -699,11 +699,7 @@ sub getDescription {
return &mt("Excused by instructor");
}
if ($status == $res->ATTEMPTED) {
- 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");
- }
+ return &mt("Answer submitted, not yet graded");
}
if ($status == $res->TRIES_LEFT) {
my $tries = $res->tries($part);
@@ -723,11 +719,7 @@ sub getDescription {
}
}
if ($status == $res->ANSWER_SUBMITTED) {
- if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
- return &mt('Question(s) submitted for review');
- } else {
- return &mt('Answer submitted');
- }
+ return &mt('Answer submitted');
}
}
@@ -1496,7 +1488,12 @@ END
if ($args->{'caller'} eq 'navmapsdisplay') {
$result .= '
'.
- &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').' | | ';
+ &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'';
+ if ($env{'environment.remotenavmap'} ne 'on') {
+ $result .= ' | ';
+ } else {
+ $result .= '
';
+ }
$result.="".mt('Tools:')." | ";
$result.=&show_linkitems_toolbar($args->{'linkitems'});
if ($args->{'sort_html'}) {
@@ -1504,7 +1501,7 @@ END
$result.=' | | | '.
''.$args->{'sort_html'}.' |
';
} else {
- $result.=' '.
+ $result.=' |
'.
$args->{'sort_html'}.' |
';
}
}
@@ -1887,7 +1884,7 @@ sub show_linkitems_toolbar {
my $result .='
'."\n';
$result .= ' | '."\n";
@@ -2388,7 +2377,7 @@ resource object.
Based on the symb of the resource, get a resource object for that
resource. This is one of the proper ways to get a resource object.
-=item * B(map_pc):
+=item * B(map_pc):
Based on the map_pc of the resource, get a resource object for
the given map. This is one of the proper ways to get a resource object.
@@ -3543,7 +3532,11 @@ sub navHash {
my $self = shift;
my $param = shift;
my $id = shift;
- return $self->{NAV_MAP}->navhash($param . ($id?$self->{ID}:""));
+ my $arg = $param . ($id?$self->{ID}:"");
+ if (defined($arg)) {
+ return $self->{NAV_MAP}->navhash($arg);
+ }
+ return;
}
=pod
@@ -3882,12 +3875,6 @@ resource of the map.
Returns a string with the type of the map in it.
-=item *B:
-
-Returns a string with a comma-separated ordered list of map_pc IDs
-for the hierarchy of maps containing a map, with the top level
-map first, then descending to deeper levels, with the enclosing map last.
-
=back
=cut
@@ -3918,11 +3905,6 @@ sub map_type {
my $pc = $self->map_pc();
return $self->navHash("map_type_$pc", 0);
}
-sub map_hierarchy {
- my $self = shift;
- my $pc = $self->map_pc();
- return $self->navHash("map_hierarchy_$pc", 0);
-}
#####
# Property queries