--- loncom/interface/lonnavdisplay.pm	2008/03/12 02:45:07	1.3
+++ loncom/interface/lonnavdisplay.pm	2010/03/16 19:55:49	1.15
@@ -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.15 2010/03/16 19:55:49 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,63 +69,6 @@ sub real_handler {
     my %toplinkitems=();
     &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'blank','',
 				      "Select Action");
-    if ($ENV{QUERY_STRING} eq 'collapseExternal') {
-	&Apache::lonnet::put('environment',{'remotenavmap' => 'off'});
-	&Apache::lonnet::appenv({'environment.remotenavmap' => 'off'});
-	my $menu=&Apache::lonmenu::reopenmenu();
-	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
-MENU
-	}
-        $r->send_http_header;
-	my $js =<<"ENDSUBM";
-	  <script type="text/javascript">
- 	    function submitthis() {
-		    $menu
-		    self.close();
-	    }
-	
-  	  </script>
-ENDSUBM
-        $r->print(&Apache::loncommon::start_page(undef,$js,
-						 {'only_body' => 1,
-						  'bgcolor'   => '#FFFFFF',
-						  'add_entries' => 
-						      {'onload' =>
-							   "submitthis()"}}).
-		  &Apache::loncommon::end_page());
-
-        return OK;
-    }
-    if ($ENV{QUERY_STRING} =~ /^launchExternal/) {
-	&Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
-	&Apache::lonnet::appenv({'environment.remotenavmap' => 'on'});
- 	my $menu=&Apache::lonmenu::reopenmenu();
-	my $navstatus=&Apache::lonmenu::get_nav_status();
-	if ($menu) {
-	    $r->print(<<MENU);
-             <script type="text/javascript">
-             swmenu=$menu
-             swmenu.clearTimeout(swmenu.menucltim);
-	     $navstatus
-             </script>
-MENU
-        }
-   }
-    if ($ENV{QUERY_STRING} eq 'turningOffExternal') {
-	$env{'environment.remotenavmap'}='off';
-    }
 
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -133,6 +76,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;
@@ -141,25 +85,14 @@ MENU
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
     
 # ----------------------------------------------------- Force menu registration
-    my $body_only='';
-    my $js;
-    if ($env{'environment.remotenavmap'} eq 'on') {
-	$js='<script type="text/javascript">
-                function collapse() {
-                   this.document.location="/adm/navmaps?collapseExternal";
-                }
-             </script>';
-	$body_only=1;
-    }
-
     # 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 = $course_type . ' Contents';
+    my $breadcrumb_text = mt($course_type . ' Contents');
+    $r->print(&Apache::loncommon::start_page($title, '',
+                         { 'force_register'  => $env{'form.register'},
+                           'bread_crumbs'    => [{text => $breadcrumb_text }],}));
+#SD
     $r->print('<script type="text/javascript">window.focus();</script>');
      
     $r->rflush();
@@ -197,27 +130,6 @@ MENU
         }
     }
 
-    if ($ENV{QUERY_STRING} eq 'launchExternal') {
-	$r->print('
-          <form name="returnwin" action="/adm/flip?postdata=navlaunch%3a" 
-                method="post" target="loncapaclient">
-          </form>');
-	$r->print('
-          <script type="text/javascript">
-              this.document.returnwin.submit();
-          </script>');
-    }
-
-    if ($env{'environment.remotenavmap'} ne 'on') {
-	$r->print(&launch_win('link','yes',\%toplinkitems));
-    } 
-    if ($env{'environment.remotenavmap'} eq 'on') {
-	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'closenav',
-					  'collapse()',
-					  "Close navigation window");
-    } 
-
-
     # Check to see if the student is jumping to next open, do-able problem
     if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) {
         # Find the next homework problem that they can do.
@@ -255,7 +167,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 +192,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 +203,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 +235,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);
@@ -335,35 +249,6 @@ MENU
     return OK;
 }
 
-sub launch_win {
-    my ($mode,$script,$toplinkitems,$firsttime)=@_;
-    my $result;
-    if ($script ne 'no') {
-	$result.='<script type="text/javascript">';
-    }
-    if ($firsttime) {
-	$result.='function launch_navmapwin() {
-                 newWindow=open(\'/adm/navmaps?launchExternalRoles\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
-               }';
-    } else {
-	$result.='function launch_navmapwin() {
-                 newWindow=open(\'/adm/navmaps?launchExternal\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
-               }';
-    }
-    if ($mode eq 'now') {
-	$result.="\nlaunch_navmapwin();\n";
-    }
-    if ($script ne 'no') {
-	$result.='</script>';
-    }
-    if ($mode eq 'link') {
-	&Apache::lonnavmaps::add_linkitem($toplinkitems,'launchnav',
-					  'launch_navmapwin()',
-					  "Launch navigation window");
-    }
-    return $result;
-}
-
 1;
 __END__