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

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.317 and 1.320

version 1.317, 2012/05/29 01:11:30 version 1.320, 2012/09/04 10:46:05
Line 209  dependencies for a web page uploaded dir Line 209  dependencies for a web page uploaded dir
 =cut  =cut
   
 sub dependencycheck_js {  sub dependencycheck_js {
     my ($symb,$title) = @_;      my ($symb,$title,$url) = @_;
     my $link = '/adm/dependencies?symb='.&HTML::Entities::encode($symb,'<>&"').      my $link = '/adm/dependencies?symb='.&HTML::Entities::encode($symb,'<>&"').
                '&title='.&HTML::Entities::encode($title,'<>&"');                 '&title='.&HTML::Entities::encode($title,'<>&"').
                  '&url='.&HTML::Entities::encode($url,'<>&"');
     return <<ENDJS;      return <<ENDJS;
                 <script type="text/javascript">                  <script type="text/javascript">
                 // <![CDATA[                  // <![CDATA[
Line 1210  ENDEDITOR Line 1211  ENDEDITOR
 <link rel="stylesheet" type="text/css" href="/adm/jpicker/css/jPicker-1.1.6.min.css" />  <link rel="stylesheet" type="text/css" href="/adm/jpicker/css/jPicker-1.1.6.min.css" />
 <script type="text/javascript" src="/adm/countdown/js/jquery.countdown.js"></script>  <script type="text/javascript" src="/adm/countdown/js/jquery.countdown.js"></script>
 <link rel="stylesheet" type="text/css" href="/adm/countdown/css/jquery.countdown.css" />  <link rel="stylesheet" type="text/css" href="/adm/countdown/css/jquery.countdown.css" />
   
   <script type="text/javascript" src="/adm/spellchecker/js/jquery.spellchecker.js"></script>
   <link rel="stylesheet" type="text/css" href="/adm/spellchecker/css/spellchecker.css" />
   
 ENDJQUERY  ENDJQUERY
  return $s;   return $s;
 }  }
Line 1453  sub show_return_link { Line 1458  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($|\?)})) {
Removed from v.1.317  
changed lines
  Added in v.1.320

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