--- loncom/interface/lonnavdisplay.pm 2020/05/25 16:12:12 1.22.4.9.2.1 +++ loncom/interface/lonnavdisplay.pm 2023/01/20 23:04:26 1.22.4.10.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Display Handler # -# $Id: lonnavdisplay.pm,v 1.22.4.9.2.1 2020/05/25 16:12:12 raeburn Exp $ +# $Id: lonnavdisplay.pm,v 1.22.4.10.2.2 2023/01/20 23:04:26 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -65,7 +65,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); @@ -87,7 +87,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 = < @@ -100,7 +100,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()); @@ -229,9 +229,6 @@ ENDCLOSE } } else { my $link = '/adm/navmaps?jumpToFirstHomework'; - if ($env{'form.register'}) { - $link .= '&register='.$env{'form.register'}; - } unless ($notools) { &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework', 'location.href="'.$link.'"', @@ -252,9 +249,6 @@ ENDCLOSE return $res->completable() || $res->is_map(); }; my $link = '/adm/navmaps?sort='.$env{'form.sort'}; - if ($env{'form.register'}) { - $link .= '&register='.$env{'form.register'}; - } &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything', 'location.href="'.$link.'"', 'Show everything'); @@ -264,9 +258,6 @@ ENDCLOSE $resource_no_folder_link = 1; } else { my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&showOnlyHomework=1'; - if ($env{'form.register'}) { - $link .= '&register='.$env{'form.register'}; - } unless ($notools) { &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted', 'location.href="'.$link.'"', @@ -288,7 +279,6 @@ ENDCLOSE - '); } @@ -331,18 +321,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. '