version 1.439, 2009/11/23 14:56:07
|
version 1.440.2.3, 2010/11/15 22:46:47
|
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) { |
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 719 sub getDescription {
|
Line 723 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 1488 END
|
Line 1496 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>'; |
&Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td><td> </td>'; |
if ($env{'environment.remotenavmap'} ne 'on') { |
|
$result .= '<td> </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 1501 END
|
Line 1504 END
|
$result.='<td> </td><td> </td><td> </td>'. |
$result.='<td> </td><td> </td><td> </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"><br />'. |
$result.='</tr><tr><td align="left" colspan="4"><br />'. |
$args->{'sort_html'}.'</td></tr>'; |
$args->{'sort_html'}.'</td></tr>'; |
} |
} |
} |
} |
Line 1528 END
|
Line 1531 END
|
( $res->NETWORK_FAILURE => 1, |
( $res->NETWORK_FAILURE => 1, |
$res->NOTHING_SET => 1, |
$res->NOTHING_SET => 1, |
$res->CORRECT => 1 ); |
$res->CORRECT => 1 ); |
my @backgroundColors = ("LC_trEven", "LC_trOdd"); |
|
|
|
# Shared variables |
# Shared variables |
$args->{'counter'} = 0; # counts the rows |
$args->{'counter'} = 0; # counts the rows |
Line 1763 END
|
Line 1765 END
|
# show them. |
# show them. |
foreach my $part (@parts) { |
foreach my $part (@parts) { |
$rownum ++; |
$rownum ++; |
my $backgroundColor = $backgroundColors[$rownum % scalar(@backgroundColors)]; |
|
|
|
$result .= &Apache::loncommon::start_data_table_row(); |
$result .= &Apache::loncommon::start_data_table_row(); |
|
|
Line 1886 sub show_linkitems_toolbar {
|
Line 1887 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 1906 sub show_linkitems_toolbar {
|
Line 1907 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 2379 resource object.
|
Line 2388 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<getMapByMapPc>(map_pc): |
=item * B<getByMapPc>(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 3873 resource of the map.
|
Line 3882 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 3903 sub map_type {
|
Line 3918 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 |