--- loncom/xml/scripttag.pm	2015/01/19 15:36:16	1.173
+++ loncom/xml/scripttag.pm	2023/11/07 12:26:01	1.176
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.173 2015/01/19 15:36:16 goltermann Exp $
+# $Id: scripttag.pm,v 1.176 2023/11/07 12:26:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,6 +30,7 @@ package Apache::scripttag;
 
 use strict;
 use Apache::lonnet;
+use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonxml();
 use Apache::londefdef();
@@ -123,14 +124,15 @@ sub start_script {
 
         my $depth = $Apache::lonxml::curdepth;
         $result.='<span id="LC_edit_problem_codemirror">';
-        unless ($env{'environment.nocodemirror'}) {
+        my $nocodemirror = &Apache::loncommon::nocodemirror();
+        unless ($nocodemirror) {
             # only show button if codemirror activated
             $result.='<input type="button" id="fitsize'.$depth.'" value="'.&mt("Dynamic size").
             '" onclick="autosize(\''.$depth.'\')" />';
         }
         $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4).'</span>';
 
-        unless ($env{'environment.nocodemirror'}) {
+        unless ($nocodemirror) {
             $result.='<script type="text/javascript">
                 var cm'.$depth.' = CodeMirror.fromTextArea(document.getElementById("homework_edit_'.$depth.'"),
                 {
@@ -364,7 +366,7 @@ sub start_scriptlib {
     $result=
       &Apache::edit::tag_start($target,$token,'New Script Functions').
 	&Apache::edit::editline($token->[1],$bodytext,'scriptlib',40).
-            &Apache::edit::browse(undef,'textnode').
+            &Apache::edit::browse_or_search(undef,'textnode').
 	  $error.'</td></tr>'.
 	    &Apache::edit::end_table();
   }
@@ -616,9 +618,11 @@ sub start_import {
     my $location=$token->[1];
     $location=~s/^\s*//s;
     $location=~s/\s*$//s;
+    my $crsonly = join(',',(&Apache::loncommon::filecategorytypes('Problem'),
+                            &Apache::loncommon::filecategorytypes('Library')));
     $result.=&Apache::edit::editline($location,$bodytext,'',40);
-    $result.=&Apache::edit::browse(undef,'textnode');
-    $result.= '&nbsp;<label>'.&mt('Import as:').
+    $result.=&Apache::edit::browse_or_search(undef,'textnode',undef,undef,$crsonly);
+    $result.= '&nbsp;<span class="LC_nobreak"><label>'.&mt('Import as:').
               '<select name="importmode_'.$Apache::lonxml::curdepth.'">';
     my %options=&Apache::lonlocal::texthash(''        => 'as standard library',
                                             'problem' => 'as problem',
@@ -630,7 +634,7 @@ sub start_import {
        }
        $result.='>'.$options{$option}.'</option>';
     }
-    $result.='</select></label>';
+    $result.='</select></label></span>';
     #FIXME this need to convert $bodytext to be a contruction space reference
     #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
     #$result.="Click<a href=\"$location\">here</a> to edit<br />"
@@ -679,12 +683,14 @@ sub end_storetc {
 
 sub start_physnet {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    my $bodytext = '/adm/includes/physnet.sty';
+    my $bodytext = '/res/adm/includes/physnet.sty';
     my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
     my $cbistyletext=&Apache::lonnet::getfile($location);
 
     %$style = (%$style,&Apache::style::styleparser($target,$cbistyletext));
-    $$parser['-1']->unget_token($token);
+    if (keys(%$style) && (($target eq 'web') || ($target eq 'tex'))) {
+        $$parser['-1']->unget_token($token);
+    }
 #    if ( defined($$style{'physnet'}) ) {
 #        &Apache::lonxml::newparser($parser,\$$style{'physnet'});
 #    }