[LON-CAPA-cvs] cvs: loncom(version_2_11_donebutton) /interface lonmenu.pm
raeburn
raeburn at source.lon-capa.org
Thu May 28 08:37:15 EDT 2015
raeburn Thu May 28 12:37:15 2015 EDT
Modified files: (Branch: version_2_11_donebutton)
/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.431.2.3 loncom/interface/lonmenu.pm:1.431.2.4
--- loncom/interface/lonmenu.pm:1.431.2.3 Tue May 26 13:25:43 2015
+++ loncom/interface/lonmenu.pm Thu May 28 12:37:14 2015
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.431.2.3 2015/05/26 13:25:43 raeburn Exp $
+# $Id: lonmenu.pm,v 1.431.2.4 2015/05/28 12:37:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -776,6 +776,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);
@@ -927,9 +930,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');
}
More information about the LON-CAPA-cvs
mailing list