[LON-CAPA-cvs] cvs: loncom(GCI_3) /interface lonhtmlcommon.pm

raeburn raeburn@source.lon-capa.org
Mon, 08 Nov 2010 23:27:58 -0000


raeburn		Mon Nov  8 23:27:58 2010 EDT

  Modified files:              (Branch: GCI_3)
    /loncom/interface	lonhtmlcommon.pm 
  Log:
  - Customization for GCI_3
    - Default first item in breadcrumbs is "menu" during Course Request process.
    - Support pop-up navigation window.
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.253.2.4 loncom/interface/lonhtmlcommon.pm:1.253.2.5
--- loncom/interface/lonhtmlcommon.pm:1.253.2.4	Mon Oct  4 19:43:30 2010
+++ loncom/interface/lonhtmlcommon.pm	Mon Nov  8 23:27:58 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.253.2.4 2010/10/04 19:43:30 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.253.2.5 2010/11/08 23:27:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1386,10 +1386,15 @@
                 my $tooltip = 'Go to main menu';
                 my $no_mt_descr = 0;
                 if ((exists($env{'request.course.id'})) &&
-                    ($env{'request.course.id'} ne '')) {
-
+                    ($env{'request.course.id'} ne '') && 
+                    !($env{'form.context'} eq 'requestcrs')) {
                     if ((&Apache::loncommon::needs_gci_custom()) || ($env{'user.domain'} eq 'gcitest')) {
-                        $href = '/adm/navmaps';
+                        if ($env{'environment.remotenavmap'} eq 'on') {
+                            # open link using javascript when remote navmap is activated
+                            $href = "javascript:gonav('/adm/navmaps');";
+                        } else {
+                            $href = '/adm/navmaps';
+                        }
                         $tooltip = 'Contents';
                     }
                     if ($env{'course.'.$env{'request.course.id'}.'.description'} ne '') {