--- loncom/interface/lonnavdisplay.pm 2018/04/14 02:29:44 1.36
+++ loncom/interface/lonnavdisplay.pm 2022/06/11 04:32:23 1.39
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Display Handler
#
-# $Id: lonnavdisplay.pm,v 1.36 2018/04/14 02:29:44 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.39 2022/06/11 04:32:23 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -66,7 +66,7 @@ sub real_handler {
# ------------------------------------------------------------ Get query string
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort',
'showOnlyHomework',
- 'postsymb','register']);
+ 'postsymb']);
# Check if course needs to be re-initialized
my $loncaparev = $r->dir_config('lonVersion');
my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
@@ -88,7 +88,7 @@ sub real_handler {
my $preamble = '
'.
'
'.
&mt('Your course session is being updated because of recent changes by course personnel.').
- ' '.&mt('Please be patient.').'
'.
+ ' '.&mt('Please be patient').'.
'.
'';
$closure = <
@@ -101,7 +101,7 @@ ENDCLOSE
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
$r->rflush();
my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum",\%prog_state,$r);
- &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished'));
+ &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!'));
if ($ferr) {
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->print($closure.&Apache::loncommon::end_page());
@@ -257,10 +257,7 @@ ENDCLOSE
."");
}
} else {
- my $link = 'navmaps?jumpToFirstHomework';
- if ($env{'form.register'}) {
- $link .= '®ister='.$env{'form.register'};
- }
+ my $link = '/adm/navmaps?jumpToFirstHomework';
unless ($notools) {
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
'location.href="'.$link.'"',
@@ -280,10 +277,7 @@ ENDCLOSE
$filterFunc = sub { my $res = shift;
return $res->completable() || $res->is_map();
};
- my $link = 'navmaps?sort='.$env{'form.sort'};
- if ($env{'form.register'}) {
- $link .= '®ister='.$env{'form.register'};
- }
+ my $link = '/adm/navmaps?sort='.$env{'form.sort'};
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',
'location.href="'.$link.'"',
'Show everything');
@@ -292,10 +286,7 @@ ENDCLOSE
$env{'form.condition'} = 1;
$resource_no_folder_link = 1;
} else {
- my $link = 'navmaps?sort='.$env{'form.sort'}.'&showOnlyHomework=1';
- if ($env{'form.register'}) {
- $link .= '®ister='.$env{'form.register'};
- }
+ my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&showOnlyHomework=1';
unless ($notools) {
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
'location.href="'.$link.'"',
@@ -317,7 +308,6 @@ ENDCLOSE
-
');
}
@@ -360,18 +350,12 @@ sub startpage {
# Header
my $course_type = &Apache::loncommon::course_type();
my $title = $course_type . ' Contents';
- my ($start_page,$args);
- if ($env{'form.register'}) {
- $args = {'force_register' => $env{'form.register'}};
- $start_page = &Apache::loncommon::start_page($title,undef,$args);
- } else {
- my $brcrum = [{href => '/adm/navmaps',
- text => &mt($course_type . ' Contents'),
- no_mt => 1},
- ];
- $args = {'bread_crumbs' => $brcrum};
- $start_page = &Apache::loncommon::start_page($title,undef,$args);
- }
+ my $brcrum = [{href => '/adm/navmaps',
+ text => &mt($course_type . ' Contents'),
+ no_mt => 1},
+ ];
+ my $args = {'bread_crumbs' => $brcrum};
+ my $start_page = &Apache::loncommon::start_page($title,undef,$args);
$r->print($start_page.
'