--- loncom/interface/lonnavdisplay.pm	2009/02/26 16:17:30	1.6
+++ loncom/interface/lonnavdisplay.pm	2010/03/29 14:50:46	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavdisplay.pm,v 1.6 2009/02/26 16:17:30 schafran Exp $
+# $Id: lonnavdisplay.pm,v 1.17 2010/03/29 14:50:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,65 +67,6 @@ sub real_handler {
     &Apache::loncommon::no_cache($r);
 
     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();
@@ -139,30 +80,26 @@ MENU
     $r->send_http_header;
 
 # ------------------------------------------------------------ Get query string
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort','showOnlyHomework','postsymb','register']);
     
 # ----------------------------------------------------- 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.
-					     'Course Contents',
-					     $js,
-					     {'only_body'       => $body_only,
-					      'force_register'  =>
-						  $env{'form.register'},}));
-    $r->print('<script type="text/javascript">window.focus();</script>');
-     
+    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);
+    }
+    $r->print($start_page.
+              '<script type="text/javascript">window.focus();</script>');
     $r->rflush();
 
     # Check that it's defined
@@ -198,27 +135,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.
@@ -256,13 +172,17 @@ MENU
 
         # If we found no problems, print a note to that effect.
         if (!$foundDoableProblem) {
-            $r->print("<font size='+2'>"
+            $r->print("<span class=\"LC_info\">"
                      .&mt("All homework assignments have been completed.")
-                     ."</font><br /><br />");
+                     ."</span>");
         }
     } else {
+        my $link = 'navmaps?jumpToFirstHomework';
+        if ($env{'form.register'}) {
+            $link .= '&amp;register='.$env{'form.register'}; 
+        }
 	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
-					  'location.href="navmaps?jumpToFirstHomework"',
+					  'location.href="'.$link.'"',
 					  "Show my first due problem");
     }
 
@@ -278,33 +198,41 @@ 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="navmaps?sort='.$env{'form.sort'}.'"',
-					  "Show everything");
-        $r->print("<p><font size='+2'>".&mt("Uncompleted Problems")."</font></p>");
+					  'location.href="'.$link.'"',
+					  '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="navmaps?sort='.$env{'form.sort'}.
-					  '&showOnlyHomework=1"',
-					  "Show only uncompleted problems");
+					  'location.href="'.$link.'"',
+					  'Show only uncompleted problems');
     }
 
-    my %selected=($env{'form.sort'} => 'selected=on');
-    my $sort_html=("<form>
-                 <nobr>
-                    <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>
+    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'}.'" />
+                    '.&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>
-               </form>");
+                    <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
+                 </span>
+               </form>');
     # renderer call
     my $renderArgs = { 'cols' => [0,1,2,3],
 		       'sort' => $env{'form.sort'},
@@ -324,9 +252,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'>".&mt("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);
@@ -338,35 +266,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__