[LON-CAPA-cvs] cvs: loncom /interface lonhtmlcommon.pm lonmenu.pm

[raeburn]

raeburn		Thu May 28 02:53:30 2015 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm lonmenu.pm 
  Log:
  - Directory listing of top level of Authoring Space will include a help
    item on the right side of the breadcrumbs menu which links to WebDAV
    documentation if WebDAV access is enabled for the user.
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.363 loncom/interface/lonhtmlcommon.pm:1.364
--- loncom/interface/lonhtmlcommon.pm:1.363	Sun May 10 01:05:50 2015
+++ loncom/interface/lonhtmlcommon.pm	Thu May 28 02:53:29 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.363 2015/05/10 01:05:50 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.364 2015/05/28 02:53:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1851,7 +1851,7 @@
     
     sub breadcrumbs {
         my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt, 
-            $CourseBreadcrumbs) = @_;
+            $CourseBreadcrumbs,$topic_help,$topic_help_text) = @_;
         #
         $css_class ||= 'LC_breadcrumbs';
 
@@ -1958,6 +1958,10 @@
                                                          $component_help,
                                                          $faq,$bug);
         }
+        if ($topic_help && $topic_help_text) {
+           $icons .= ' '.&Apache::loncommon::help_open_topic($topic_help,&mt($topic_help_text),'',
+                                                             undef,600);
+        }
         #
 
 		
@@ -1970,7 +1974,7 @@
         }
 
 
-        if ($component) {
+        if (($component) || ($topic_help && $topic_help_text)) {
             $links = &htmltag('span', 
                              ( $no_mt ? $component : mt($component) ).
                              ( $icons ? $icons : '' ),
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.432 loncom/interface/lonmenu.pm:1.433
--- loncom/interface/lonmenu.pm:1.432	Thu Apr 16 10:13:25 2015
+++ loncom/interface/lonmenu.pm	Thu May 28 02:53:29 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.432 2015/04/16 10:13:25 droeschl Exp $
+# $Id: lonmenu.pm,v 1.433 2015/05/28 02:53:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -771,6 +771,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);
@@ -922,9 +925,16 @@
             &advtools_crumbs(@inlineremote);
         }
     }
-
+    my ($topic_help,$topic_help_text);
+    if ($is_const_dir == 2) {
+        if (&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');
 }