--- loncom/interface/lonhtmlcommon.pm	2011/07/28 03:14:04	1.291
+++ loncom/interface/lonhtmlcommon.pm	2011/12/08 21:37:46	1.295
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.291 2011/07/28 03:14:04 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.295 2011/12/08 21:37:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -748,13 +748,12 @@ parameter setting wizard.
 sub pjump_javascript_definition {
     my $Str = <<END;
     function pjump(type,dis,value,marker,ret,call,hour,min,sec) {
-        parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
+        openMyModal("/adm/rat/parameter.html?type="+escape(type)
                  +"&value="+escape(value)+"&marker="+escape(marker)
                  +"&return="+escape(ret)
                  +"&call="+escape(call)+"&name="+escape(dis)
                  +"&defhour="+escape(hour)+"&defmin="+escape(min)
-                 +"&defsec="+escape(sec),"LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
+                 +"&defsec="+escape(sec)+"&modal=1",350,350,'no');
     }
 END
     return $Str;
@@ -1244,9 +1243,9 @@ sub htmlareaheaders {
 ENDEDITOR
 	}
     $s.=(<<ENDJQUERY);
-<script type="text/javascript" src="/adm/jQuery/js/jquery-1.3.2.min.js"></script>
-<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.7.2.custom.min.js"></script>
-<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.7.2.custom.css" />
+<script type="text/javascript" src="/adm/jQuery/js/jquery-1.6.2.min.js"></script>
+<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.8.16.custom.min.js"></script>
+<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.8.16.custom.css" />
 ENDJQUERY
 	return $s;
 }
@@ -2344,7 +2343,7 @@ sub file_submissionchk_js {
                       &mt('Continue submission and overwrite the file(s)?');
     my $delfilewarn = &mt('You have indicated you wish to remove some files previously included in your submission.').'\\n'.
                       &mt('Continue submission with these files removed?');
-    my ($turninpathtext,$multtext);
+    my ($turninpathtext,$multtext,$arrayindexofjs);
     if (ref($turninpaths) eq 'HASH') {
         foreach my $key (sort(keys(%{$turninpaths}))) {
             $turninpathtext .= "    if (prefix == '$key') {\n".
@@ -2361,6 +2360,8 @@ sub file_submissionchk_js {
         }
     }
     $multtext .= "    return '';\n";
+
+    $arrayindexofjs = &Apache::loncommon::javascript_array_indexof();
     return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -2573,6 +2574,8 @@ $turninpathtext
 // ]]>
 </script>
 
+$arrayindexofjs
+
 ENDSCRIPT
 }