[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm

[raeburn]

raeburn		Mon Apr 10 05:37:48 2017 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonmenu.pm 
  Log:
  - For 2.11
    - Backport 1.470, 1.389 (part, not included in 1.369.2.26 backport).
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.70 loncom/interface/lonmenu.pm:1.369.2.71
--- loncom/interface/lonmenu.pm:1.369.2.70	Tue Mar 14 21:14:21 2017
+++ loncom/interface/lonmenu.pm	Mon Apr 10 05:37:47 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.70 2017/03/14 21:14:21 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.71 2017/04/10 05:37:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1503,7 +1503,11 @@
         if (($perms{'mdc'}) &&
             (($resurl =~ m{^/?public/$cdom/$cnum/syllabus}) ||
             ($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}))) {
-            $cfile = $resurl;
+            if ($resurl =~ m{^/}) {
+                $cfile = $resurl;
+            } else {
+                $cfile = "/$resurl";
+            }
             $home = &Apache::lonnet::homeserver($cnum,$cdom);
             if ($env{'form.forceedit'}) {
                 $forceview = 1;
@@ -2156,15 +2160,6 @@
 
 $dc_popup_cid
 
-function go(url) {
-   if (url!='' && url!= null) {
-       currentURL = null;
-       currentSymb= null;
-       var lcHostname = setLCHost();
-       window.location.href=lcHostname+url;
-   }
-}
-
 $jumptores
 
 function gopost(url,postdata) {