loncom/interface/lonnavmaps.pm - diff

Return to lonnavmaps.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonnavmaps.pm between versions 1.477 and 1.479

version 1.477, 2011/12/25 20:41:53	version 1.479, 2012/02/17 19:25:57
Line 1466 sub render {	Line 1466 sub render {
$link .= '&register='.$env{'form.register'};	$link .= '&register='.$env{'form.register'};
}	}
if ($args->{'caller'} eq 'navmapsdisplay') {	if ($args->{'caller'} eq 'navmapsdisplay') {
&add_linkitem($args->{'linkitems'},'changefolder',	unless ($args->{'notools'}) {
"location.href='$link'",$text);	&add_linkitem($args->{'linkitems'},'changefolder',
	"location.href='$link'",$text);
	}
} else {	} else {
$result.= '<a href="'.$link.'">'.&mt($text).'</a>';	$result.= '<a href="'.$link.'">'.&mt($text).'</a>';
}	}
Line 1475 sub render {	Line 1477 sub render {
}	}

# Check for any unread discussions in all resources.	# Check for any unread discussions in all resources.
if ($args->{'caller'} eq 'navmapsdisplay') {	if (($args->{'caller'} eq 'navmapsdisplay') && (!$args->{'notools'})) {
&add_linkitem($args->{'linkitems'},'clearbubbles',	&add_linkitem($args->{'linkitems'},'clearbubbles',
'document.clearbubbles.submit()',	'document.clearbubbles.submit()',
'Mark all posts read');	'Mark all posts read');
Line 1507 END	Line 1509 END
}	}
}	}
$result.='</form>';	$result.='</form>';
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {	}
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	if (($args->{'caller'} eq 'navmapsdisplay') &&
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	(&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
if ($env{'course.'.$env{'request.course.id'}.'.url'} eq	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
"uploaded/$cdom/$cnum/default.sequence") {	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
&add_linkitem($args->{'linkitems'},'edittoplevel',	if ($env{'course.'.$env{'request.course.id'}.'.url'} eq
"javascript:gocmd('/adm/coursedocs','editdocs');",	"uploaded/$cdom/$cnum/default.sequence") {
'Content Editor');	&add_linkitem($args->{'linkitems'},'edittoplevel',
}	"javascript:gocmd('/adm/coursedocs','editdocs');",
	'Content Editor');
}	}
}	}

Line 1859 sub add_linkitem {	Line 1862 sub add_linkitem {

sub show_linkitems_toolbar {	sub show_linkitems_toolbar {
my ($args,$condition) = @_;	my ($args,$condition) = @_;
my $result =	my $result;
'<table><tr><td>'.
&Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').
'</td>'.
'<td> </td>'.
'<td class="LC_middle">'.&mt('Tools:').'</td>';
if (ref($args) eq 'HASH') {	if (ref($args) eq 'HASH') {
if (ref($args->{'linkitems'}) eq 'HASH') {	if (ref($args->{'linkitems'}) eq 'HASH') {
	my $numlinks = scalar(keys(%{$args->{'linkitems'}}));
	if ($numlinks > 1) {
	$result = '<td>'.
	&Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',
	undef,'RAT').
	'</td>'.
	'<td> </td>'.
	'<td class="LC_middle">'.&mt('Tools:').'</td>';
	}
	$result .= '<td align="left">'."\n".
	'<span class="LC_nobreak">'."\n".
	'<ul id="LC_toolbar">';
my @linkorder = ('firsthomework','everything','uncompleted',	my @linkorder = ('firsthomework','everything','uncompleted',
'changefolder','clearbubbles','edittoplevel');	'changefolder','clearbubbles','edittoplevel');
$result .='<td align="left">'."\n".
'<span class="LC_nobreak">'."\n".
'<ul id="LC_toolbar">';
foreach my $link (@linkorder) {	foreach my $link (@linkorder) {
my $link_id = 'LC_content_toolbar_'.$link;
if (ref($args->{'linkitems'}{$link}) eq 'HASH') {	if (ref($args->{'linkitems'}{$link}) eq 'HASH') {
if ($args->{'linkitems'}{$link}{'text'} ne '') {	if ($args->{'linkitems'}{$link}{'text'} ne '') {
$args->{'linkitems'}{$link}{'cmd'}=~s/"/'/g;	$args->{'linkitems'}{$link}{'cmd'}=~s/"/'/g;
if ($args->{'linkitems'}{$link}{'cmd'}) {	if ($args->{'linkitems'}{$link}{'cmd'}) {
	my $link_id = 'LC_content_toolbar_'.$link;
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';
Line 1896 sub show_linkitems_toolbar {	Line 1903 sub show_linkitems_toolbar {
}	}
}	}
$result .= '</ul>'.	$result .= '</ul>'.
'</span></td>'."\n";	'</span></td>';
	if (($numlinks==1) && (exists($args->{'linkitems'}{'edittoplevel'}))) {
	$result .= '<td><a href="'.$args->{'linkitems'}{'edittoplevel'}{'cmd'}.'">'.
	&mt('Content Editor').'</a></td>';
	}
}	}
if ($args->{'sort_html'}) {	if ($args->{'sort_html'}) {
$result .= '<td> </td><td> </td><td> </td>'.	$result .= '<td> </td><td> </td><td> </td>'.
'<td align="right">'.$args->{'sort_html'}.'</td>';	'<td align="right">'.$args->{'sort_html'}.'</td>';
}	}
}	}
$result .= '</tr></table>';	if ($result) {
	$result = "<table><tr>$result</tr></table>";
	}
return $result;	return $result;
}	}

Line 3601 sub new {	Line 3614 sub new {
$self->{NAV_MAP}->{RESOURCE_CACHE}->{$self->{ID}} = $self;	$self->{NAV_MAP}->{RESOURCE_CACHE}->{$self->{ID}} = $self;
$self->{RESOURCE_ERROR} = 0;	$self->{RESOURCE_ERROR} = 0;

	$self->{DUEDATE_CACHE} = undef;

# A hash that can be used by two-pass algorithms to store data	# A hash that can be used by two-pass algorithms to store data
# about this resource in. Not used by the resource object	# about this resource in. Not used by the resource object
# directly.	# directly.
Line 4239 sub checkedin {	Line 4254 sub checkedin {

sub duedate {	sub duedate {
(my $self, my $part) = @_;	(my $self, my $part) = @_;
	if (defined ($self->{DUEDATE_CACHE}->{$part})) {
	return $self->{DUEDATE_CACHE}->{$part};
	}
my $date;	my $date;
my @interval=$self->parmval("interval", $part);	my @interval=$self->parmval("interval", $part);
my $due_date=$self->parmval("duedate", $part);	my $due_date=$self->parmval("duedate", $part);
Line 4255 sub duedate {	Line 4273 sub duedate {
} else {	} else {
$date = $due_date;	$date = $due_date;
}	}
	$self->{DUEDATE_CACHE}->{$part} = $date;
return $date;	return $date;
}	}
sub handgrade {	sub handgrade {

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

Removed from v.1.477
changed lines
	Added in v.1.479