--- loncom/interface/lonnavdisplay.pm	2010/03/16 19:55:49	1.15
+++ loncom/interface/lonnavdisplay.pm	2010/12/07 01:15:39	1.19
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavdisplay.pm,v 1.15 2010/03/16 19:55:49 droeschl Exp $
+# $Id: lonnavdisplay.pm,v 1.19 2010/12/07 01:15:39 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::lonnavmaps();
 use Apache::lonhtmlcommon();
 use Apache::lonnet;
 use Apache::lonlocal;
+use Apache::londocs();
 use Time::HiRes qw( gettimeofday tv_interval );
 
 sub handler {
@@ -67,8 +68,6 @@ sub real_handler {
     &Apache::loncommon::no_cache($r);
 
     my %toplinkitems=();
-    &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'blank','',
-				      "Select Action");
 
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -82,19 +81,27 @@ sub real_handler {
     $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
     # Header
     my $course_type = &Apache::loncommon::course_type();
     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>');
-     
+    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>');
+    &Apache::londocs::startContentScreen($r,'navmaps');
     $r->rflush();
 
     # Check that it's defined
@@ -172,8 +179,12 @@ sub real_handler {
                      ."</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");
     }
 
@@ -189,33 +200,41 @@ sub real_handler {
         $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");
+					  '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="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>
+    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>
                     </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'},
@@ -242,7 +261,7 @@ sub real_handler {
     }
     #my $td=&tv_interval($t0);
     #$r->print("<br />$td");
-
+    &Apache::londocs::endContentScreen($r);
     $r->print(&Apache::loncommon::end_page());
     $r->rflush();