--- loncom/interface/lonnavmaps.pm 2011/12/18 17:15:03 1.472
+++ loncom/interface/lonnavmaps.pm 2011/12/25 19:39:08 1.476
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.472 2011/12/18 17:15:03 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.476 2011/12/25 19:39:08 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
@@ -464,7 +464,7 @@ returns 4
=item add_linkitem()
-=item show_linkitems()
+=item show_linkitems_toolbar()
=back
@@ -542,9 +542,6 @@ my %colormap =
# is not yet done and due in less than 24 hours
my $hurryUpColor = "#FF0000";
-my $future_slots_checked = 0;
-my $future_slots = 0;
-
sub addToFilter {
my $hashIn = shift;
my $addition = shift;
@@ -635,10 +632,10 @@ sub getDescription {
return &mt('Reserved - next open [_1]',
timeToHumanString($slot_time,'start'));
} elsif ($slot_status == $res->RESERVABLE) {
- return &mt('Reservable ending [_1]',
+ return &mt('Reservable, reservations close [_1]',
timeToHumanString($slot_time,'end'));
} elsif ($slot_status == $res->RESERVABLE_LATER) {
- return &mt('Reservable starting [_1]',
+ return &mt('Reservable, reservations open [_1]',
timeToHumanString($slot_time,'start'));
} elsif ($slot_status == $res->NOT_IN_A_SLOT) {
return &mt('Reserve a time/place to work');
@@ -1506,19 +1503,20 @@ END
}
}
$result.='';
+ if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if ($env{'course.'.$env{'request.course.id'}.'.url'} eq
+ "uploaded/$cdom/$cnum/default.sequence") {
+ &add_linkitem($args->{'linkitems'},'edittoplevel',
+ "javascript:gocmd('/adm/coursedocs','direct');",
+ 'Content Editor');
+ }
+ }
}
if ($args->{'caller'} eq 'navmapsdisplay') {
- $result .= '
'.
- &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').' | ';
- $result .= ' | ';
- $result.=''.&mt('Tools:').' | ';
- $result.=&show_linkitems_toolbar($args->{'linkitems'});
- if ($args->{'sort_html'}) {
- $result.=' | | | '.
- ''.$args->{'sort_html'}.' |
';
- }
- $result .= '
';
+ $result .= &show_linkitems_toolbar($args,$condition);
} elsif ($args->{'sort_html'}) {
$result.=$args->{'sort_html'};
}
@@ -1856,37 +1854,52 @@ sub add_linkitem {
}
sub show_linkitems_toolbar {
- my ($linkitems,$condition)=@_;
- my @linkorder = ('firsthomework','everything','uncompleted',
- 'changefolder','clearbubbles');
- my $result .=''."\n".
- ''."\n".
- ' |