--- loncom/interface/lonmenu.pm	2015/04/14 21:35:52	1.431.2.2
+++ loncom/interface/lonmenu.pm	2016/03/15 14:25:26	1.440
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.431.2.2 2015/04/14 21:35:52 musolffc Exp $
+# $Id: lonmenu.pm,v 1.440 2016/03/15 14:25:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -288,6 +288,11 @@ sub primary_menu {
                     push(@primsub,$item);
                 }
                 if (@primsub > 0) {
+                    if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) {
+                        $title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+                    } else {
+                        $title = &mt($title);
+                    }
                     $menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1);
                 } elsif ($link) {
                     $menu{$position} .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';
@@ -366,7 +371,8 @@ sub secondary_menu {
     my $canmgr        = &Apache::lonnet::allowed('mgr', $crs_sec); 
     my $author        = &getauthor();
 
-    my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv);
+    my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools);
+    $grouptools = 0;
     if ($env{'request.course.id'}) {
         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -392,6 +398,17 @@ sub secondary_menu {
                 $showresv = 1;
             }
         }
+        my %groups = &Apache::lonnet::get_active_groups(
+                     $env{'user.domain'}, $env{'user.name'},$cdom,$cnum);
+        if (%groups) {
+            foreach my $group (keys(%groups)) {
+                my @privs = split(/:/,$env{"user.priv.$env{'request.role'}./$cdom/$cnum/$group"});
+                shift(@privs);
+                if (@privs) {
+                    $grouptools ++;
+                }
+            }
+        }
     }
 
     my ($canmodifycoauthor); 
@@ -402,12 +419,6 @@ sub secondary_menu {
             $canmodifycoauthor = 1;
         }
     }
