--- loncom/interface/loncommon.pm	2011/05/03 21:38:40	1.1003
+++ loncom/interface/loncommon.pm	2011/05/27 18:36:51	1.1006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1003 2011/05/03 21:38:40 www Exp $
+# $Id: loncommon.pm,v 1.1006 2011/05/27 18:36:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -438,21 +438,21 @@ ENDSTDBRW
 
 sub resourcebrowser_javascript {
    unless ($env{'request.course.id'}) { return ''; }
-   return (<<'ENDSTDBRW');
+   return (<<'ENDRESBRW');
 <script type="text/javascript" language="Javascript">
 // <![CDATA[
     var reseditbrowser;
-    function openresbrowser(formname,uname,udom,clicker,roleflag,ignorefilter,courseadvonly) {
-        var url = '/adm/pickresource?';
+    function openresbrowser(formname,reslink) {
+        var url = '/adm/pickresource?form='+formname+'&reslink='+reslink;
         var title = 'Resource_Browser';
         var options = 'scrollbars=1,resizable=1,menubar=0';
-        options += ',width=700,height=600';
-        stdeditbrowser = open(url,title,options,'1');
-        stdeditbrowser.focus();
+        options += ',width=700,height=500';
+        reseditbrowser = open(url,title,options,'1');
+        reseditbrowser.focus();
     }
 // ]]>
 </script>
-ENDSTDBRW
+ENDRESBRW
 }
 
 sub selectstudent_link {
@@ -483,6 +483,19 @@ sub selectstudent_link {
    return '';
 }
 
+sub selectresource_link {
+   my ($form,$reslink,$arg)=@_;
+   
+   my $callargs = "'".&Apache::lonhtmlcommon::entity_encode($form)."','".
+                      &Apache::lonhtmlcommon::entity_encode($reslink)."'";
+   unless ($env{'request.course.id'}) { return $arg; }
+   return '<span class="LC_nobreak">'.
+              '<a href="javascript:openresbrowser('.$callargs.');">'.
+              $arg.'</a></span>';
+}
+
+
+
 sub authorbrowser_javascript {
     return <<"ENDAUTHORBRW";
 <script type="text/javascript" language="JavaScript">
@@ -8916,7 +8929,7 @@ sub modify_html_refs {
                 if ($allfiles{$ref}) {
                     my $newname =  $orig;
                     my ($attrib_regexp,$codebase);
-                    my $attrib_regexp = &unescape($env{'form.embedded_attrib_'.$i});
+                    $attrib_regexp = &unescape($env{'form.embedded_attrib_'.$i});
                     if ($attrib_regexp =~ /:/) {
                         $attrib_regexp =~ s/\:/|/g;
                     }
@@ -8925,7 +8938,7 @@ sub modify_html_refs {
                         $count += $numchg;
                     }
                     if ($env{'form.embedded_codebase_'.$i} ne '') {
-                        my $codebase = &unescape($env{'form.embedded_codebase_'.$i});
+                        $codebase = &unescape($env{'form.embedded_codebase_'.$i});
                         my $numchg = ($content =~ s/(codebase\s*=\s*["']?)\Q$codebase\E(["']?)/$1.$2/i); #' stupid emacs
                         $codebasecount ++;
                     }