--- loncom/interface/lonmenu.pm	2015/05/28 12:37:14	1.431.2.4
+++ loncom/interface/lonmenu.pm	2015/04/16 10:13:25	1.432
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.431.2.4 2015/05/28 12:37:14 raeburn Exp $
+# $Id: lonmenu.pm,v 1.432 2015/04/16 10:13:25 droeschl 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>';
@@ -510,19 +515,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>';
@@ -776,9 +771,6 @@ 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);
@@ -930,18 +922,9 @@ 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,'','','','',$topic_help,$topic_help_text)
+           . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
            . &Apache::lonhtmlcommon::scripttag('', 'end');
 }
 
@@ -1548,69 +1531,6 @@ function toggleCountdown() {
 END
 }
 
-# This creates a "done button" for timed events.  The confirmation box is a jQuery
-# dialog widget.  Clicking OK will set (LC_interval_done = 'true') which is checked in 
-# lonhomework.pm.
-sub done_button_js {
-    my ($type,$height) = @_;
-    if ($height !~ /^\d+$/) {
-        $height = 320;
-    }
-    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).', 
-                 ok       => 'Click "OK" if you are completely finished.',
-                 cancel   => 'Click "Cancel" to continue working.',
-    );
-    my $confirm;
-    if (($type eq 'map') || ($type eq 'resource')) {
-        $confirm = $lt{'preamble'}.' '.$lt{$type}.' '.$lt{'ok'}.' '.$lt{'cancel'};
-    }
-    if ($confirm) {
-        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>$confirm</p>
-</div>
-
-<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: $height,
-      modal: true,
-      buttons: {
-        "OK": function() {
-            \$( this ).dialog( "close" );
-            \$( '[name="LC_interval_done"]' )[0].value = 'true';
-            \$( '[name="LCdoneButton"]' )[0].submit();
-        },
-        Cancel: function() {
-          \$( this ).dialog( "close" );
-        }
-      }    
-    })
-});
-// ]]>
-</script>
-
-END
-    } else {
-        return;
-    }
-}
-
 sub utilityfunctions {
     my ($httphost) = @_;
     my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
@@ -1860,7 +1780,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';
@@ -1948,7 +1868,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) {
@@ -2004,7 +1923,7 @@ sub roles_selector {
             }
         }
         if (@submenu > 0) {
-            $switcher = &create_submenu('','',$switchtext,\@submenu);
+            $switcher = &create_submenu('','',&mt('Switch role'),\@submenu);
         }
     }
     return ($js,$form,$switcher);
@@ -2286,14 +2205,11 @@ sub countdown_timer {
         if (($duedate && $duedate > time) ||
             (!$duedate && $hastimeleft) ||
             ($slot_name ne '' && $slothastime)) {
-            my ($collapse,$expand,$alttxt,$title,$currdisp,$donebutton);
+            my ($collapse,$expand,$alttxt,$title,$currdisp);
             if ((@interval > 1 && $hastimeleft) ||
                 ($type eq 'Task' && $slothastime)) {
                 $currdisp = 'inline';
                 $collapse = '&#9658;&nbsp;';
-                if ((@interval > 1) && ($hastimeleft)) {
-                    $donebutton = &done_button_js($interval[1]);
-                }
             } else {
                 $currdisp = 'none';
                 $expand = '&#9668;&nbsp;';
@@ -2303,9 +2219,8 @@ sub countdown_timer {
                 $title = $alttxt.'&nbsp;';
             }
             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