--- loncom/interface/lonmenu.pm	2012/05/28 13:09:16	1.378
+++ loncom/interface/lonmenu.pm	2012/07/05 19:22:47	1.382
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.378 2012/05/28 13:09:16 raeburn Exp $
+# $Id: lonmenu.pm,v 1.382 2012/07/05 19:22:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -402,8 +402,12 @@ sub secondary_menu {
 sub create_submenu {
     my ($link,$target,$title,$submenu) = @_;
     return unless (ref($submenu) eq 'ARRAY');
+    my $disptarget;
+    if ($target ne '') {
+        $disptarget = ' target="'.$target.'"';
+    }
     my $menu = '<li class="LC_hoverable">'.
-               '<a href="'.$link.'" target="'.$target.'">'.
+               '<a href="'.$link.'"'.$disptarget.'>'.
                '<span class="LC_nobreak">'.&mt($title).
                '<span class="LC_fontsize_small" style="font-weight:normal;">'.
                ' &#9660;</span></span></a>'.
@@ -728,13 +732,17 @@ $menuitems.="&Notes&&annotate()&";
 $menuitems.="Make notes and annotations about this resource&&1\n";
 
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
-		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) {
+		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()&Show Metadata
 ENDREALRES
                 }
-	        $menuitems.=(<<ENDREALRES);
+                unless ($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) {
+                    $menuitems.=(<<ENDREALRES);
 s&8&1&eval.png&Evaluate&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
+ENDREALRES
+                }
+                $menuitems.=(<<ENDREALRES);
 s&8&2&fdbk.png&Communicate&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
 ENDREALRES
 	    }
@@ -1810,10 +1818,20 @@ sub countdown_timer {
         ($env{'request.filename'}=~/$LONCAPA::assess_re/) &&
         ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
         my $duedate = &Apache::lonnet::EXT("resource.0.duedate");
-        if ($duedate && $duedate > time) {
-            my ($collapse,$expand,$title,$currdisp);
-            my @interval=&Apache::lonnet::EXT("resource.0.interval");
-            if (@interval > 1) {
+        my @interval=&Apache::lonnet::EXT("resource.0.interval");
+        my $hastimeleft;
+        if (@interval > 1) {
+            my $first_access=&Apache::lonnet::get_first_access($interval[1]);
+            if ($first_access > 0) {
+                if ($first_access+$interval[0] > time) {
+                    $hastimeleft = 1;
+                }
+            }
+        }
+        if (($duedate && $duedate > time) ||
+            (!$duedate && $hastimeleft)) {
+            my ($collapse,$expand,$alttxt,$title,$currdisp);
+            if (@interval > 1 && $hastimeleft) {
                 $currdisp = 'inline';
                 $collapse = '&#9658;&nbsp;';
             } else {
@@ -1821,7 +1839,8 @@ sub countdown_timer {
                 $expand = '&#9668;&nbsp;';
             }
             unless ($env{'environment.icons'} eq 'iconsonly') {
-                $title = &mt('Timer');
+                $alttxt = &mt('Timer');
+                $title = $alttxt.'&nbsp;';
             }
             my $desc = &mt('Countdown to due date/time');
             return <<END;
@@ -1829,11 +1848,11 @@ sub countdown_timer {
 <a href="javascript:toggleCountdown();" class="LC_menubuttons_link">
 <span id="ddcountcollapse" class="LC_menubuttons_inline_text">
 $collapse
-</a></span>
+</span></a>
 <span id="duedatecountdown" class="LC_menubuttons_inline_text" style="display: $currdisp;"></span>
 <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"><span class="LC_menubuttons_inline_text">$title</span></a>
+<img src="/res/adm/pages/timer.png" title="$desc" class="LC_icon" alt="$alttxt" /><span class="LC_menubuttons_inline_text">$title</span></a>
 END
         }
     }