[LON-CAPA-cvs] cvs: loncom /interface lonnavmaps.pm

[raeburn]

raeburn		Sun Aug 29 11:40:15 2004 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
  Log:
  Help icons and select boxes in one row when in main window to preserve screen real estate.  
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.282 loncom/interface/lonnavmaps.pm:1.283
--- loncom/interface/lonnavmaps.pm:1.282	Sun Aug 29 00:09:27 2004
+++ loncom/interface/lonnavmaps.pm	Sun Aug 29 11:40:14 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.282 2004/08/29 04:09:27 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.283 2004/08/29 15:40:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -262,13 +262,13 @@
               &Apache::loncommon::bodytag('Navigate Course Contents','',
 					  $addentries,$body_only,'',
 					  $ENV{'form.register'}));
-    $r->print('<script>window.focus();</script>'.
-	      &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
+    $r->print('<script>window.focus();</script>');
      
     $r->rflush();
 
     # Check that it's defined
     if (!($navmap->courseMapDefined())) {
+	$r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
         $r->print('<font size="+2" color="red">Coursemap undefined.</font>' .
                   '</body></html>');
         return OK;
@@ -1580,6 +1580,13 @@
     }
 
     if ($args->{'caller'} eq 'navmapsdisplay') {
+        $result .= '<table><tr><td>'.
+                   &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT').'</td>';
+	if ($ENV{'environment.remotenavmap'} ne 'on') {
+	    $result .= '<td>&nbsp;</td>'; 
+        } else {
+	    $result .= '</tr><tr>'; 
+        }
 	$result.=&show_linkitems($args->{'linkitems'});
         if ($args->{'sort_html'}) {
 	    if ($ENV{'environment.remotenavmap'} ne 'on') {
@@ -1916,6 +1923,7 @@
 		     "uncompleted","changefolder","clearbubbles");
     
     my $result .= (<<ENDBLOCK);
+              <td align="left">
 <script type="text/javascript">
     function changeNavDisplay () {
 	var navchoice = document.linkitems.toplink[document.linkitems.toplink.selectedIndex].value;
@@ -1926,7 +1934,6 @@
     }
     $result.='}
               </script>
-              <table><tr><td align="left">
                    <form name="linkitems" method="post">
                        <nobr><select name="toplink">'."\n";
     foreach my $link (@linkorder) {