--- loncom/interface/lonnavdisplay.pm	2008/03/12 02:45:07	1.3
+++ 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.3 2008/03/12 02:45:07 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
+    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
+    my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';
+    $menu=(<<MENU);
+         swmenu=$mainwindow
+     $navstatus
 MENU
-        } else {
-	    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);
@@ -133,6 +125,7 @@ MENU
     if (!defined($navmap)) {
         my $requrl = $r->uri;
         $env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
+        $env{'user.reinit'} = 1;
         return HTTP_NOT_ACCEPTABLE;
     }
     $r->send_http_header;
@@ -154,12 +147,19 @@ MENU
 
     # Header
     my $course_type = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page('Navigate '.$course_type.
-					     ' Contents',
-					     $js,
-					     {'only_body'       => $body_only,
-					      'force_register'  =>
-						  $env{'form.register'},}));
+    my ($title,$breadcrumb_text);
+    if ($course_type eq 'Community') {
+        $title = 'Community Contents';
+        $breadcrumb_text = &mt('Community Contents');
+    } else {
+        $title = 'Course Contents';
+        $breadcrumb_text = &mt('Course Contents');
+    }
+    $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();
@@ -255,7 +255,9 @@ MENU
 
         # If we found no problems, print a note to that effect.
         if (!$foundDoableProblem) {
-            $r->print("<font size='+2'>All homework assignments have been completed.</font><br /><br />");
+            $r->print("<span class=\"LC_info\">"
+                     .&mt("All homework assignments have been completed.")
+                     ."</span>");
         }
     } else {
 	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
@@ -278,7 +280,7 @@ MENU
 	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',
 					  'location.href="navmaps?sort='.$env{'form.sort'}.'"',
 					  "Show everything");
-        $r->print("<p><font size='+2'>".&mt("Uncompleted Problems")."</font></p>");
+        $r->print("<span class=\"LC_info\">".&mt("Uncompleted Problems")."</span>");
         $env{'form.filter'} = '';
         $env{'form.condition'} = 1;
 	$resource_no_folder_link = 1;
@@ -289,18 +291,18 @@ MENU
 					  "Show only uncompleted problems");
     }
 
-    my %selected=($env{'form.sort'} => 'selected=on');
-    my $sort_html=("<form>
-                 <nobr>
+    my %selected=($env{'form.sort'} => ' selected="selected"');
+    my $sort_html=("<form name=\"sortForm\">
+                 <span class=\"LC_nobreak\">
                     <input type=\"hidden\" name=\"showOnlyHomework\" value=\"".$env{'form.showOnlyHomework'}."\" />
-                    <input type=\"submit\" value=\"".&mt('Sort by:')."\" />
-                    <select name=\"sort\">
-                       <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>
+                    ".&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>
-                 </nobr>
+                 </span>
                </form>");
     # renderer call
     my $renderArgs = { 'cols' => [0,1,2,3],
@@ -321,9 +323,9 @@ MENU
     # user knows there was no error.
     if ($renderArgs->{'counter'} == 0) {
         if ($showOnlyHomework) {
-            $r->print("<p><font size='+1'>".&mt("All homework is currently completed").".</font></p>");
+            $r->print("<p><span class=\"LC_info\">".&mt("All homework is currently completed.")."</span></p>");
         } else { # both jumpToFirstHomework and normal use the same: course must be empty
-            $r->print("<p><font size='+1'>This course is empty.</font></p>");
+            $r->print("<p><span class=\"LC_info\">".&mt("This course is empty.")."</span></p>");
         }
     }
     #my $td=&tv_interval($t0);