--- loncom/interface/lonnavmaps.pm 2004/07/26 22:30:15 1.272
+++ loncom/interface/lonnavmaps.pm 2004/08/13 20:12:11 1.275
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.272 2004/07/26 22:30:15 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.275 2004/08/13 20:12:11 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -100,7 +100,7 @@ sub launch_win {
}
if ($mode eq 'link') {
$result.=''
- .&mt("Launch Navmaps in seperate window")." ";
+ .&mt("Launch navigation in separate window")." ";
}
return $result;
}
@@ -164,13 +164,24 @@ sub real_handler {
if ($ENV{QUERY_STRING} eq 'collapseExternal') {
&Apache::lonnet::put('environment',{'remotenavmap' => 'off'});
&Apache::lonnet::appenv('environment.remotenavmap' => 'off');
+ my $menu=&Apache::lonmenu::reopenmenu();
+ my $navstatus=&Apache::lonmenu::get_nav_status();
+ if ($menu) {
+ $menu=(<print(<<"ENDSUBM");
@@ -275,7 +286,7 @@ ENDSUBM
if ($ENV{'environment.remotenavmap'} eq 'on') {
# $r->print("" .
$r->print("" .
- &mt("Close external navmaps").
+ &mt("Close separate navigation window").
" ");
}
@@ -1077,9 +1088,7 @@ sub render_resource {
if ($resource->is_problem() && $part ne '0' &&
!$params->{'condensed'}) {
- my $displaypart=&Apache::lonnet::EXT('resource.'.$part.'.display',
- $resource->symb());
- unless ($displaypart) { $displaypart=$part; }
+ my $displaypart=$resource->part_display($part);
$partLabel = " (Part: $displaypart)";
$link.='#'.&Apache::lonnet::escape($part);
$title = "";
@@ -3674,7 +3683,16 @@ sub weight {
$self->symb(), $ENV{'user.domain'},
$ENV{'user.name'},
$ENV{'request.course.sec'});
-
+}
+sub part_display {
+ my $self= shift(); my $partID = shift();
+ if (! defined($partID)) { $partID = '0'; }
+ my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',
+ $self->symb);
+ if (! defined($display) || $display eq '') {
+ $display = $partID;
+ }
+ return $display;
}
# Multiple things need this