version 1.443, 2010/01/26 11:33:48
|
version 1.444.2.1, 2010/05/18 20:30:08
|
Line 700 sub getDescription {
|
Line 700 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->is_anonsurvey($part) || $res->is_survey($part)) { |
|
return &mt("Survey submission recorded"); |
|
} 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 1437 sub render {
|
Line 1441 sub render {
|
if ($printCloseAll && !$args->{'resource_no_folder_link'}) { |
if ($printCloseAll && !$args->{'resource_no_folder_link'}) { |
my ($link,$text); |
my ($link,$text); |
if ($condition) { |
if ($condition) { |
$link='"navmaps?condition=0&filter=&'.$queryString. |
$link='navmaps?condition=0&filter=&'.$queryString. |
'&here='.&escape($here).'"'; |
'&here='.&escape($here); |
$text='Close all folders'; |
$text='Close all folders'; |
} else { |
} else { |
$link='"navmaps?condition=1&filter=&'.$queryString. |
$link='navmaps?condition=1&filter=&'.$queryString. |
'&here='.&escape($here).'"'; |
'&here='.&escape($here); |
$text='Open all folders'; |
$text='Open all folders'; |
} |
} |
|
if ($env{'form.register'}) { |
|
$link .= '&register='.$env{'form.register'}; |
|
} |
if ($args->{'caller'} eq 'navmapsdisplay') { |
if ($args->{'caller'} eq 'navmapsdisplay') { |
&add_linkitem($args->{'linkitems'},'changefolder', |
&add_linkitem($args->{'linkitems'},'changefolder', |
'location.href='.$link,$text); |
"location.href='$link'",$text); |
} else { |
} else { |
$result.='<a href='.$link.'>'.&mt($text).'</a>'; |
$result.= '<a href="'.$link.'">'.&mt($text).'</a>'; |
} |
} |
$result .= "\n"; |
$result .= "\n"; |
} |
} |
Line 1465 sub render {
|
Line 1472 sub render {
|
<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" /> |
<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" /> |
<input type="hidden" name="navtime" value="$time" /> |
<input type="hidden" name="navtime" value="$time" /> |
END |
END |
|
if ($env{'form.register'}) { |
|
$result .= '<input type="hidden" name="register" value="'.$env{'form.register'}.'" />'; |
|
} |
if ($args->{'sort'} eq 'discussion') { |
if ($args->{'sort'} eq 'discussion') { |
my $totdisc = 0; |
my $totdisc = 0; |
my $haveDisc = ''; |
my $haveDisc = ''; |
Line 1486 END
|
Line 1496 END
|
$result.='</form>'; |
$result.='</form>'; |
} |
} |
|
|
|
|
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>'; |
Line 1495 END
|
Line 1504 END
|
} else { |
} else { |
$result .= '</tr><tr>'; |
$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'}) { |
if ($env{'environment.remotenavmap'} ne 'on') { |
if ($env{'environment.remotenavmap'} ne 'on') { |
Line 1843 sub add_linkitem {
|
Line 1852 sub add_linkitem {
|
$$linkitems{$name}{'text'}=&mt($text); |
$$linkitems{$name}{'text'}=&mt($text); |
} |
} |
|
|
sub show_linkitems { |
|
my ($linkitems)=@_; |
|
my @linkorder = ("blank","launchnav","closenav","firsthomework", |
|
"everything","uncompleted","changefolder","clearbubbles"); |
|
|
|
my $result .= (<<ENDBLOCK); |
|
<td align="left"> |
|
<script type="text/javascript"> |
|
function changeNavDisplay () { |
|
var navchoice = document.linkitems.toplink[document.linkitems.toplink.selectedIndex].value; |
|
ENDBLOCK |
|
foreach my $link (@linkorder) { |
|
$result.= "if (navchoice == '$link') {". |
|
$linkitems->{$link}{'cmd'}."}\n"; |
|
} |
|
$result.='} |
|
</script> |
|
<form name="linkitems" method="post"> |
|
<span class="LC_nobreak"><select name="toplink">'."\n"; |
|
foreach my $link (@linkorder) { |
|
if (defined($linkitems->{$link})) { |
|
if ($linkitems->{$link}{'text'} ne '') { |
|
$result .= ' <option value="'.$link.'">'. |
|
$linkitems->{$link}{'text'}."</option>\n"; |
|
} |
|
} |
|
} |
|
$result .= '</select> <input type="button" name="chgnav" |
|
value="Go" onClick="javascript:changeNavDisplay()" /> |
|
</span></form></td>'."\n"; |
|
|
|
return $result; |
|
} |
|
|
|
sub show_linkitems_toolbar { |
sub show_linkitems_toolbar { |
my ($linkitems,$condition)=@_; |
my ($linkitems,$condition)=@_; |
my @linkorder = ("blank","launchnav","closenav","firsthomework", |
my @linkorder = ("launchnav","closenav","firsthomework", |
"everything","uncompleted","changefolder","clearbubbles"); |
"everything","uncompleted","changefolder","clearbubbles"); |
|
my $result .='<td align="left">'."\n". |
my $result .=' |
'<span class="LC_nobreak">'."\n". |
<td align="left"> |
'<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 '') { |
$linkitems->{$link}{'cmd'}=~s/"/'/g; |
$linkitems->{$link}{'cmd'}=~s/"/'/g; |
if ($linkitems->{$link}{'cmd'}) { |
if($linkitems->{$link}{'cmd'}){ |
if ($link eq 'changefolder') { |
if($link eq 'changefolder'){ |
if ($condition) { |
if($condition){$link_id='LC_content_toolbar_changefolder_toggled'} |
$link_id='LC_content_toolbar_changefolder_toggled'; |
else{$link_id='LC_content_toolbar_changefolder'} |
} else { |
} |
$link_id='LC_content_toolbar_changefolder'; |
$result .= ' <li><a href="#"'. |
} |
' onClick="'.$linkitems->{$link}{'cmd'}.'"'. |
} |
' id="'.$link_id.'"'. |
$result .= '<li><a href="#" '. |
' class="LC_toolbarItem"'. |
'onclick="'.$linkitems->{$link}{'cmd'}.'" '. |
' title="'.$linkitems->{$link}{'text'}.'"></a></li>'."\n"; |
'id="'.$link_id.'" '. |
} |
'class="LC_toolbarItem" '. |
|
'title="'.$linkitems->{$link}{'text'}.'">'. |
} |
'</a></li>'."\n"; |
} |
} |
|
} |
|
} |
} |
} |
$result .= '</ul>'; |
$result .= '</ul>'. |
$result .= ' </span></td>'."\n"; |
'</span></td>'."\n"; |
|
|
return $result; |
return $result; |
} |
} |
|
|
Line 3844 sub is_survey {
|
Line 3820 sub is_survey {
|
my $self = shift(); |
my $self = shift(); |
my $part = shift(); |
my $part = shift(); |
my $type = $self->parmval('type',$part); |
my $type = $self->parmval('type',$part); |
if ($type eq 'survey') { |
if (($type eq 'survey') || ($type eq 'surveycred')) { |
return 1; |
return 1; |
} |
} |
if ($self->src() =~ /\.(survey)$/) { |
if ($self->src() =~ /\.(survey)$/) { |
return 1; |
return 1; |
} |
} |
return 0; |
return 0; |
|
} |
|
sub is_anonsurvey { |
|
my $self = shift(); |
|
my $part = shift(); |
|
my $type = $self->parmval('type',$part); |
|
if (($type eq 'anonsurvey') || ($type eq 'anonsurveycred')) { |
|
return 1; |
|
} |
|
return 0; |
} |
} |
sub is_task { |
sub is_task { |
my $self=shift; |
my $self=shift; |