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

[raeburn]

raeburn		Thu Dec 30 21:32:17 2010 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom/interface	lonnavmaps.pm 
  Log:
  - Support for pop-up Course Contents window (remotenavmap) retained in 2.10.
    - Additional row no longer needed in pop-up display because of replacement
      of dropdown list with icons. 
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.444.2.2 loncom/interface/lonnavmaps.pm:1.444.2.3
--- loncom/interface/lonnavmaps.pm:1.444.2.2	Sun Aug 15 00:03:25 2010
+++ loncom/interface/lonnavmaps.pm	Thu Dec 30 21:32:17 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.444.2.2 2010/08/15 00:03:25 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.444.2.3 2010/12/30 21:32:17 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1504,23 +1504,20 @@
 
     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.='<td class="LC_middle">'.&mt('Tools:').'</td>';
-	$result.=&show_linkitems_toolbar($args->{'linkitems'});
+                   &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td><td>&nbsp;</td>'.
+                   '<td class="LC_middle">'.&mt('Tools:').'</td>'.
+                   &show_linkitems_toolbar($args->{'linkitems'});
         if ($args->{'sort_html'}) {
 	    if ($env{'environment.remotenavmap'} ne 'on') {
-		$result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
-		    '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
-	    } else {
-		$result.='</tr><tr><td align="left"><br />'.
-		    $args->{'sort_html'}.'</td></tr>';
-	    }
-	}
+	        $result .= '<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
+                           '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
+            } else {
+	        $result .= '</tr><tr><td align="left" colspan="4"><br />'.
+                           $args->{'sort_html'}.'</td></tr>';
+            }
+        } else {
+            $result .= '</tr>';
+        }
         $result .= '</table>';
     } elsif ($args->{'sort_html'}) { 
         $result.=$args->{'sort_html'};