[BACK]Return to lonhtmlcommon.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.314 and 1.318

version 1.314, 2012/05/28 13:09:17 version 1.318, 2012/06/04 16:59:00
Line 95  sub direct_parm_link { Line 95  sub direct_parm_link {
     $filter=&entity_encode($filter);      $filter=&entity_encode($filter);
     $part=&entity_encode($part);      $part=&entity_encode($part);
     if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {      if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {
        return "<a target='_top' href='/adm/parmset?symb=$symb&filter=$filter&part=$part'><span class='LC_setting'>$linktext</span></a>";         return "<a target='_top' href='/adm/parmset?symb=$symb&amp;filter=$filter&amp;part=$part'><span class='LC_setting'>$linktext</span></a>";
     } else {      } else {
        return $linktext;         return $linktext;
     }      }
Line 1453  sub show_return_link { Line 1453  sub show_return_link {
   
     unless ($env{'request.course.id'}) { return 0; }      unless ($env{'request.course.id'}) { return 0; }
     if ($env{'request.noversionuri'}=~m{^/priv/} ||      if ($env{'request.noversionuri'}=~m{^/priv/} ||
         $env{'request.uri'}=~m{^/~}) { return 1; }          $env{'request.uri'}=~m{^/priv/}) { return 1; }
   
     if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})      if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
         || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {          || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {
Line 1492  sub set_due_date { Line 1492  sub set_due_date {
     # The code should correct for gross differences between the server      # The code should correct for gross differences between the server
     # and client's time setting      # and client's time setting
   
     my $js = "       return <<"END";
 <script type='text/javascript'>  
   <script type="text/javascript">
   //<![CDATA[    //<![CDATA[
 var serverDueDate = $duems;  var serverDueDate = $duems;
 var serverTime    = $now;  var serverTime    = $now;
Line 1502  var dueDate       = new Date(serverDueDa Line 1503  var dueDate       = new Date(serverDueDa
   
   //]]>    //]]>
 </script>  </script>
 ";  
   
     return $js;  END
 }  }
 ##  ##
 # Sets the time at which the problem finished computing.  # Sets the time at which the problem finished computing.
Line 1516  var dueDate       = new Date(serverDueDa Line 1516  var dueDate       = new Date(serverDueDa
 sub set_compute_end_time {  sub set_compute_end_time {
   
     my $now = time()*1000; # Javascript times are in ms.      my $now = time()*1000; # Javascript times are in ms.
     my $js = "      return <<"END";
 <script type='text/javascript'>  
   <script type="text/javascript">
 //<![CDATA[  //<![CDATA[
 serverTime = $now;  serverTime = $now;
 clientTime = (new Date()).getTime();  clientTime = (new Date()).getTime();
 //]]>  //]]>
 </script>  </script>
   
 ";  END
     return $js;  
       
 }  }
   
 ############################################################  ############################################################
Line 1618  returns: nothing Line 1617  returns: nothing
         my $links;          my $links;
         if ((&show_return_link) && (!$CourseBreadcrumbs)) {          if ((&show_return_link) && (!$CourseBreadcrumbs)) {
             my $alttext = &mt('Go Back');              my $alttext = &mt('Go Back');
             $links=&htmltag( 'a',"<img src='/res/adm/pages/reload.png' border='0' style='vertical-align:middle;' alt='$alttext' />",              $links=&htmltag( 'a','<img src="/res/adm/pages/tolastloc.png" alt="'.$alttext.'" class="LC_icon" />',
                             { href => '/adm/flip?postdata=return:',                              { href => '/adm/flip?postdata=return:',
                               title => &mt("Back to most recent content resource") });                                title => &mt('Back to most recent content resource'),
                                 class => 'LC_menubuttons_link',
                               });
             $links=&htmltag('li',$links);              $links=&htmltag('li',$links);
         }          }
         $links.= join "",           $links.= join "", 
Removed from v.1.314  
changed lines
  Added in v.1.318

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>