--- loncom/interface/lonnavmaps.pm	2012/05/28 10:31:17	1.485
+++ loncom/interface/lonnavmaps.pm	2012/12/29 17:37:20	1.492
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.485 2012/05/28 10:31:17 foxr Exp $
+# $Id: lonnavmaps.pm,v 1.492 2012/12/29 17:37:20 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -484,6 +484,7 @@ use POSIX qw (floor strftime);
 use Time::HiRes qw( gettimeofday tv_interval );
 use LONCAPA;
 use DateTime();
+use HTML::Entities;
 
 # For debugging
 
@@ -691,7 +692,7 @@ sub getDescription {
         my $maxtries = $res->maxtries($part);
         my $triesString = "";
         if ($tries && $maxtries) {
-            $triesString = '<font size="-1"><i>('.&mt('[_1] of [quant,_2,try,tries] used',$tries,$maxtries).')</i></font>';
+            $triesString = '<span class="LC_fontsize_medium"><i>('.&mt('[_1] of [quant,_2,try,tries] used',$tries,$maxtries).')</i></span>';
             if ($maxtries > 1 && $maxtries - $tries == 1) {
                 $triesString = "<b>$triesString</b>";
             }
@@ -982,7 +983,7 @@ sub render_resource {
             ($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/)) {
             my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';
             $editmapLink='&nbsp;'.
-                         '<a href="/adm/coursedocs?command=direct&symb='.&escape($resource->symb()).'">'.
+                         '<a href="/adm/coursedocs?command=directnav&symb='.&escape($resource->symb()).'">'.
                          '<img src="'.$icon.'" alt="'.&mt('Edit Content').'" title="'.&mt('Edit Content').'" />'.
                          '</a>';
         }
@@ -995,7 +996,7 @@ sub render_resource {
         $nonLinkedText .= ' <span class="LC_info">('.&mt('conditionally hidden').')</span> ';
     }
     if (($resource->is_practice()) && ($resource->is_raw_problem())) {
-        $nonLinkedText .=' <font color="green"><b>'.&mt('not graded').'</b></font>';
+        $nonLinkedText .=' <span class="LC_info"><b>'.&mt('not graded').'</b></span>';
     }
 
     # We're done preparing and finally ready to start the rendering
@@ -1039,7 +1040,7 @@ sub render_resource {
     }
 
     if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
-        $result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
+        $result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
     } else {
         $result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
     }
@@ -1128,21 +1129,23 @@ sub render_long_status {
         $params->{'multipart'} && $part eq "0";
                 
     my $color;
+    my $info = '';
     if ($resource->is_problem() || $resource->is_practice()) {
         $color = $colormap{$resource->status};
         
         if (dueInLessThan24Hours($resource, $part) ||
             lastTry($resource, $part)) {
             $color = $hurryUpColor;
+            $info = ' title="'.&mt('Due in less than 24 hours!').'"';
         }
     }
     
     if ($resource->kind() eq "res" &&
         $resource->is_raw_problem() &&
         !$firstDisplayed) {
-        if ($color) {$result .= "<font color=\"$color\"><b>"; }
+        if ($color) {$result .= '<span style="color:'.$color.'"'.$info.'><b>'; }
         $result .= getDescription($resource, $part);
-        if ($color) {$result .= "</b></font>"; }
+        if ($color) {$result .= "</b></span>"; }
     }
     if ($resource->is_map() && &advancedUser() && $resource->randompick()) {
         $result .= &mt('(randomly select [_1])', $resource->randompick());
@@ -1224,11 +1227,11 @@ sub render_parts_summary_status {
     }
     $return.= $td . $totalParts . ' parts: ';
     foreach my $status (@statuses) {
-	if ($overallstatus{$status}) {
-	    $return.="<font color='" . $statusColors{$status} .
-		"'>" . $overallstatus{$status} . ' '
-		. $statusStrings{$status} . "</font>";
-	}
+        if ($overallstatus{$status}) {
+            $return.='<span style="color:' . $statusColors{$status}
+                   . '">' . $overallstatus{$status} . ' '
+                   . $statusStrings{$status} . '</span>';
+        }
     }
     $return.= $endtd;
     return $return;
@@ -1481,9 +1484,10 @@ sub render {
 		      'document.clearbubbles.submit()',
 		      'Mark all posts read');
 	my $time=time;
+        my $querystr = &HTML::Entities::encode($ENV{'QUERY_STRING'},'<>&"');
 	$result .= (<<END);
     <form name="clearbubbles" method="post" action="/adm/feedback">
-	<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
+	<input type="hidden" name="navurl" value="$querystr" />
 	<input type="hidden" name="navtime" value="$time" />
 END
         if ($env{'form.register'}) {
@@ -1825,6 +1829,8 @@ END
 	    }
 	}
     }
+
+    $result.=&Apache::loncommon::end_data_table();
     
     # Print out the part that jumps to #curloc if it exists
     # delay needed because the browser is processing the jump before
@@ -1841,8 +1847,6 @@ if (location.href.indexOf('#curloc')==-1
 ");
     }
 
-    $result.=&Apache::loncommon::end_data_table();
-
     if ($r) {
         $r->print($result);
         $result = "";
@@ -1873,7 +1877,6 @@ sub show_linkitems_toolbar {
                           '<td class="LC_middle">'.&mt('Tools:').'</td>';
             }
             $result .= '<td align="left">'."\n".
-                       '<span class="LC_nobreak">'."\n".
                        '<ul id="LC_toolbar">';
             my @linkorder = ('firsthomework','everything','uncompleted',
                              'changefolder','clearbubbles','edittoplevel');
@@ -1901,7 +1904,7 @@ sub show_linkitems_toolbar {
                 }
             }
             $result .= '</ul>'.
-                       '</span></td>';
+                       '</td>';
             if (($numlinks==1) && (exists($args->{'linkitems'}{'edittoplevel'}))) {
                 $result .= '<td><a href="'.$args->{'linkitems'}{'edittoplevel'}{'cmd'}.'">'.
                            &mt('Content Editor').'</a></td>';
@@ -2008,6 +2011,7 @@ sub new {
 
     $self->{USERNAME} = shift || $env{'user.name'};
     $self->{DOMAIN}   = shift || $env{'user.domain'};
+    $self->{CODE}     = shift;
 
 
 
@@ -2024,7 +2028,7 @@ sub new {
     # assume there are course hashes for the specific requested user@domamin:
     #
 
-    if (($self->{USERNAME} eq $env{'user.name'}) && ($self->{DOMAIN} eq $env{'user.domain'})) {
+    if (($self->{USERNAME} eq $env{'user.name'}) && ($self->{DOMAIN} eq $env{'user.domain'}) && !$self->{CODE}) {
 	
 	# tie the nav hash
 	
@@ -2047,7 +2051,7 @@ sub new {
 	$self->{PARM_HASH} = \%parmhash;
 	$self->{PARM_CACHE} = {};
     } else {
-	$self->change_user($self->{USERNAME}, $self->{DOMAIN});
+	$self->change_user($self->{USERNAME}, $self->{DOMAIN},  $self->{CODE});
     }
 
     return $self;
@@ -2060,12 +2064,14 @@ sub new {
 # Parameters:
 #    user  - New user.
 #    domain- Domain the user belongs to.
+#    code  - Anonymous CODE in use.
 # Implicit inputs:
 #   
 sub change_user {
     my $self = shift;
     $self->{USERNAME} = shift;
     $self->{DOMAIN}   = shift;
+    $self->{CODE}     = shift;
 
     # If the hashes are already tied make sure to break that bond:
 
@@ -2081,7 +2087,7 @@ sub change_user {
     my ($cdom, $cnum) = split(/\_/, $env{'request.course.id'});
 
     my %big_hash;
-    &Apache::lonmap::loadmap($cnum, $cdom, $self->{USERNAME}, $self->{DOMAIN}, \%big_hash);
+    &Apache::lonmap::loadmap($cnum, $cdom, $self->{USERNAME}, $self->{DOMAIN}, $self->{CODE}, \%big_hash);
     $self->{NAV_HASH} = \%big_hash;
 
 
@@ -4362,19 +4368,34 @@ sub printable {
 
     my ($self, $part) = @_;
 
-    # Get the print open/close dates for the resource.
+    &Apache::lonnet::logthis($self->symb());
 
-    my $start = $self->parmval("printstartdate", $part);
-    my $end   = $self->parmval("printenddate", $part);
 
     #  The following cases apply:
-    #  - No dates set: Printable.
+    #  - If a start date is not set, it is replaced by the open date.
+    #  - Ditto for start/open replaced by content open.
+    #  - If neither start nor printdates are set the part is printable.
     #  - Start date set but no end date: Printable if now >= start date.
     #  - End date set but no start date: Printable if now <= end date.
     #  - both defined: printable if start <= now <= end
     #
+
+    # Get the print open/close dates for the resource.
+
+    my $start = $self->parmval("printstartdate", $part);
+    my $end   = $self->parmval("printenddate", $part);
+
+    if (!$start) {
+	$start = $self->parmval("opendate", $part);
+    }
+    if (!$start) {
+	$start = $self->parmval("contentopen", $part);
+    }
+
+
     my $now  = time();
 
+
     my $startok = 1;
     my $endok   = 1;
 
@@ -4395,7 +4416,7 @@ sub resprintable {
     my $partsref = $self->parts();
     my @parts    = @$partsref;
 
-    if ((!defined(@parts)) || (scalar(@parts) == 0)) {
+    if (!@parts) {
 	return $self->printable(0);
     } else {
 	foreach my $part  (@parts) {