--- loncom/interface/lonnavdisplay.pm	2010/12/05 21:59:28	1.13.6.4
+++ loncom/interface/lonnavdisplay.pm	2010/03/10 21:25:50	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavdisplay.pm,v 1.13.6.4 2010/12/05 21:59:28 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.14 2010/03/10 21:25:50 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,23 +72,15 @@ sub real_handler {
     if ($ENV{QUERY_STRING} eq 'collapseExternal') {
 	&Apache::lonnet::put('environment',{'remotenavmap' => 'off'});
 	&Apache::lonnet::appenv({'environment.remotenavmap' => 'off'});
-	my $menu=&Apache::lonmenu::reopenmenu();
+	my $menu='';
 	my $navstatus=&Apache::lonmenu::get_nav_status();
-	if ($menu) {
-	    $menu=(<<MENU)
-             swmenu=$menu
-             swmenu.clearTimeout(swmenu.menucltim);
-	     $navstatus
-MENU
-        } else {
-	    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
-	    my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';
-	    $menu=(<<MENU)
-             swmenu=$mainwindow
-	     $navstatus
+    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
+    my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';
+    $menu=(<<MENU);
+         swmenu=$mainwindow
+     $navstatus
 MENU
-	}
-        $r->send_http_header;
+    $r->send_http_header;
 	my $js =<<"ENDSUBM";
 	  <script type="text/javascript">
  	    function submitthis() {
@@ -111,7 +103,7 @@ ENDSUBM
     if ($ENV{QUERY_STRING} =~ /^launchExternal/) {
 	&Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
 	&Apache::lonnet::appenv({'environment.remotenavmap' => 'on'});
- 	my $menu=&Apache::lonmenu::reopenmenu();
+ 	my $menu='';
 	my $navstatus=&Apache::lonmenu::get_nav_status();
 	if ($menu) {
 	    $r->print(<<MENU);
@@ -139,7 +131,7 @@ MENU
     $r->send_http_header;
 
 # ------------------------------------------------------------ Get query string
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort','showOnlyHomework','postsymb','register']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
     
 # ----------------------------------------------------- Force menu registration
     my $body_only='';
@@ -155,35 +147,20 @@ MENU
 
     # Header
     my $course_type = &Apache::loncommon::course_type();
-    my ($title,$breadcrumb_text,$start_page,$args);
-    $title = 'Contents';
-    $breadcrumb_text = &mt('Contents');
-    if ($env{'form.register'}) {
-        $args = {'force_register' => $env{'form.register'}};
-        my $brcrum = [{href    => '/adm/navmaps',
-                       text    => $breadcrumb_text,
-                       no_mt   => 1,},
-                     ];
-        $args = {'bread_crumbs' => $brcrum,
-                 'only_body'    => $body_only};
-        $start_page = &Apache::loncommon::start_page($title,$js,$args);
+    my ($title,$breadcrumb_text);
+    if ($course_type eq 'Community') {
+        $title = 'Community Contents';
+        $breadcrumb_text = &mt('Community Contents');
     } else {
-        my $nomenu = 0;
-        if ((&Apache::loncommon::needs_gci_custom()) || 
-            ($env{'user.domain'} =~ /^\w+citest$/ && $env{'request.course.id'})) {
-            $nomenu = 1;
-        }
-        my $brcrum = [{href    => '/adm/navmaps',
-                       text    => $breadcrumb_text,
-                       no_mt   => 1,
-                       _nomenu => $nomenu,},
-                     ];
-        $args = {'bread_crumbs' => $brcrum,
-                 'only_body'    => $body_only};
-        $start_page = &Apache::loncommon::start_page($title,$js,$args);
+        $title = 'Course Contents';
+        $breadcrumb_text = &mt('Course Contents');
     }
-    $r->print($start_page.
-              '<script type="text/javascript">window.focus();</script>');
+    $r->print(&Apache::loncommon::start_page($title,
+                         $js,
+                         {'only_body'       => $body_only,
+                          'force_register'  => $env{'form.register'},
+                          'bread_crumbs'    => [{text => $breadcrumb_text }],}));
+    $r->print('<script type="text/javascript">window.focus();</script>');
      
     $r->rflush();
 
@@ -283,12 +260,8 @@ MENU
                      ."</span>");
         }
     } else {
-        my $link = 'navmaps?jumpToFirstHomework';
-        if ($env{'form.register'}) {
-            $link .= '&amp;register='.$env{'form.register'};
-        }
 	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
-					  'location.href="'.$link.'"',
+					  'location.href="navmaps?jumpToFirstHomework"',
 					  "Show my first due problem");
     }
 
@@ -304,41 +277,33 @@ MENU
         $filterFunc = sub { my $res = shift; 
                             return $res->completable() || $res->is_map();
                         };
-        my $link = 'navmaps?sort='.$env{'form.sort'};
-        if ($env{'form.register'}) {
-            $link .= '&amp;register='.$env{'form.register'};
-        }
 	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',
-					  'location.href="'.$link.'"',
+					  'location.href="navmaps?sort='.$env{'form.sort'}.'"',
 					  "Show everything");
         $r->print("<span class=\"LC_info\">".&mt("Uncompleted Problems")."</span>");
         $env{'form.filter'} = '';
         $env{'form.condition'} = 1;
 	$resource_no_folder_link = 1;
     } else {
-        my $link = 'navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';
-        if ($env{'form.register'}) {
-            $link .= '&amp;register='.$env{'form.register'};
-        }
 	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
-					  'location.href="'.$link.'"',
+					  'location.href="navmaps?sort='.$env{'form.sort'}.
+					  '&showOnlyHomework=1"',
 					  "Show only uncompleted problems");
     }
 
     my %selected=($env{'form.sort'} => ' selected="selected"');
-    my $sort_html=('<form name="sortForm" action="">
-                 <span class="LC_nobreak">
-                    <input type="hidden" name="showOnlyHomework" value="'.$env{'form.showOnlyHomework'}.'" />
-                    '.&mt('Sort by:').'
-                    <select name="sort" onchange="document.sortForm.submit()">
-                       <option value="default"'.$selected{'default'}.'>'.&mt('Default').'</option>
-                       <option value="title"'.$selected{'title'}.'>'.&mt('Title').'</option>
-                       <option value="duedate"'.$selected{'duedate'}.'>'.&mt('Duedate').'</option>
-                       <option value="discussion"'.$selected{'discussion'}.'>'.&mt('Has New Discussion').'</option>
+    my $sort_html=("<form name=\"sortForm\">
+                 <span class=\"LC_nobreak\">
+                    <input type=\"hidden\" name=\"showOnlyHomework\" value=\"".$env{'form.showOnlyHomework'}."\" />
+                    ".&mt('Sort by:')."
+                    <select name=\"sort\" onChange=\"document.sortForm.submit()\">
+                       <option value=\"default\"$selected{'default'}>".&mt('Default')."</option>
+                       <option value=\"title\"$selected{'title'}  >".&mt('Title')."</option>
+                       <option value=\"duedate\"$selected{'duedate'}>".&mt('Duedate')."</option>
+                       <option value=\"discussion\"$selected{'discussion'}>".&mt('Has New Discussion')."</option>
                     </select>
-                    <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
                  </span>
-               </form>');
+               </form>");
     # renderer call
     my $renderArgs = { 'cols' => [0,1,2,3],
 		       'sort' => $env{'form.sort'},