--- loncom/interface/lonnavmaps.pm 2012/12/30 16:05:15 1.493 +++ loncom/interface/lonnavmaps.pm 2014/01/19 21:12:35 1.498 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.493 2012/12/30 16:05:15 raeburn Exp $ +# $Id: lonnavmaps.pm,v 1.498 2014/01/19 21:12:35 raeburn Exp $ # # Copyright Michigan State University Board of Trustees @@ -619,7 +619,7 @@ sub getDescription { return &mt("Having technical difficulties; please check status later"); } if ($status == $res->NOTHING_SET) { - return &Apache::lonhtmlcommon::direct_parm_link(&mt("Not currently assigned.",$res->symb(),'opendate'),$part); + return &Apache::lonhtmlcommon::direct_parm_link(&mt('Not currently assigned'),$res->symb(),'opendate',$part); } if ($status == $res->OPEN_LATER) { return &mt("Open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($open,'start'),$res->symb(),'opendate',$part)); @@ -990,7 +990,7 @@ sub render_resource { if (!$params->{'map_no_edit_link'}) { my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png'; $editmapLink=' '. - ''. + ''. ''.&mt('Edit Content').''. ''; } @@ -2020,6 +2020,7 @@ sub new { $self->{USERNAME} = shift || $env{'user.name'}; $self->{DOMAIN} = shift || $env{'user.domain'}; $self->{CODE} = shift; + $self->{NOHIDE} = shift; @@ -2059,7 +2060,7 @@ sub new { $self->{PARM_HASH} = \%parmhash; $self->{PARM_CACHE} = {}; } else { - $self->change_user($self->{USERNAME}, $self->{DOMAIN}, $self->{CODE}); + $self->change_user($self->{USERNAME}, $self->{DOMAIN}, $self->{CODE}, $self->{NOHIDE}); } return $self; @@ -2080,6 +2081,7 @@ sub change_user { $self->{USERNAME} = shift; $self->{DOMAIN} = shift; $self->{CODE} = shift; + $self->{NOHIDE} = shift; # If the hashes are already tied make sure to break that bond: @@ -2095,7 +2097,7 @@ sub change_user { my ($cdom, $cnum) = split(/\_/, $env{'request.course.id'}); my %big_hash; - &Apache::lonmap::loadmap($cnum, $cdom, $self->{USERNAME}, $self->{DOMAIN}, $self->{CODE}, \%big_hash); + &Apache::lonmap::loadmap($cnum, $cdom, $self->{USERNAME}, $self->{DOMAIN}, $self->{CODE}, $self->{NOHIDE}, \%big_hash); $self->{NAV_HASH} = \%big_hash; @@ -4233,7 +4235,7 @@ resource of the map. Returns a string with the type of the map in it. -=item *B: +=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 @@ -4376,9 +4378,6 @@ sub printable { my ($self, $part) = @_; - &Apache::lonnet::logthis($self->symb()); - - # The following cases apply: # - If a start date is not set, it is replaced by the open date. # - Ditto for start/open replaced by content open.