[prev in list] [next in list] [prev in thread] [next in thread]
List: lon-capa-cvs
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm
From: raeburn <raeburn () source ! lon-capa ! org>
Date: 2015-05-28 12:49:30
Message-ID: cvsraeburn1432817370 () cvsserver
[Download RAW message or body]
raeburn Thu May 28 12:49:30 2015 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface lonmenu.pm
Log:
- For 2.11
Backport 1.433, 1.434
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.54 loncom/interface/lonmenu.pm:1.369.2.55
--- loncom/interface/lonmenu.pm:1.369.2.54 Wed Jan 21 21:09:15 2015
+++ loncom/interface/lonmenu.pm Thu May 28 12:49:30 2015
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.369.2.54 2015/01/21 21:09:15 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.55 2015/05/28 12:49:30 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -813,6 +813,9 @@
my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn;
if ($currdir =~ m-/$-) {
$is_const_dir = 1;
+ if ($thisdisfn eq '') {
+ $is_const_dir = 2;
+ }
} else {
$currdir =~ s|[^/]+$||;
my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn);
@@ -979,8 +982,18 @@
&advtools_crumbs(@inlineremote);
}
}
+ my ($topic_help,$topic_help_text);
+ if ($is_const_dir == 2) {
+ if ((($ENV{'SERVER_PORT'} == 443) ||
+ \
($Apache::lonnet::protocol{$Apache::lonnet::perlvar{'lonHostID'}} eq 'https')) && + \
(&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},'webdav'))) \
{ + $topic_help = \
'Authoring_WebDAV,Authoring_WebDAV_Mac_10v6,Authoring_WebDAV_Mac_10v10,'. + \
'Authoring_WebDAV_Windows_v7,Authoring_WebDAV_Linux_Centos'; + \
$topic_help_text = 'About WebDAV access'; + }
+ }
return &Apache::lonhtmlcommon::scripttag('', 'start')
- . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
+ . \
&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text)
. &Apache::lonhtmlcommon::scripttag('', 'end');
} else {
_______________________________________________
LON-CAPA-cvs mailing list
LON-CAPA-cvs@mail.lon-capa.org
http://mail.lon-capa.org/mailman/listinfo/lon-capa-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic