[BACK]Return to lonnavmaps.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonnavmaps.pm between versions 1.440.2.3 and 1.441

version 1.440.2.3, 2010/11/15 22:46:47 version 1.441, 2009/12/27 01:31:05
Line 699  sub getDescription { Line 699  sub getDescription {
         return &mt("Excused by instructor");          return &mt("Excused by instructor");
     }      }
     if ($status == $res->ATTEMPTED) {      if ($status == $res->ATTEMPTED) {
         if ($res->src() eq '/res/gci/gci/internal/submission.problem') {          return &mt("Answer submitted, not yet graded");
             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 723  sub getDescription { Line 719  sub getDescription {
         }          }
     }      }
     if ($status == $res->ANSWER_SUBMITTED) {      if ($status == $res->ANSWER_SUBMITTED) {
         if ($res->src() eq '/res/gci/gci/internal/submission.problem') {          return &mt('Answer submitted');
             return &mt('Question(s) submitted for review');  
         } else {  
             return &mt('Answer submitted');  
         }  
     }      }
 }  }
   
Line 1496  END Line 1488  END
         
     if ($args->{'caller'} eq 'navmapsdisplay') {      if ($args->{'caller'} eq 'navmapsdisplay') {
         $result .= '<table><tr><td>'.          $result .= '<table><tr><td>'.
                    &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td><td>&nbsp;</td>';                     &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td>';
    if ($env{'environment.remotenavmap'} ne 'on') {
       $result .= '<td>&nbsp;</td>'; 
           } else {
       $result .= '</tr><tr>'; 
           }
  $result.="<td class=\"LC_middle\">".mt('Tools:')."</td>";   $result.="<td class=\"LC_middle\">".mt('Tools:')."</td>";
  $result.=&show_linkitems_toolbar($args->{'linkitems'});   $result.=&show_linkitems_toolbar($args->{'linkitems'});
         if ($args->{'sort_html'}) {          if ($args->{'sort_html'}) {
Line 1504  END Line 1501  END
  $result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.   $result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
     '<td align="right">'.$args->{'sort_html'}.'</td></tr>';      '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
     } else {      } else {
  $result.='</tr><tr><td align="left" colspan="4"><br />'.   $result.='</tr><tr><td align="left"><br />'.
     $args->{'sort_html'}.'</td></tr>';      $args->{'sort_html'}.'</td></tr>';
     }      }
  }   }
Line 1887  sub show_linkitems_toolbar { Line 1884  sub show_linkitems_toolbar {
     my $result .='       my $result .=' 
               <td align="left">                <td align="left">
                        <span class="LC_nobreak">'."\n<ul id=\"LC_toolbar\">";                         <span class="LC_nobreak">'."\n<ul id=\"LC_toolbar\">";
     foreach my $link (@linkorder) {   foreach my $link (@linkorder) {
         my $link_id = "LC_content_toolbar_".$link;          my $link_id = "LC_content_toolbar_".$link;
  if (defined($linkitems->{$link})) {   if (defined($linkitems->{$link})) {
     if ($linkitems->{$link}{'text'} ne '') {      if ($linkitems->{$link}{'text'} ne '') {
Line 1907  sub show_linkitems_toolbar { Line 1904  sub show_linkitems_toolbar {
     }      }
  }   }
     }      }
     if ($env{'environment.remotenavmap'} eq 'on') {  
         if (&Apache::loncommon::needs_gci_custom()) {  
             if ($env{'request.course.id'} &&  
                 &Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {  
                 $result .= '<li><a target="loncapaclient" href="/adm/menu" id="LC_content_toolbar_management" class="LC_toolbarItem" title="'.&mt('Test Management').'" /></a></li>';  
             }  
         }  
     }  
     $result .= '</ul>';      $result .= '</ul>';
     $result .= ' </span></td>'."\n";      $result .= ' </span></td>'."\n";
   
Line 2388  resource object. Line 2377  resource object.
 Based on the symb of the resource, get a resource object for that  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.  resource. This is one of the proper ways to get a resource object.
   
 =item * B<getByMapPc>(map_pc):  =item * B<getMapByMapPc>(map_pc):
   
 Based on the map_pc of the resource, get a resource object for  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.  the given map. This is one of the proper ways to get a resource object.
Line 3543  sub navHash { Line 3532  sub navHash {
     my $self = shift;      my $self = shift;
     my $param = shift;      my $param = shift;
     my $id = 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  =pod
Line 3882  resource of the map. Line 3875  resource of the map.
   
 Returns a string with the type of the map in it.  Returns a string with the type of the map in it.
   
 =item *B<map_hierarchy>:  
   
 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  =back
   
 =cut  =cut
Line 3918  sub map_type { Line 3905  sub map_type {
     my $pc = $self->map_pc();      my $pc = $self->map_pc();
     return $self->navHash("map_type_$pc", 0);      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  # Property queries
Removed from v.1.440.2.3  
changed lines
  Added in v.1.441

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>