loncom/interface/lonhtmlcommon.pm - diff

Return to lonhtmlcommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

-version 1.333, 2012/11/29 20:13:43
+version 1.334, 2012/11/29 20:37:07
  Line 209  dependencies for a web page uploaded dir
  =cut
  sub dependencycheck_js {
-     my ($symb,$title,$url) = @_;
+     my ($symb,$title,$url,$folderpath,$uri) = @_;
-     my $link = '/adm/dependencies?symb='.&HTML::Entities::encode($symb,'<>&"').
+     my $link;
-                '&title='.&HTML::Entities::encode($title,'<>&"').
+     if ($symb) {
-                '&url='.&HTML::Entities::encode($url,'<>&"');
+         $link = '/adm/dependencies?symb='.&HTML::Entities::encode($symb,'<>&"');
+     } elsif ($folderpath) {
+         $link = '/adm/dependencies?folderpath='.&HTML::Entities::encode($folderpath,'<>&"');
+          $url = $uri;
+     }
+     $link .= (($link=~/\?/)?'&amp;':'?').'title='.
+              &HTML::Entities::encode($title,'<>&"');
+     if ($url) {
+         $link .= '&url='.&HTML::Entities::encode($url,'<>&"');
+     }
      return <<ENDJS;
                  <script type="text/javascript">
                  // <![CDATA[