--- rat/lonpage.pm	2008/12/19 14:30:51	1.91
+++ rat/lonpage.pm	2017/02/20 18:29:33	1.121
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.91 2008/12/19 14:30:51 raeburn Exp $
+# $Id: lonpage.pm,v 1.121 2017/02/20 18:29:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,9 +36,12 @@ use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::loncommon();
+use Apache::lonhtmlcommon;
 use Apache::lonxml();
 use Apache::lonlocal;
 use Apache::lonmenu;
+use Apache::lonhomework;
+use Apache::lonparmset;
 use HTML::TokeParser;
 use GDBM_File;
 use Apache::lonsequence;
@@ -158,6 +161,19 @@ sub handler {
   my $number_of_columns = 1;
   my $requrl=$r->uri;  
   my $target = $env{'form.grade_target'};
+
+# Short term solution: define target as 'tex_answer' when retrieving answers
+# for resources in a .page when generating printouts.
+# A better long-term fix would be to modify the way problem rendering, and 
+# answer rendering are retrieved for individual resources when printing a .page,
+# so rendered problem and answer are sequential for individual resources in 
+# the .page
+#
+  if ($target eq 'answer') {
+      if ($env{'form.answer_output_mode'} eq 'tex') {
+          $target = 'tex_answer';
+      }
+  }
 #  &Apache::lonnet::logthis("Got a target of $target");
   if ($target eq 'meta') {
       &Apache::loncommon::content_type($r,'text/html');
@@ -168,11 +184,32 @@ sub handler {
   if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) {
       my $fn=$env{'request.course.fn'};
       if (-e "$fn.db") {
+          my %buttonshide;
           if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) {
 # ------------------------------------------------------------------- Hash tied
               my $firstres=$hash{'map_start_'.$requrl};
               my $lastres=$hash{'map_finish_'.$requrl};
               if (($firstres) && ($lastres)) {
+# ------------------------------------------------------------- Countdown Timer
+                  my $now = time;
+                  my ($pagefirstaccess,%hastimeleft,%countdowndisp,%donebutton,
+                      %donebtnextra,%buttonbytime,$donetime,$symbtosetdone);
+                  my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser();
+                  unless ($pagesymb) {
+                      $pagesymb=&Apache::lonnet::symbread($requrl);
+                  }
+                  if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) {
+                      my %times=&Apache::lonnet::get('firstaccesstimes',
+                                                     [$courseid."\0".$pagesymb],
+                                                     $domain,$name);
+                      if ($times{$courseid."\0".$pagesymb} =~ /^\d+$/) {
+                          $pagefirstaccess = $times{$courseid."\0".$pagesymb};
+                          if ($pagefirstaccess && $env{'form.LC_interval_done'} eq 'true') {
+                              $donetime = $now - $pagefirstaccess;
+                          }
+                      }
+                  }
+
 # ----------------------------------------------------------------- Render page
 
                   @rows=();
@@ -190,6 +227,27 @@ sub handler {
 			    my ($mapid,$resid)=split(/\./,$rid);
 			    $symbhash{$hash{'src_'.$rid}}=
 				[$hash{'src_'.$rid},$resid];
+                            if (($donetime) && ($symbtosetdone eq '')) {
+                                my $src = $hash{'src_'.$rid};
+                                if ($hash{'encrypted_'.$rid}) {
+                                    $src=&Apache::lonenc::encrypted($src);
+                                }
+                                my ($mapid,$resid)=split(/\./,$rid);
+                                my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
+                                if ($src =~ /$LONCAPA::assess_re/) {
+                                    my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb);
+                                    if (@interval > 1) {
+                                        if (($interval[1] eq 'map') && ($pagefirstaccess)) {
+                                            my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+                                            if ($timelimit) {
+                                                if ($pagefirstaccess + $timelimit > $now) {
+                                                    $symbtosetdone = $symb;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
 		        }
 		     }
 		  }
@@ -201,6 +259,11 @@ sub handler {
                   my $lcm=1;
                   my $contents=0;
                   my $nforms=0;
+                  my $nuploads=0;
+                  my $ntimers=0;
+                  my %turninpaths;
+                  my %multiresps;
+                  my $turninparent;
                   
                   my %ssibody=();
                   my %ssibgcolor=();
@@ -210,6 +273,7 @@ sub handler {
                   my %ssialink=();
      
                   my %cellemb=();
+                  my %cellexternal=();
 
                   my $allscript='';
                   my $allmeta='';
@@ -218,6 +282,16 @@ sub handler {
                   my $xmlheader='';
                   my $xmlbody='';
 
+# ---------------------------------------------------------- Handle Done button
+
+                  # Set the event timer to zero if the "done button" was clicked.
+                  if ($donetime && $symbtosetdone) {
+                      &Apache::lonparmset::storeparm_by_symb_inner($symbtosetdone,'0_interval',
+                                                                   2,$donetime,'date_interval',
+                                                                   $name,$domain);
+                      undef($env{'form.LC_interval_done'});
+                  }
+
 # --------------------------------------------- Get SSI output, post parameters
 
                   for ($i=0;$i<=$#rows;$i++) {
@@ -227,27 +301,40 @@ sub handler {
                       $lcm*=($#colcont+1)/euclid($lcm,($#colcont+1));
                       foreach (@colcont) {
                           my $src=$hash{'src_'.$_};
-			  my ($extension)=($src=~/\.(\w+)$/);
+                          my $plainsrc = $src;
+                          my ($extension)=($src=~/\.(\w+)$/);
+			  $cellexternal{$_}=($hash{'ext_'.$_} eq 'true:');
 			  if ($hash{'encrypted_'.$_}) {
 			      $src=&Apache::lonenc::encrypted($src);
 			  }
+                          my ($mapid,$resid)=split(/\./,$_);
+                          my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
+                          unless ($env{'request.role.adv'}) {
+                              $buttonshide{$symb} = &Apache::lonnet::EXT("resource.0.buttonshide",$symb);
+                          }
                           $cellemb{$_}=
 			      &Apache::loncommon::fileembstyle($extension);
-                          if ($cellemb{$_} eq 'ssi') {
+                          if ($cellexternal{$_}) {
+                              unless (($target eq 'tex') || ($target eq 'tex_answer')) {
+                                  $ssibody{$_} = <<ENDEXT;
+<iframe src="$src" width="100%">No iframe support!</iframe>
+ENDEXT
+                              }
+                          } elsif ($cellemb{$_} eq 'ssi') {
 # --------------------------------------------------------- This is an SSI cell
-			      my ($mapid,$resid)=split(/\./,$_);
-			      my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
-			      
 			      my $prefix=$_.'_';
+                              my $idprefix= join('_',($mapid,$resid,''));
                               my %posthash=('request.prefix' => $prefix,
 					    'LONCAPA_INTERNAL_no_discussion' => 'true',
 					    'symb' => $symb);
-			      if ($env{'form.grade_target'} eq 'tex') {
+			      if (($env{'form.grade_target'} eq 'tex') ||
+                                 ($env{'form.answer_output_mode'} eq 'tex')) {
 				  $posthash{'grade_target'}=$env{'form.grade_target'};
 				  $posthash{'textwidth'}=$env{'form.textwidth'};
 				  $posthash{'problem_split'}=$env{'form.problem_split'};
 				  $posthash{'latex_type'}=$env{'form.latex_type'};
 				  $posthash{'rndseed'}=$env{'form.rndseed'};
+                                  $posthash{'answer_output_mode'} = $env{'form.answer_output_mode'};
 			      }
 			      my $submitted=exists($env{'form.all_submit'});
 			      if (!$submitted) {
@@ -271,13 +358,19 @@ sub handler {
 			      }
                               my $output=Apache::lonnet::ssi($src,%posthash);
 			      $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs;
-                              if ($target eq 'tex') {
-				  $output =~ s/^([^&]+)\\begin{document}//;
-				  $output =~ s/\\end{document}//;
-				  $output = '\parbox{\minipagewidth}{ '.$output.' }';
+                              if (($target eq 'tex') || ($target eq 'tex_answer')) {
+				  $output =~ s/^([^&]+)\\begin\{document}//;
+				  $output =~ s/\\end\{document}//;
+#				  $output = '\parbox{\minipagewidth}{ '.$output.' }';
                                   #some additional cleanup necessary for LateX (due to limitations of table environment 
 				  $output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g;
 			      }
+                              my $matheditor;
+                              if ($output =~ /\Qjavascript:LC_mathedit_HWVAL_\E/) {
+                                  $matheditor = 'dragmath';
+                              } elsif ($output =~ /LCmathField/) {
+                                  $matheditor = 'lcmath';
+                              }
                               my $parser=HTML::TokeParser->new(\$output);
                               my $token;
                               my $thisdir=$src;
@@ -334,11 +427,147 @@ sub handler {
                               }
                               $output=~s/\<\/body\>.*//si;
                               if ($output=~/\<form/si) {
+                                  my $hastimer; 
 				  $nforms++;
                                   $output=~s/\<form[^\>]*\>//gsi;
                                   $output=~s/\<\/form[^\>]*\>//gsi;
+                                  if ($output=~/\<input[^\>]+name\s*=\s*[\'\"]*HWFILE/) {
+                                      $nuploads++;
+                                  }
+                                  if ($output=~/\<input[^\>]+name\s*=\s*[\'\"]*accessbutton/) {
+                                      $ntimers++;
+                                      $hastimer = 1;
+                                  }
                                   $output=~
 				      s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
+                                  $output=~
+                                      s/\<((?:input|select|button|textarea)[^\>]+)id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 id="$idprefix$2" $3\>/gsi;
+                                  if ($hastimer) {
+                                      $output=~
+                                          s/\<(input[^\>]+name=\Q"$prefix\Eaccessbutton"[^\>]+)(?:\Qdocument.markaccess.submit();\E)([^\>]*)\>/\<$1pageTimer(this.form,'$prefix')$2\>/gsi;
+                                      $output=~  s/\<(input[^\>]+name=\Q"$prefix\Emarkaccess"[^\>]+value=["'])(?:yes)(['"][^\>]*)\>/\<$1$2\>/gsi;
+                                  }
+                                  if ($matheditor eq 'dragmath') {
+                                      $output=~
+                                          s/(\Qjavascript:LC_mathedit_\E)(HWVAL_)([^'"]+?)(\(['"]*)(\QHWVAL_\E\3['"]\)\;void\(0\)\;)/$1$idprefix$2$3$4$idprefix$5/g;
+                                      $output=~
+                                          s/(function\s+LC_mathedit_)(HWVAL_)([^'"]+?)(\s+\(LCtextline\))/$1$idprefix$2$3$4/g;
+                                  } elsif ($matheditor eq 'lcmath') {
+                                      $output=~
+                                          s/(var\s+LCmathField\s+=\s+document\.getElementById\(['"])([^'"]+?)(['"]\)\;)/$1$idprefix$2$3/g;
+                                  }
+                                  $output=~
+                                      s/(\Q<div id="msg_\E)(\Qsubmit_\E)([^"]*)(\Q" style="display:none">\E)/<input type="hidden" name="$prefix$2$3_pressed" id="$idprefix$2$3_pressed" value="" \/>$1$idprefix$2$3$4/g;
+                                  $output=~
+                                      s/(\Q<td class="LC_status_\E)(\Qsubmit_\E)([^\"]*)(\s*[^\"]*"\>)/$1$idprefix$2$3$4/g;
+                                  if ($nuploads) {
+                                      $output=~
+                                          s/\<(input[^\>]+name=\"\Q$prefix\EHWFILE[^\>]+)\s*id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\)]*)\>/\<$1 id="$prefix$2" $3\>/gsi;
+                                       ($turninpaths{$prefix},$multiresps{$prefix}) = 
+                                           &Apache::loncommon::get_turnedin_filepath($symb,$env{'user.name'},$env{'user.domain'});
+                                       if ($turninparent eq '') {
+                                           $turninparent = $turninpaths{$prefix};
+                                           $turninparent =~ s{(/[^/]+)$}{}; 
+                                       }
+                                  }
+                                  $output=~
+                                      s/\<((?:input|select)[^\>]+\Qjavascript:setSubmittedPart\E)\(\s*[\'\"]([^\'\"]+)[\'\"]*\s*\)/\<$1('$2','$prefix')/gsi;
+                                  $output=~
+                                      s/\<(input[^\>]+\Qonfocus=\"javascript:disableAutoComplete\E)\(\'([^\']+)\'\)(;\")/\<$1('$idprefix$2')$3/gsi;
+                                  unless ($hastimer) {
+                                      if ($plainsrc =~ /$LONCAPA::assess_re/) {
+                                          %Apache::lonhomework::history =
+                                              &Apache::lonnet::restore($symb,$courseid,$domain,$name);
+                                          my $type = 'problem';
+                                          if ($extension eq 'task') {
+                                              $type = 'Task';
+                                          }
+                                          my ($status,$accessmsg,$slot_name,$slot) =
+                                              &Apache::lonhomework::check_slot_access('0',$type,$symb);
+                                          undef(%Apache::lonhomework::history);
+                                          my $probstatus = &Apache::lonnet::EXT("resource.0.problemstatus",$symb);
+                                          if (($status eq 'CAN_ANSWER') || (($status eq 'CANNOT_ANSWER') && 
+                                              (($probstatus eq 'no') || ($probstatus eq 'no_feedback_ever'))) ||
+                                              (($status eq 'NOT_YET_VIEWED') && ($posthash{'markaccess'} eq 'yes'))) {
+                                              my ($slothastime,$timerhastime);
+                                              if ($slot_name ne '') {
+                                                  if (ref($slot) eq 'HASH') {
+                                                      if (($slot->{'starttime'} < $now) &&
+                                                          ($slot->{'endtime'} > $now)) {
+                                                          $slothastime = $now - $slot->{'endtime'};
+                                                      }
+                                                  }
+                                              }
+                                              my $duedate = &Apache::lonnet::EXT("resource.0.duedate",$symb);
+                                              my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb);
+                                              if (@interval > 1) {
+                                                  my $first_access;
+                                                  if ($interval[1] eq 'map') {
+                                                      my $ignorecache;
+                                                      if ($env{'form.'.$prefix.'markaccess'} eq 'yes') {
+                                                          $ignorecache = 1;
+                                                      }
+                                                      $first_access=&Apache::lonnet::get_first_access($interval[1],undef,$pagesymb,$ignorecache);
+                                                      if (($first_access) && (!$pagefirstaccess)) {
+                                                          $pagefirstaccess = $first_access;
+                                                      }
+                                                  } else {
+                                                      $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
+                                                  }
+                                                  if ($first_access > 0) {
+                                                      my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+                                                      if ($timelimit) {
+                                                          my $timeremains = $timelimit + $first_access - $now;
+                                                          if ($timeremains > 0) {
+                                                              $timerhastime = $timeremains;
+                                                          }
+                                                      }
+                                                  }
+                                              }
+                                              if (($duedate && $duedate > $now) ||
+                                                  (!$duedate && $timerhastime > 0) ||
+                                                  ($slot_name ne '' && $slothastime)) {
+                                                  if ((@interval > 1 && $timerhastime) ||
+                                                      ($type eq 'Task' && $slothastime)) {
+                                                      $countdowndisp{$symb} = 'inline';
+                                                      if ((@interval > 1) && ($timerhastime)) {
+                                                          $hastimeleft{$symb} = $timerhastime;
+                                                          if ($pagefirstaccess) {
+                                                              my ($timelimit,$usesdone,$donebuttontext,$proctor,$secret);
+                                                              ($timelimit,my $donesuffix) = split(/_/,$interval[0],2);
+                                                              if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) {
+                                                                  $usesdone = 'done';
+                                                                  $donebuttontext = $1;
+                                                                  (undef,$proctor,$secret) = split(/_/,$2);
+                                                              } elsif ($donesuffix =~ /^done(|_.+)$/) {
+                                                                  $donebuttontext = &mt('Done');
+                                                                  ($usesdone,$proctor,$secret) = split(/_/,$donesuffix);
+                                                              }
+                                                              if ($usesdone eq 'done') {
+                                                                  $donebutton{$symb} = $timelimit;
+                                                                  push(@{$buttonbytime{$timelimit}},$symb);
+                                                                  $donebtnextra{$symb} = {
+                                                                                              text    => $donebuttontext,
+                                                                                              proctor => $proctor,
+                                                                                              secret  => $secret,
+                                                                                              type    => $interval[1],
+                                                                                         };
+                                                              }
+                                                          }
+                                                      } else {
+                                                          $hastimeleft{$symb} = $slothastime;
+                                                      }
+                                                  } else {
+                                                      $hastimeleft{$symb} = $duedate - $now;
+                                                      $countdowndisp{$symb} = 'none';
+                                                  }
+                                                  unless ($donebutton{$symb}) {
+                                                      $donebutton{$symb} = 0;
+                                                  }
+                                              }
+                                          }
+                                      }
+                                  }
                               }
                               $thisdir=~s/\/[^\/]*$//;
 			      foreach (@rlinks) {
@@ -372,7 +601,7 @@ sub handler {
 # ------------------------------------------------------------------ Build page
 
 # ---------------------------------------------------------------- Send headers
-		      unless ($target eq 'tex') {
+		      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 			  if ($isxml) {
 			      &Apache::loncommon::content_type($r,'text/xml');
 			  } else {
@@ -386,28 +615,123 @@ sub handler {
 				  $allscript.
 				  "\n</script>\n";
 			  }
+                          if (($nforms) && ($nuploads)) {
+                              $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps);
+                          }
+                          if (($nforms) && (&Apache::lonhtmlcommon::htmlareabrowser())) {
+                              my %textarea_args = (
+                                  dragmath => 'math',
+                              );
+                              $allscript .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
+                          }
+                          if ($ntimers) {
+                              $allscript .= '<script type="text/javascript">'."\n".
+                                            '// <![CDATA['."\n".
+                                            'function pageTimer(form,prefix) {'."\n".
+                                            "   form.elements[prefix+'markaccess'].value = 'yes';\n".
+                                            "   form.submit();\n".
+                                            '}'."\n".
+                                            '// ]]>'.
+                                            "\n</script>\n";
+                          }
+                          if (keys(%hastimeleft)) {
+                              my (%uniquetimes,%uniquedisplays);
+                              foreach my $item (values(%hastimeleft)) {
+                                  if (exists($uniquetimes{$item})) {
+                                      $uniquetimes{$item} ++; 
+                                  } else {
+                                      $uniquetimes{$item} = 1;
+                                  }
+                              }
+                              if (scalar(keys(%uniquetimes)) == 1) {
+                                  my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime,
+                                      $donebuttonextras);
+                                  if (keys(%countdowndisp)) {
+                                      foreach my $item (values(%countdowndisp)) {
+                                          if (exists($uniquedisplays{$item})) {
+                                              $uniquedisplays{$item} ++;
+                                          } else {
+                                              $uniquedisplays{$item} = 1;
+                                          }
+                                      }
+                                      my @countdowndisplay = keys(%uniquedisplays);
+                                      if (scalar(@countdowndisplay) == 1) {
+                                          $currdisp = $countdowndisplay[0];
+                                      }
+                                  }
+                                  if (keys(%donebutton)) {
+                                      foreach my $item (values(%donebutton)) {
+                                          if (exists($uniquedones{$item})) {
+                                              $uniquedones{$item} ++;
+                                          } else {
+                                              $uniquedones{$item} = 1;
+                                          }
+                                      }
+                                      my @donebuttons = sort { $ <=> $b } (keys(%uniquedones));
+                                      if (scalar(@donebuttons) == 1) {
+                                          if ($donebuttons[0]) {
+                                              $donebuttontime = $donebuttons[0];
+                                              if (ref($buttonbytime{$donebuttontime}) eq 'ARRAY') {
+                                                  $donebuttonextras = $donebtnextra{$buttonbytime{$donebuttontime}->[0]};
+                                              }
+                                          }
+                                      }
+                                  }
+                                  &add_countdown_timer($currdisp,$donebuttontime,$donebuttonextras);
+                              }
+                          }
+                          my $pagebuttonshide;
+                          if (keys(%buttonshide)) {
+                              my %uniquebuttonhide;
+                              foreach my $item (values(%buttonshide)) {
+                                  if (exists($uniquebuttonhide{$item})) {
+                                      $uniquebuttonhide{$item} ++;
+                                  } else {
+                                      $uniquebuttonhide{$item} = 1;
+                                  }
+                              }
+                              if (keys(%uniquebuttonhide) == 1) {
+                                  if (lc((keys(%uniquebuttonhide))[0]) eq 'yes') {
+                                      $pagebuttonshide = 'yes';
+                                  }
+                              }
+                          }
 # ------------------------------------------------------------------ Start body
 			  $r->print(&Apache::loncommon::start_page(undef,$allscript,
 								   {'force_register' => 1,
-								    'bgcolor'        => '#ffffff',}));
+								    'bgcolor'        => '#ffffff',
+								    'hide_buttons'   => $pagebuttonshide}));
 # ------------------------------------------------------------------ Start form
 			  if ($nforms) {
-			      $r->print('<form name="lonhomework" method="post"  enctype="multipart/form-data" action="'.
+			      my $fmtag = '<form name="lonhomework" method="post"  enctype="multipart/form-data"';
+                              if ($nuploads) {
+                                  my $multi;
+                                  if ($nuploads > 1) {
+                                      $multi = 1;
+                                  }
+                                  $fmtag .= 'onsubmit="return file_submission_check(this,'."'$turninparent','$multi'".');"';
+                              }
+                              $fmtag .= ' action="'.
 					&Apache::lonenc::check_encrypt($requrl)
-					.'">');
+					.'" id="LC_page">';
+                              $r->print($fmtag);
 			  }
-		      } elsif ($target eq 'tex') {
-			  $r->print('\documentclass{article}
-                                 \newcommand{\keephidden}[1]{}           
-                                 \usepackage[dvips]{graphicx}
-                                 \usepackage{epsfig}
-                                 \usepackage{calc}
-                                 \usepackage{longtable}
-                                 \begin{document}');
+		      } elsif (($target eq 'tex') || ($target eq 'tex_answer')) {
+			  #  I think this is not needed as the header
+			  # will be put in for each of the page parts
+			  # by the londefdef.pm now that we are opening up
+			  # the parts of a page.
+			  #$r->print('\documentclass{article}
+                          #       \newcommand{\keephidden}[1]{}           
+                          #       \usepackage[dvips]{graphicx}
+                          #       \usepackage{epsfig}
+                          #       \usepackage{calc}
+                          #       \usepackage{longtable}
+                          #       \begin{document}');
 		      }
 # ----------------------------------------------------------------- Start table
-		      if ($target eq 'tex') {
-			  $r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead ');
+		      if (($target eq 'tex') || ($target eq 'tex_answer')) {
+#			 #  $r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead ');
 			  if ($number_of_columns le $lcm) {$number_of_columns=$lcm;};
 		      } else {
 			  $r->print('<table width="100%" cols="'.$lcm.'" border="0">');
@@ -415,20 +739,19 @@ sub handler {
 # generate rows
                       for ($i=0;$i<=$#rows;$i++) {
 			if ($rows[$i]) {
-			    unless ($target eq 'tex') {
+			    unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				$r->print("\n<tr>");
 			    }
                           my @colcont=split(/\&/,$rows[$i]);
                           my $avespan=$lcm/($#colcont+1);
                           for ($j=0;$j<=$#colcont;$j++) {
                               my $rid=$colcont[$j];
-
-			      my $metainfo =&get_buttons(\%hash,$rid).'<br />';
-			    unless ($target eq 'tex') {
+			      my $metainfo =&get_buttons(\%hash,$rid,\%buttonshide).'<br />';
+			    unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				$r->print('<td colspan="'.$avespan.'"');
 			    }
-                              if ($cellemb{$rid} eq 'ssi') {
-				  unless ($target eq 'tex') {
+                              if (($cellemb{$rid} eq 'ssi') || ($cellexternal{$rid})) {
+				  unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				      if ($ssibgcolor{$rid}) {
 					  $r->print(' bgcolor="'.
 						    $ssibgcolor{$rid}.'"');
@@ -449,14 +772,17 @@ sub handler {
 				      }             
 				      $r->print('>');
 				  }
-                                  $r->print($ssibody{$rid});	
-				  unless ($target eq 'tex') {
+                                  unless (($cellexternal{$rid}) && 
+                                          ($target eq 'tex') && ($target eq 'tex_answer')) {
+                                      $r->print($ssibody{$rid});
+                                  }
+				  unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				      $r->print('</font>');
                                   }
                                   if ($env{'course.'.
                                       $env{'request.course.id'}.
                                       '.pageseparators'} eq 'yes') {
-                                      unless($target eq 'tex') {
+                                      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
                                           $r->print('<hr />');
                                       } 
 				  }
@@ -467,37 +793,53 @@ sub handler {
                                   $r->print('>'.$metainfo.'<embed src="'.
                                     $hash{'src_'.$rid}.'"></embed>');
                               } elsif (&Apache::lonnet::declutter($hash{'src_'.$rid}) !~/\.(sequence|page)$/) {
-                                  $r->print($metainfo.'<b>'.$hash{'title_'.$rid}.'</b><br />'.
-                                  &mt('It is recommended that you use an up-to-date virus scanner before handling this file.').'</p><p><table>'.
-                                  &Apache::londocs::entryline(0,&mt("Click to download or use your browser's Save Link function"),'/'.&Apache::lonnet::declutter($hash{'src_'.$rid})).'</table></p><br />');
+                                  $r->print($metainfo.'<b>'.$hash{'title_'.$rid}.'</b><br />');
+                                  unless ($cellemb{$rid} eq 'wrp') {
+                                      $r->print(&mt('It is recommended that you use an up-to-date virus scanner before handling this file.'));
+                                  }
+                                  $r->print('</p><p><table>'.
+                                            &Apache::londocs::entryline(0,
+                                                                        &mt("Click to download or use your browser's Save Link function"),
+                                                                        '/'.&Apache::lonnet::declutter($hash{'src_'.$rid})).
+                                                                        '</table></p><br />');
                               }
-			      unless ($target eq 'tex') {
+			      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				  $r->print('</td>');
 			      } else {
-                                  for (my $incol=1;$incol<=$avespan;$incol++) {
-				      $r->print(' & ');
-				  }
+#                                  for (my $incol=1;$incol<=$avespan;$incol++) {
+#				      $r->print(' & ');
+#				  }
 			      }
                           }
-			      unless ($target eq 'tex') {
+			      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				  $r->print('</tr>');
 			      } else {
-				  $r->print('REMOVETHEHEADOFLONGTABLE\\\\');
+#				  $r->print('REMOVETHEHEADOFLONGTABLE\\\\');
 			      }
 		        }
                       }
-		      unless ($target eq 'tex') {
+		      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 			  $r->print("\n</table>");
 		      } else {
-			  $r->print('\end{longtable}\strut');
+#			  $r->print('\end{longtable}\strut');
 		      }
 # ---------------------------------------------------------------- Submit, etc.
                       if ($nforms) {
+                          my $class;
+                          if ($nforms > 1) {
+                              $class = ' class="LC_hwk_submit"';
+                              if ($ntimers) {
+                                  $nforms = 1;
+                                  $class = '';
+                              }
+                          }
                           $r->print(
-	                  '<input name="all_submit" value="Submit All" type="'.
-			  (($nforms>1)?'submit':'hidden').'"></input></form>');
+	                  '<input name="all_submit" value="'.&mt('Submit All').'" type="'.
+			  (($nforms>1)?'submit':'hidden').'"'.$class.' id="all_submit" />'.
+                          '<div id="msg_all_submit" style="display:none">'.
+                          &mt('Processing your submission ...').'</div></form>');
                       }
-		      unless ($target eq 'tex') {
+		      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 			  $r->print(&Apache::loncommon::end_page({'discussion'
 								      => 1,}));
 		      } else {
@@ -532,11 +874,7 @@ sub handler {
 }
 
 sub get_buttons {
-    my ($hash,$rid) = @_;
-
-    # which icons do we use?
-    my $extension='png';
-    if ($env{'environment.icons'} eq 'classic') { $extension='gif'; }
+    my ($hash,$rid,$buttonshide) = @_;
 
     my $metainfo = '';
     my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
@@ -544,25 +882,38 @@ sub get_buttons {
     my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid},
 					  $resid,
 					  $hash->{'src_'.$rid});
+    unless ($env{'request.role.adv'}) {
+        if ($buttonshide->{$symb} eq 'yes') {
+            return;
+        }
+    }
     if ($hash->{'encrypted_'.$rid}) {
 	$symb=&Apache::lonenc::encrypted($symb);
 	$esrc=&Apache::lonenc::encrypted($esrc);
     }
     if ($hash->{'src_'.$rid} !~ m-^/uploaded/-
+        && $hash->{'src_'.$rid} !~ m{^https?://}
 	&& !$env{'request.enc'}
 	&& ($env{'request.role.adv'}
 	    || !$hash->{'encrypted_'.$rid})) { 
 	$metainfo .='<a name="'.&escape($symb).'" />'.
 	    '<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'.
-	    '<img src="/adm/lonMisc/cat_button.'.$extension.'" class="LC_icon" />'.
+            '<img src="/res/adm/pages/catalog.png" class="LC_icon"'.
+            ' alt="'.&mt('Show Metadata').'"'.
+            ' title="'.&mt('Show Metadata').'" />'.
 	    '</a>';
     }
-    $metainfo .= '<a href="/adm/evaluate?postdata='.
-	&escape($esrc).
-	'" target="LONcatInfo">'.
-	'<img src="/adm/lonMisc/eval_button.'.$extension.'" class="LC_icon" />'.
-	'</a>';
-    if (($hash->{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
+    if (($hash->{'src_'.$rid} !~ m{^/uploaded/}) &&
+        ($hash->{'src_'.$rid} !~ m{^https?://})) {
+        $metainfo .= '<a href="/adm/evaluate?postdata='.
+	    &escape($esrc).
+	    '" target="LONcatInfo">'.
+            '<img src="/res/adm/pages/eval.png" class="LC_icon"'.
+            ' alt="'.&mt('Provide my evaluation of this resource').'"'.
+            ' title="'.&mt('Provide my evaluation of this resource').'" />'.
+	    '</a>';
+    }
+    if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) &&
 	($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {
 
 	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
@@ -570,12 +921,16 @@ sub get_buttons {
 		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=submission" target="LONcatInfo">'.
 		'&command=submission">'.
-		'<img src="/adm/lonMisc/subm_button.'.$extension.'" class="LC_icon" />'.
+                '<img src="/adm/lonMisc/subm_button.png" class="LC_icon"'.
+                ' alt="'.&mt('View Submissions for a Student or a Group of Students').'"'.
+                ' title="'.&mt('View Submissions for a Student or a Group of Students').'" />'.
 		'</a>'.
 		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=gradingmenu" target="LONcatInfo">'.
 		'&command=gradingmenu">'.
-		'<img src="/adm/lonMisc/pgrd_button.'.$extension.'" class="LC_icon" />'.
+                '<img src="/res/adm/pages/pgrd.png" class="LC_icon"'.
+                ' alt="'.&mt('Content Grades').'"'.
+                ' title="'.&mt('Content Grades').'" />'.
 		'</a>';
 	}
 	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
@@ -583,13 +938,80 @@ sub get_buttons {
 		'<a href="/adm/parmset?symb='.&escape($symb).
 #               '" target="LONcatInfo">'.
 		'" >'.
-		'<img src="/adm/lonMisc/pprm_button.'.$extension.'" class="LC_icon" />'.
+                '<img src="/adm/lonMisc/pprm_button.png" class="LC_icon"'.
+                ' alt="'.&mt('Content Settings').'"'.
+                ' title="'.&mt('Content Settings').'" />'.
 		'</a>';
 	}
     }
+    if (($env{'request.course.id'}) && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $file=&Apache::lonnet::declutter($hash->{'src_'.$rid});
+        my ($cfile,$home,$switchserver,$forceedit,$forceview) =
+            &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb);
+        if ($cfile ne '') {
+            my $hostname = $r->hostname();
+            my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
+                                                                 $forceedit,1,$symb,undef,
+                                                                 &escape($env{'form.title'}),
+                                                                 $hostname);
+            if ($jscall) {
+                my $icon = 'pcstr.png';
+                my $label = &mt('Edit');
+                my $title = &mt('Edit this resource');
+                my $pic = '<img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$icon).'"'.
+                          ' class="LC_icon" alt="'.$label.'" title="'.$title.'" />';
+                $metainfo .= '&nbsp;<a href="javascript:'.$jscall.';">'.$pic.'</a>';
+            }
+        }
+    }
     return $metainfo;
 }
 
+sub add_countdown_timer {
+    my ($currdisp,$donebuttontime,$donebuttonextras) = @_;
+    my ($collapse,$expand,$alttxt,$title,$donebutton);
+    if ($currdisp eq 'inline') {
+        $collapse = '&#9658;&nbsp;';
+    } else {
+        $expand = '&#9668;&nbsp;';
+    }
+    if ($donebuttontime) {
+        my ($type,$proctor,$donebuttontext);
+        if (ref($donebuttonextras) eq 'HASH') {
+            $proctor = $donebuttonextras->{'proctor'};
+            $donebuttontext = $donebuttonextras->{'text'};
+            $type = $donebuttonextras->{'type'};
+        } else {
+            $donebuttontext = &mt('Done');
+            $type = 'map';
+        }
+        $donebutton = 
+            &Apache::lonmenu::done_button_js($type,'','',$proctor,$donebuttontext);
+    }
+    unless ($env{'environment.icons'} eq 'iconsonly') {
+        $alttxt = &mt('Timer');
+        $title = $alttxt.'&nbsp;';
+    }
+    my $desc = &mt('Countdown to due date/time');
+    my $output = <<END;
+$donebutton
+<a href="javascript:toggleCountdown();" class="LC_menubuttons_link">
+<span id="ddcountcollapse" class="LC_menubuttons_inline_text">
+$collapse
+</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" alt="$alttxt" /><span class="LC_menubuttons_inline_text">$title</span></a>
+END
+    &Apache::lonhtmlcommon::clear_breadcrumb_tools();
+    &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$output);
+    return;
+}
+
+
 1;
 __END__