-
-    my %groups = &Apache::lonnet::get_active_groups(
-                     $env{'user.domain'}, $env{'user.name'},
-                     $env{'course.' . $env{'request.course.id'} . '.domain'},
-                     $env{'course.' . $env{'request.course.id'} . '.num'});
-
     my ($roleswitcher_js,$roleswitcher_form);
 
     foreach my $menuitem (@secondary_menu) {
@@ -436,7 +447,7 @@ sub secondary_menu {
                 && !$canmodpara;
         next if    $$menuitem[4]   =~ /showgroups$/
                 && !$canviewgrps
-                && !%groups;
+                && !$grouptools;
         next if    $$menuitem[4]   eq 'showsyllabus'
                 && !$showsyllabus;
         next if    $$menuitem[4]   eq 'showfeeds'
@@ -510,19 +521,9 @@ sub create_submenu {
     if ($target ne '') {
         $disptarget = ' target="'.$target.'"';
     }
-    my $name;
-    if ($title eq 'Personal') {
-        if ($env{'user.name'} && $env{'user.domain'}) {
-            $name = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
-        } else {
-            $name = &mt($title);
-        }
-    } else {
-        $name = &mt($title);
-    }
     my $menu = '<li class="LC_hoverable">'.
                '<a href="'.$link.'"'.$disptarget.'>'.
-               '<span class="LC_nobreak">'.$name.
+               '<span class="LC_nobreak">'.$title.
                '<span class="LC_fontsize_small" style="font-weight:normal;">'.
                ' &#9660;</span></span></a>'.
                '<ul>';
@@ -639,8 +640,18 @@ sub innerregister {
                                                        && $maptitle ne $coursetitle);
 
             push @crumbs, {text => $restitle, no_mt => 1} if $restitle; 
+            my @tools;
+            if ($env{'request.filename'} =~ /\.page$/) {
+                my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools();
+                if (ref($breadcrumb_tools{'tools'}) eq 'ARRAY') {
+                    @tools = @{$breadcrumb_tools{'tools'}};
+                }
+            }
             &Apache::lonhtmlcommon::clear_breadcrumbs();
             &Apache::lonhtmlcommon::add_breadcrumb(@crumbs);
+            if (@tools) {
+                &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',@tools);
+            }
         } else {
             $resurl = $env{'request.noversionuri'};
             my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'});
@@ -776,6 +787,9 @@ sub innerregister {
             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);
@@ -839,7 +853,7 @@ if ($env{'browser.mobile'}) {
     $is_mobile = 1;
 }
 
-            unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
+            unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio|exttools?)(\?|$)/) {
 		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) {
 		    $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.png&Info&info[_1]&catalog_info('$is_mobile')&Show Metadata
@@ -897,13 +911,20 @@ ENDMENUITEMS
 	    my $addremote=0;
 	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
     if ($addremote) {
-
+        my $countdown;
+        if ($env{'request.filename'} =~ /\.page$/) {
+            my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools();
+            if (ref($breadcrumb_tools{'tools'}) eq 'ARRAY') {
+                $countdown = $breadcrumb_tools{'tools'}[0];
+            }
+        } else {
+            $countdown = &countdown_timer();
+        }
         &Apache::lonhtmlcommon::clear_breadcrumb_tools();
 
             &Apache::lonhtmlcommon::add_breadcrumb_tool(
                 'navigation', @inlineremote[21,23]);
 
-        my $countdown = &countdown_timer();
         if (&hidden_button_check() eq 'yes') {
             if ($countdown) {
                 &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);
@@ -927,9 +948,18 @@ ENDMENUITEMS
             &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');
 }
 
@@ -1101,6 +1131,7 @@ sub prepare_functions {
         if (($env{'form.folderpath'} =~ /^supplemental/) &&
             (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
             (($resurl =~ m{^/adm/wrapper/ext/}) ||
+             ($resurl =~ m{^/adm/$cdom/$cnum/\d+/exttools?$}) ||
              ($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) ||
              ($resurl eq '/adm/supplemental') ||
              ($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) ||
@@ -1536,44 +1567,160 @@ function toggleCountdown() {
 END
 }
 
-# This creates a "done button" for timed events.  The confirmation box is a jQuerey
-# dialog widget.  Clicking OK will set (done = 'true') which is checked in 
-# lonhomework.pm.
+# This creates a "done button" for timed events.  The confirmation box is a jQuery
+# dialog widget. If the interval parameter requires a proctor key for the timed 
+# event to be marked done, there will also be a textbox where that can be entered. 
+# Clicking OK will set the value of LC_interval_done to 'true', and, if needed will 
+# set the value of LC_interval_done_proctorpass to the text entered in that box, 
+# and submit the corresponding form.
+# 
+# The &zero_time() routine in lonhomework.pm is called when a page is rendered if
+# LC_interval_done is true.
+#
 sub done_button_js {
-    return <<END;
+    my ($type,$width,$height,$proctor) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                 title    => 'WARNING!',
+                 button   => 'Done',
+                 preamble => 'You are trying to end this timed event early.',
+                 map      => 'Confirming that you are done will cause the time to expire and prevent you from changing any answers in the current folder.',
+                 resource => 'Confirming that you are done will cause the time to expire for this question, and prevent you from changing your answer(s).', 
+                 okdone   => 'Click "OK" if you are completely finished.',
+                 cancel   => 'Click "Cancel" to continue working.',
+                 proctor  => 'Ask a proctor to enter the key, then click "OK" if you are completely finished.',
+                 ok       => 'OK',
+                 exit     => 'Cancel',
+                 key      => 'Key:',
+                 nokey    => 'A proctor key is required', 
+    );
+    my $confirm;
+    if (($type eq 'map') || ($type eq 'resource')) {
+        if ($proctor) {
+            $confirm = $lt{'preamble'}.' '.$lt{$type};
+            if ($height !~ /^\d+$/) {
+                $height = 400;
+            }
+            if ($width !~ /^\d+$/) {
+                $width = 400;
+            }
+            return <<END;
+<form method="post" name="LCdoneButton" action="">
+    <input type="hidden" name="LC_interval_done" value="" />
+    <input type="hidden" name="LC_interval_done_proctorpass" value="" />
+    <button id="LC_done-confirm-opener" type="button">$lt{'button'}</button>
+</form>
 
-<form method="post" name="doneButton">
-    <input type="hidden" name="done" value=""/>
-    <button id="done-confirm-opener" type="button">Done</button>
-</form> 
+<div id="LC_done-confirm" title="$lt{'title'}">
+  <p>$lt{'preamble'} $lt{$type}</p>
+  <p>$lt{'proctor'}</p>
+  <form>
+    <label>$lt{'key'}<input type="password" name="LC_interval_done_proctorkey" value="" /></label>
+    <input type="submit" tabindex="-1" style="position:absolute; top:-1000px" />
+  </form>
+  <p>$lt{'cancel'}</p>
+</div>
 
-<div id="done-confirm" title="WARNING!">
-    <p></span>You are trying to end this timed event early.  Confirming that you are done will cause the time to expire and prevent you from changing any answers in the current folder.  Click "OK" if you are completely finished.  Click "Cancel" to continue working.</p>
+<script type="text/javascript">
+// <![CDATA[
+    \$( "#LC_done-confirm" ).dialog({ autoOpen: false });
+    \$( "#LC_done-confirm-opener" ).on("click", function() {
+        \$( "#LC_done-confirm" ).dialog("open");
+        \$( "#LC_done-confirm" ).dialog({
+            height: $height,
+            width: $width,
+            modal: true,
+            resizable: false,
+            buttons: [
+                {
+                    text: "$lt{'ok'}",
+                    click: function() {
+                        var proctorkey = \$( '[name="LC_interval_done_proctorkey"]' )[0].value;
+                        if ((proctorkey == '') || (proctorkey == null)) {
+                            alert("$lt{'nokey'}"); 
+                        } else { 
+                            \$( '[name="LC_interval_done"]' )[0].value = 'true';
+                            \$( '[name="LC_interval_done_proctorpass"]' )[0].value = proctorkey;
+                            \$( '[name="LCdoneButton"]' )[0].submit();
+                        }
+                    },
+                },
+                {
+                    text: "$lt{'exit'}",
+                    click: function() {
+                        \$("#LC_done-confirm").dialog( "close" );
+                    }
+                }
+            ],
+            close: function() {
+                \$( '[name="LC_interval_done_proctorkey"]' )[0].value = '';
+            }
+        });
+        \$( "#LC_done-confirm" ).find( "form" ).on( "submit", function( event ) {
+            event.preventDefault();
+            \$( '[name="LC_interval_done"]' )[0].value = 'true';
+            \$( '[name="LC_interval_done_proctorpass"]' )[0].value = \$( '[name="LC_interval_done_proctorkey"]' )[0].value;
+            \$( '[name="LCdoneButton"]' )[0].submit();
+        });
+});
+
+// ]]>
+</script>
+
+END
+        } else {
+            if ($height !~ /^\d+$/) {
+                $height = 320;
+            }
+            if ($width !~ /^\d+$/) {
+                $width = 320;
+            }
+            return <<END;
+
+<form method="post" name="LCdoneButton" action="">
+    <input type="hidden" name="LC_interval_done" value="" />
+    <button id="LC_done-confirm-opener" type="button">$lt{'button'}</button>
+</form>
+
+<div id="LC_done-confirm" title="$lt{'title'}">
+    <p>$lt{'preamble'} $lt{$type} $lt{'okdone'} $lt{'cancel'}</p>
 </div>
 
-<script>
-\$( "#done-confirm" ).dialog({ autoOpen: false });
-\$( "#done-confirm-opener" ).click(function() {
-    \$( "#done-confirm" ).dialog( "open" );
-    \$( "#done-confirm" ).dialog({
+<script type="text/javascript">
+// <![CDATA[
+\$( "#LC_done-confirm" ).dialog({ autoOpen: false });
+\$( "#LC_done-confirm-opener" ).click(function() {
+    \$( "#LC_done-confirm" ).dialog( "open" );
+    \$( "#LC_done-confirm" ).dialog({
       resizable: false,
-      height:320,
+      height: $height,
+      width: $width,
       modal: true,
-      buttons: {
-        "OK": function() {
-            \$( this ).dialog( "close" );
-            \$( '[name="done"]' )[0].value = 'true';
-            \$( '[name="doneButton"]' )[0].submit();
-        },
-        Cancel: function() {
-          \$( this ).dialog( "close" );
-        }
-      }    
-    })
+      buttons: [
+                 {
+                    text: "$lt{'ok'}",
+                    click: function() {
+                        \$( this ).dialog( "close" );
+                        \$( '[name="LC_interval_done"]' )[0].value = 'true';
+                        \$( '[name="LCdoneButton"]' )[0].submit();
+                    },
+                 },
+                 {
+                     text: "$lt{'exit'}",
+                     click: function() {
+                         \$( this ).dialog( "close" );
+                     },
+                  },
+               ],
+       });
 });
+// ]]>
 </script>
 
 END
+        }
+    } else {
+        return;
+    }
 }
 
 sub utilityfunctions {
@@ -1825,7 +1972,7 @@ sub roles_selector {
     my $now = time;
     my (%courseroles,%seccount,%courseprivs);
     my $is_cc;
-    my ($js,$form,$switcher,$switchtext);
+    my ($js,$form,$switcher);
     my $ccrole;
     if ($crstype eq 'Community') {
         $ccrole = 'co';
@@ -1913,7 +2060,6 @@ sub roles_selector {
             }
         }
     }
-    $switchtext = 'Switch role'; # do not translate here
     my @roles_order = ($ccrole,'in','ta','ep','ad','st');
     my $numdiffsec;
     if (keys(%seccount) == 1) {
@@ -1969,7 +2115,7 @@ sub roles_selector {
             }
         }
         if (@submenu > 0) {
-            $switcher = &create_submenu('','',$switchtext,\@submenu);
+            $switcher = &create_submenu('','',&mt('Switch role'),\@submenu);
         }
     }
     return ($js,$form,$switcher);
@@ -2240,10 +2386,12 @@ sub countdown_timer {
         }
         my $duedate = &Apache::lonnet::EXT("resource.0.duedate");
         my @interval=&Apache::lonnet::EXT("resource.0.interval");
+        my ($timelimit,$usesdone,$proctor,$secret);
         if (@interval > 1) {
+            ($timelimit,$usesdone,$proctor,$secret) = split(/_/,$interval[0]); 
             my $first_access=&Apache::lonnet::get_first_access($interval[1]);
             if ($first_access > 0) {
-                if ($first_access+$interval[0] > time) {
+                if ($first_access+$timelimit > time) {
                     $hastimeleft = 1;
                 }
             }
@@ -2256,9 +2404,11 @@ sub countdown_timer {
                 ($type eq 'Task' && $slothastime)) {
                 $currdisp = 'inline';
                 $collapse = '&#9658;&nbsp;';
-                $donebutton = &done_button_js();
-
-
+                if ((@interval > 1) && ($hastimeleft)) {
+                    if ($usesdone eq 'done') {
+                        $donebutton = &done_button_js($interval[1],'','',$proctor);
+                    }
+                }
             } else {
                 $currdisp = 'none';
                 $expand = '&#9668;&nbsp;';
@@ -2270,7 +2420,7 @@ sub countdown_timer {
             my $desc = &mt('Countdown to due date/time');
 
             return <<END;
-
+$donebutton
 <a href="javascript:toggleCountdown();" class="LC_menubuttons_link">
 <span id="ddcountcollapse" class="LC_menubuttons_inline_text">
 $collapse
@@ -2279,7 +2429,6 @@ $collapse
 <a href="javascript:toggleCountdown();" class="LC_menubuttons_link">
 <span id="ddcountexpand" class="LC_menubuttons_inline_text" >$expand</span>
 <img src="/res/adm/pages/timer.png" title="$desc" class="LC_icon" alt="$alttxt" /><span class="LC_menubuttons_inline_text">$title</span></a>
-$donebutton
 END
         }
     }