--- rat/lonratedt.pm	2006/05/30 17:15:10	1.78
+++ rat/lonratedt.pm	2006/09/12 22:13:12	1.83
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.78 2006/05/30 17:15:10 www Exp $
+# $Id: lonratedt.pm,v 1.83 2006/09/12 22:13:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -649,7 +649,8 @@ sub getparameter {
 # ----------------------------------------------------------------- Edit script
 sub editscript {
     my $mode=shift;
-    my $resurl=&Apache::loncommon::lastresurl();
+    my $resurl=
+	&Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
     return(<<ENDSCRIPT);
 var srch;
 var srchflag=-1; // 1 means currently open
@@ -691,18 +692,18 @@ function srchclose() {
 
 // -------------------------------------------------------- Open indexer window
 function idxopen(mode) {
-   var options="scrollbars=1,resizable=1,menubar=0";
+   var options="scrollbars=1,resizable=1,menubar=0,location=1,toolbar=1";
    idxmode=mode;
    idxflag=1;
-   idx=open("$resurl/?launch=1&mode=$mode&catalogmode="+mode,"idxout",options);
+   idx=open('$resurl/?launch=1&mode=$mode&catalogmode='+mode,'idxout',options);
    idx.focus();
 }
 
 // ------------------------------------------------------ Open groupsort window
-function groupopen(url,recover) {
+function groupopen(url,recover,bookmarks) {
    var options="scrollbars=1,resizable=1,menubar=0";
    idxflag=1;
-   idx=open("/adm/groupsort?mode=$mode&recover="+recover+"&readfile="+url,"idxout",options);
+   idx=open("/adm/groupsort?mode=$mode&recover="+recover+"&readfile="+url+"&bookmarks="+bookmarks,"idxout",options);
    idx.focus();
 }
 
@@ -716,11 +717,11 @@ function srchopen(mode) {
 }
 // ----------------------------------------------------- launch indexer browser
 function groupsearch() {
-   srchcheck('groupsearch');
+   srchcheck('import');
 }
 
 function groupimport() {
-   idxcheck('groupimport');
+   idxcheck('import');
 }
 
 // ------------------------------------------------------- Do srch status check
@@ -757,7 +758,7 @@ function idxcheck(mode) {
         }
         url += 'element=' + elementname + '';
         var title = 'Browser';
-        var options = 'scrollbars=1,resizable=1,menubar=0';
+        var options = 'scrollbars=1,resizable=1,menubar=0,toolbar=1,location=1';
         options += ',width=700,height=600';
         editbrowser = open(url,title,options,'1');
         editbrowser.focus();
@@ -1037,6 +1038,7 @@ sub smpedt {
 				      'nt' => 'New Title',
 				      'se' => 'Search',
 				      'im' => 'Import',
+                                      'bk' => 'Import Bookmarks',
 				      'vi' => 'View',
 				      'lm' => 'Load Map',
 				      'ds' => 'Discard Selected',
@@ -1100,10 +1102,9 @@ sub smpedt {
 ENDJS
 
     my $start_page = &Apache::loncommon::start_page(undef,$js).
-        &Apache::loncommon::help_open_menu('',
-					   'Sequence_Simple_Editor_Creation',
+        &Apache::loncommon::help_open_menu('Sequence_Simple_Editor_Creation',
 					   'Sequence_Simple_Editor_Creation',
-					   '',6,'RAT');    
+					   6,'RAT');    
     my $end_page = &Apache::loncommon::end_page();
 
     $r->print(<<ENDSMPHEAD);
@@ -1139,7 +1140,9 @@ value="Select Map"><input type=submit na
 <input type=button onClick=
 "javascript:impfortarget.value=1;groupimport();" value="$lt{'im'}">
 <input type=button onClick=
-"javascript:impfortarget.value=1;javascript:groupopen('$url',1);" value="$lt{'reco'}">
+"javascript:impfortarget.value=1;groupopen(0,1,1);" value="$lt{'bk'}">
+<input type=button onClick=
+"javascript:impfortarget.value=1;groupopen('$url',1,0);" value="$lt{'reco'}">
 $lt{'as'}
 <hr>
 <input type=submit name="moveup" value="$lt{'mu'}">
@@ -1195,7 +1198,7 @@ sub viewmap {
     my ($r,$url,$adv,$errtext)=@_;
     $r->print(
 	      &Apache::loncommon::start_page('Edit Content of a Map').
-	      &Apache::loncommon::help_open_menu('','','','',6,'RAT').
+	      &Apache::loncommon::help_open_menu('','',6,'RAT').
 	      &buttons($adv));
     if ($errtext) {
 	$r->print($errtext.'<hr />');