--- rat/lonratedt.pm	2002/08/30 22:28:05	1.31.2.1
+++ rat/lonratedt.pm	2007/01/16 21:10:55	1.87
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.31.2.1 2002/08/30 22:28:05 albertel Exp $
+# $Id: lonratedt.pm,v 1.87 2007/01/16 21:10:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,243 +25,184 @@
 #
 # http://www.lon-capa.org/
 #
-# (TeX Content Handler
-#
-# 05/29/00,05/30 Gerd Kortemeyer)
-# 7/1,6/30 Gerd Kortemeyer
+
 
 package Apache::lonratedt;
 
-use strict;
-use Apache::Constants qw(:common);
-use Apache::lonnet;
-use Apache::lonratsrv;
-use Apache::lonsequence;
+=pod
 
-use vars qw(@order @resources);
+=head1 NAME
 
+Apache::lonratedt: simple resource assembly tool
 
-# Mapread read maps into global arrays @links and @resources, determines status
-# sets @order - pointer to resources in right order
-# sets @resources - array with the resources with correct idx
-#
-sub mapread {
-    my $fn=shift;
+=head1 SYNOPSIS
 
-    my @links;
-    undef @links;
-    undef @resources;
-    undef @order;
-    @resources=('');
-    @order=();
-
-    my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
-    if ($errtext) { return ($errtext,2); }
-
-# -------------------------------------------------------------------- Read map
-    foreach (split(/\<\&\>/,$outtext)) {
-	my ($command,$number,$content)=split(/\<\:\>/,$_);
-        if ($command eq 'objcont') {
-	    $resources[$number]=$content;
-        }
-        if ($command eq 'objlinks') {
-            $links[$number]=$content;
-        }
-        if ($command eq 'objparms') {
-	    return('Map has resource parameters. Use advanced editor.',1);
-        }
-    }
-# ------------------------------------------------------- Is this a linear map?
-    my @starters=();
-    my @endings=();
-    undef @starters;
-    undef @endings;
-
-    foreach (@links) {
-        if (defined($_)) {
-	    my ($start,$end,$cond)=split(/\:/,$_);
-            if ((defined($starters[$start])) || (defined($endings[$end]))) { 
-		return
-                 ('Map has branchings. Use advanced editor.',1);
-            }
-	    $starters[$start]=1;
-	    $endings[$end]=1;
-	    if ($cond) {
-		return
-                 ('Map has conditions. Use advanced editor.',1);
-            }
-	}
+lonratedt provides the routines and the handler for the Advanced
+    Resource Assembly Tool (RAT), and ties the various pieces together
+    with Javascript.
 
-    }
-    for (my $i=1; $i<=$#resources; $i++) {
-        if (defined($resources[$i])) {
-	    unless (($starters[$i]) || ($endings[$i])) {
-                return
-		 ('Map has unconnected resources. Use advanced editor.',1);
-            }
-        }
-    }
+=head1 OVERVIEW
 
-# -------------------------------------------------- This is a linear map, sort
+=head2 Map Representation
 
-    my $startidx=0;
-    my $endidx=0;
-    for (my $i=0; $i<=$#resources; $i++) {
-        if (defined($resources[$i])) {
-            my ($title,$url,$ext,$type)=split(/\:/,$resources[$i]);
-	    if ($type eq 'start') { $startidx=$i; }
-            if ($type eq 'finish') { $endidx=$i; }
-        }
-    }
-    my $k=0;
-    my $currentidx=$startidx;
-    $order[$k]=$currentidx;
-    for (my $i=0; $i<=$#resources; $i++) {
-        foreach (@links) {
-	    my ($start,$end)=split(/\:/,$_);
-            if ($start==$currentidx) {
-		$currentidx=$end;
-                $k++;
-                $order[$k]=$currentidx;
-                last;
-            }
-        }
-        if ($currentidx==$endidx) { last; }
-    }
-    return $errtext;
-}
+=begin latex
 
-# ---------------------------------------------- Read a map as well as possible
-# Also used by the sequence handler
-# Call lonsequence::attemptread to read from resource space
-#
-sub attemptread {
-    my $fn=shift;
+%
+\begin{figure}
+\begin{center}\includegraphics[%
+  width=0.55\paperwidth,bb = 0 0 200 100, draft, type=eps]{Map_Example}\end{center}
 
-    my @links;
-    undef @links;
-    my @theseres;
-    undef @theseres;
-
-    my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
-    if ($errtext) { return @theseres }
-
-# -------------------------------------------------------------------- Read map
-    foreach (split(/\<\&\>/,$outtext)) {
-	my ($command,$number,$content)=split(/\<\:\>/,$_);
-        if ($command eq 'objcont') {
-	    $theseres[$number]=$content;
-        }
-        if ($command eq 'objlinks') {
-            $links[$number]=$content;
-        }
-    }
 
-# --------------------------------------------------------------- Sort, sort of
+\caption{\label{Map_In_Advanced_Editor}Example of a Map in the Advanced Editor}
+\end{figure}
+%
+\begin{figure}
+\begin{lyxcode}
+<map>
 
-    my @objsort=();
-    undef @objsort;
+~~<resource~id=\char`\"{}1\char`\"{}
 
-    my @data1=();
-    my @data2=();
-    undef @data1;
-    undef @data2;
-
-    my $k;
-    my $kj;
-    my $j;
-    my $ij;
-
-   for ($k=1;$k<=$#theseres;$k++) {
-      if (defined($theseres[$k])) {
-         $objsort[$#objsort+1]=$k;
-      }
-   }
+~~~~src=\char`\"{}/res/msu/korte/phy231welcome.html\char`\"{}
 
-   for ($k=1;$k<=$#links;$k++) {
-     if (defined($links[$k])) {
-      @data1=split(/\:/,$links[$k]);
-      $kj=-1;
-      for (my $j=0;$j<=$#objsort;$j++) {
-         if ((split(/\:/,$objsort[$j]))[0]==$data1[0]) {
-            $kj=$j;
-         }
-      }
-      if ($kj!=-1) { $objsort[$kj].=':'.$data1[1]; }
-     }
-   }
-    for ($k=0;$k<=$#objsort;$k++) {
-      for ($j=0;$j<=$#objsort;$j++) {
-        if ($k!=$j) {
-          @data1=split(/\:/,$objsort[$k]);
-          @data2=split(/\:/,$objsort[$j]);
-          my $dol=$#data1+1;
-          my $dtl=$#data2+1;
-          if ($dol+$dtl<1000) {
-           for ($kj=1;$kj<$dol;$kj++) {
-             if ($data1[$kj]==$data2[0]) {
-                for ($ij=1;$ij<$dtl;$ij++) {
-                   $data1[$#data1+1]=$data2[$ij];
-                }
-             }
-           }
-           for ($kj=1;$kj<$dtl;$kj++) {
-             if ($data2[$kj]==$data1[0]) {
-                 for ($ij=1;$ij<$dol;$ij++) {
-                    $data2[$#data2+1]=$data1[$ij];
-                 }
-             }
-           }
-           $objsort[$k]=join(':',@data1);
-           $objsort[$j]=join(':',@data2);
-          }
-         }
-      } 
-  }
-# ---------------------------------------------------------------- Now sort out
+~~~~type=\char`\"{}start\char`\"{}
 
-    @objsort=sort {
-      my @data1=split(/\:/,$a);
-      my @data2=split(/\:/,$b);
-      my $rvalue=0;
-      my $k;
-      for ($k=1;$k<=$#data1;$k++) {
-         if ($data1[$k]==$data2[0]) { $rvalue--; }
-      }
-      for ($k=1;$k<=$#data2;$k++) {
-         if ($data2[$k]==$data1[0]) { $rvalue++; }
-      }
-      if ($rvalue==0) { $rvalue=$#data2-$#data1; }
-      $rvalue;
-    } @objsort;
+~~~~title=\char`\"{}Start\char`\"{}>
 
-    my @outres=();
-    undef @outres;
+~~~~</resource>
 
-    for ($k=0;$k<=$#objsort;$k++) {
-	$outres[$k]=$theseres[(split(/\:/,$objsort[$k]))[0]];
-    }
-    return @outres;
-}
+~~<resource~id=\char`\"{}2\char`\"{}
+
+~~~~src=\char`\"{}\char`\"{}~type=\char`\"{}finish\char`\"{}
+
+~~~~title=\char`\"{}Finish\char`\"{}>
+
+~~~~</resource>
+
+~~<resource~id=\char`\"{}6\char`\"{}
+
+~~~~src=\char`\"{}/res/msu/korte/tests/units.problem\char`\"{}
+
+~~~~type=\char`\"{}mandatory\char`\"{}
+
+~~~~title=\char`\"{}Physical~Units~Test\char`\"{}>
+
+~~~~</resource>
+
+~~<resource~id=\char`\"{}9\char`\"{}
+
+~~~~src=\char`\"{}/res/msu/korte/chapters/onedim.sequence\char`\"{}
+
+~~~~title=\char`\"{}Motion~in~One~Dimension\char`\"{}>
+
+~~~~</resource>
+
+~~<resource~id=\char`\"{}11\char`\"{}
+
+~~~~src=\char`\"{}/res/msu/bauer/bridges/units.sequence\char`\"{}
+
+~~~~title=\char`\"{}Physical~Units~Refresher\char`\"{}>
+
+~~~~</resource>
+
+~~<condition~id=\char`\"{}19\char`\"{}
+
+~~~~type=\char`\"{}stop\char`\"{}
+
+~~~~value=\char`\"{}user.assessments{[}this./res/msu/korte/tests/units.problem{]}.status=solved\char`\"{}>
+
+~~~~</condition>
+
+~~<link~from=\char`\"{}1\char`\"{}~to=\char`\"{}6\char`\"{}></link>
+
+~~<link~from=\char`\"{}6\char`\"{}~to=\char`\"{}9\char`\"{}~condition=\char`\"{}19\char`\"{}></link>
+
+~~<link~from=\char`\"{}6\char`\"{}~to=\char`\"{}11\char`\"{}></link>
+
+~~<link~from=\char`\"{}11\char`\"{}~to=\char`\"{}6\char`\"{}></link>
+
+~~</map>
+\end{lyxcode}
+
+\caption{\label{XML}XML for Map in Figure \ref{Map_In_Advanced_Editor}}
+\end{figure}
+
+=end latex
+
+Fig. "XML for Map in Figure" shows the XML representation of the
+resource map shown in Fig. "Example of a Map in the Advanced Editor",
+which is the format in which maps are stored. In the figure, however,
+additional graphical map layout information generated by the Advanced
+Resource Assembly Tool is not displayed. This graphical information is
+optional to re-generate the same graphical layout when the map is
+brought up again in the Resource Assembly Tool, and is not needed for
+any other system functionality.
+
+Maps can be generated by tools other than the Resource Assembly
+Tool. In particular, an author might have some other representation of
+a course sequence, which can be converted into a map using scripts. If
+this map then were to be brought up in the Resource Assembly Tool, the
+Tool would automatically generate a graphical layout for it. Each
+entry of the map (resources, conditions and links) is stored in a
+separate tag.
+
+Resources and conditionsX<conditions> have to have unique ID
+numbers. These numbers are automatically generated by the Resource
+Assembly Tool when the entry is first created, or added to the entries
+when a map generated outside the Resource Assembly Tool is first
+retrieved. They can also be assigned by custom scripts or added in by
+hand.
+
+In the XML example, entry 1 is the start resource of the map. When
+this map is accessed, the source (src) URL of this tag will be the
+first resource rendered. Entry 2 is the finish resource of this
+map. This resource will be the last resource in the sequence of
+resources. Entry 6 is a problem resource with the given URL and title,
+as well as the priority "mandatory". Entry 19 is a condition, which is
+used by the link between entries 6, the problem, and 9, a
+sequence. I<The final syntax for conditions has not yet been
+determined.>
+
+=cut
+
+use strict;
+use Apache::Constants qw(:common);
+use Apache::lonnet;
+use Apache::lonsequence();
+use Apache::loncommon();
+use Apache::lonlocal;
+use LONCAPA::map();
+use File::Copy;
+use LONCAPA;
+use HTML::Entities();
 
 # --------------------------------------------------------- Build up RAT screen
 sub ratedt {
   my ($r,$url)=@_;
-  $r->print(<<ENDDOCUMENT);
-
-<html>
-<head>
-<script language="JavaScript">
+  my %layout = ('border' => "0");
+    if ($env{'environment.remote'} eq 'off') {
+      $layout{'rows'} = "1,250,*";
+  } else {
+      $layout{'rows'} = "1,70,*";
+  }
+  my $js ='
+<script type="text/javascript">
     var flag=0;
-</script>
-</head>
-<frameset rows="1,50,*" border=0>
-<frame name=server src="$url/loadonly/ratserver" noresize noscroll>
-<frame name=code src="/adm/rat/code.html">
-<frame name=mapout src="/adm/rat/map.html">
-</frameset>
-</html>
+</script>';
+
+  my $start_page = 
+      &Apache::loncommon::start_page('Edit Sequence',$js,
+				     {'frameset'    => 1,
+				      'add_entries' => \%layout});
+  my $end_page = 
+      &Apache::loncommon::end_page({'frameset' => 1});
 
+  $r->print(<<ENDDOCUMENT);
+$start_page
+<frame name="server" src="$url/loadonly/ratserver" noresize="noresize"
+       noscroll="noscroll" />
+<frame name="code" src="$url/loadonly/adveditmenu" />
+<frame name="mapout" src="/adm/rat/map.html" />
+$end_page
 ENDDOCUMENT
 }
 
@@ -271,121 +212,181 @@ sub buttons {
     my $adv=shift;
     my $output='<form method=post>';     
     if ($adv==1) {
-	$output.='<input type=submit name=forceadv value="Edit">';
+	$output.='<input type=submit name=forceadv value="'.&mt('Edit').'">'.
+	    &Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');;
     } else {
         unless ($adv==2) {
-           $output.='<input type=submit name=forcesmp value="Simple Edit">';
+           $output.='<input type=submit name=forcesmp value="'.&mt('Simple Edit').'">'.
+	    &Apache::loncommon::help_open_topic('Sequence_Simple_Editor_Creation');
         }
-	$output.='<input type=submit name=forceadv value="Advanced Edit">';
+	$output.='<input type=submit name=forceadv value="'.&mt('Advanced Edit').'">'.
+	    &Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');
     }
     return $output.'</form><hr>';
 }
 
-# ----------------------------------------------------------- Paste into target
-# modifies @order, @resources
+# ----------------------------------------------------------------- Edit script
+sub editscript {
+    my $mode=shift;
+    my $resurl=
+	&Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
+    return(<<ENDSCRIPT);
+var srch;
+var srchflag=-1; // 1 means currently open
+                 // 0 means closed (but has been open)
+                 // -1 means never yet opened/defined
+var srchmode='';
 
-sub pastetarget {
-    my ($after,@which)=@_;
-    my @insertorder=();
-    foreach (@which) {
-        if (defined($_)) {
-	    my ($name,$url)=split(/\=/,$_);
-            $name=&Apache::lonnet::unescape($name);
-            $url=&Apache::lonnet::unescape($url);
-            if ($url) {
-	       my $idx=$#resources+1;
-               $insertorder[$#insertorder+1]=$idx;
-               my $ext='false';
-               if ($url=~/^http\:\/\//) { $ext='true'; }
-               $url=~s/\:/\&colon;/g;
-               $resources[$idx]=$name.':'.$url.':'.$ext.':normal:res';
-	   }
-        }
-    }
-    my @oldorder=splice(@order,$after);
-    @order=(@order,@insertorder,@oldorder);
+var idx;
+var idxflag=-1; // 1 means currently open
+                 // 0 means closed (but has been open)
+                 // -1 means never yet opened/defined
+var idxmode='';
+
+// ------------------------------------------------------ Clears indexer window
+function idxclear() {
+  idx.document.clear();
+}
+
+// ------------------------------------------------------- Clears search window
+function srchclear() {
+  srch.document.clear();
 }
 
-# ------------------------------------------------ Get start and finish correct
-# modifies @resources
+// ------------------------------------------------------ Closes indexer window
+function idxclose() {
+  if (idx && !idx.closed) {
+    idxflag=0;
+    idx.close();
+  }
+}
 
-sub startfinish {
-    foreach (@order) {
-	my ($name,$url,$ext)=split(/\:/,$resources[$_]);
-        if ($url=~/http\&colon\:\/\//) { $ext='true'; }
-        $resources[$_]=$name.':'.$url.':'.$ext.':normal:res';
-    }
-   my ($name,$url,$ext)=split(/\:/,$resources[$order[0]]);
-   $resources[$order[0]]=$name.':'.$url.':'.$ext.':start:res';
-   if ($#order==0) {
-       $resources[$#resources+1]='::false';
-       $order[1]=$#resources;
+// ------------------------------------------------------- Closes search window
+function srchclose() {
+  if (srch && !srch.closed) {
+    srchflag=0;
+    srch.close();
+  }
+}
+
+// -------------------------------------------------------- Open indexer window
+function idxopen(mode) {
+   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.focus();
+}
+
+// ------------------------------------------------------ Open groupsort window
+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+"&bookmarks="+bookmarks,"idxout",options);
+   idx.focus();
+}
+
+// --------------------------------------------------------- Open search window
+function srchopen(mode) {
+   var options="scrollbars=1,resizable=1,menubar=0";
+   srchmode=mode;
+   srchflag=1;
+   srch=open("/adm/searchcat?launch=1&mode=$mode&catalogmode="+mode,"srchout",options);
+   srch.focus();
+}
+// ----------------------------------------------------- launch indexer browser
+function groupsearch() {
+   srchcheck('import');
+}
+
+function groupimport() {
+   idxcheck('import');
+}
+
+// ------------------------------------------------------- Do srch status check
+function srchcheck(mode) {
+   if (!srch || srch.closed || srchmode!=mode) {
+      srchopen(mode);
+   }
+   srch.focus();
+}
+
+// -------------------------------------------------------- Do idx status check
+function idxcheck(mode) {
+   if (!idx || idx.closed || idxmode!=mode) {
+      idxopen(mode);
    }
-   my ($name,$url,$ext)=split(/\:/,$resources[$order[$#order]]);
-   $resources[$order[$#order]]=$name.':'.$url.':'.$ext.':finish:res';
+   idx.focus();
 }
 
-# ------------------------------------------------------------------- Store map
 
-sub storemap {
-    my $fn=shift;
-    &startfinish();
-    my $output='graphdef<:>no';
-    my $k=1;
-    for (my $i=0; $i<=$#order; $i++) {
-        if (defined($resources[$order[$i]])) {
-	    $output.='<&>objcont<:>'.$order[$i].'<:>'.$resources[$order[$i]];
+    var editbrowser;
+    function openbrowser(formname,elementname,only,omit) {
+        var url = '$resurl/?';
+        if (editbrowser == null) {
+            url += 'launch=1&';
         }
-        if (defined($order[$i+1])) {
-	    if (defined($resources[$order[$i+1]])) {
-               $output.='<&>objlinks<:>'.$k.'<:>'.
-		   $order[$i].':'.$order[$i+1].':0';
-	       $k++;
-            }
+        url += 'catalogmode=interactive&';
+        url += 'mode=edit&';
+        url += 'form=' + formname + '&';
+        if (only != null) {
+            url += 'only=' + only + '&';
+        } 
+        if (omit != null) {
+            url += 'omit=' + omit + '&';
         }
+        url += 'element=' + elementname + '';
+        var title = 'Browser';
+        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();
     }
-    $output=~s/http\&colon\;\/\///g;
-    $ENV{'form.output'}=$output;
-    return 
-     &Apache::lonratsrv::loadmap($fn,&Apache::lonratsrv::savemap($fn,''));
+ENDSCRIPT
 }
-
 # ------------------------------------------------------- Simple edit processor
 
 sub smpedt {
    my ($r,$url,$errtext)=@_;
    my $buttons=&buttons(2);
-
-# ---------------------------------------------------------- Process form input
-
-   my @importselect=();
-   my @targetselect=();
-   undef @importselect;
-   undef @targetselect;
-   if (defined($ENV{'form.importsel'})) {
-       if (ref($ENV{'form.importsel'})) {
-	   @importselect=sort(@{$ENV{'form.importsel'}});
+   my $tmpfn=&Apache::lonnet::filelocation('',$url).'.tmp';
+   my $targetmsg='';
+   if ($env{'form.save'}) {
+       copy($tmpfn,&Apache::lonnet::filelocation('',$url));
+       unlink($tmpfn);
+       my ($errtext,$fatal)=
+	   &LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$url),'');
+       unless ($fatal) {
+	   $targetmsg='<b>'.&mt('Saved.').'</b><br />';
        } else {
-           @importselect=($ENV{'form.importsel'});
+	   $targetmsg='<b>'.&mt('An error occured while saving.').'</b><br />';
        }
    }
-   if (defined($ENV{'form.target'})) {
-       if (ref($ENV{'form.target'})) {
-	   @targetselect=sort(@{$ENV{'form.target'}});
-       } else {
-           @targetselect=($ENV{'form.target'});
-       }
+   if ($env{'form.revert'}) {
+       $targetmsg='<b>'.&mt('Reverted.').'</b><br />';
+       unlink($tmpfn);
+       my ($errtext,$fatal)=
+	   &LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$url),'');
+   }
+   if (-e $tmpfn) {
+      $targetmsg=
+        '<b><font color="red">'.&mt('You are working with an unsaved version of your map.').'</font></b><br>';
+      my ($errtext,$fatal)=&LONCAPA::map::mapread($tmpfn,'');
    }
+# ---------------------------------------------------------- Process form input
+
+   my @importselect=&Apache::loncommon::get_env_multiple('form.importsel');
+   my @targetselect=&Apache::loncommon::get_env_multiple('form.target');
 # ============================================================ Process commands
 
-   my $targetdetail=$ENV{'form.targetdetail'};
-   my $importdetail=$ENV{'form.curimpdetail'};
+   my $targetdetail=$env{'form.targetdetail'};
+   my $importdetail=$env{'form.curimpdetail'};
 
 # ---------------------------------------------------- Importing from groupsort
-   if (($ENV{'form.importdetail'}) && (!$ENV{'form.impfortarget'})) {
+   if (($env{'form.importdetail'}) && (!$env{'form.impfortarget'})) {
 
        $importdetail='';
-       my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+       my @curimport=split(/\&/,$env{'form.curimpdetail'});
 
        my $lastsel;
 
@@ -402,7 +403,7 @@ sub smpedt {
 	   }
        }
 
-      $importdetail.='&'.$ENV{'form.importdetail'};
+      $importdetail.='&'.$env{'form.importdetail'};
 
        for (my $i=$lastsel+1;$i<=$#curimport;$i++) {
            my ($name,$url)=split(/\=/,$curimport[$i]);
@@ -414,12 +415,12 @@ sub smpedt {
        $importdetail=~s/^\&//;
 
 # ------------------------------------------------------------------- Clear all
-   } elsif ($ENV{'form.clear'}) {
+   } elsif ($env{'form.clear'}) {
        $importdetail='';
 # ------------------------------------------------------------ Discard selected
-   } elsif ($ENV{'form.discard'}) {
+   } elsif ($env{'form.discard'}) {
        $importdetail='';
-       my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+       my @curimport=split(/\&/,$env{'form.curimpdetail'});
        foreach (@importselect) {
 	   $curimport[$_]='';
        }
@@ -430,9 +431,9 @@ sub smpedt {
 	   }
        }
 # --------------------------------------------------------- Loading another map
-   } elsif ($ENV{'form.loadmap'}) {
+   } elsif ($env{'form.loadmap'}) {
        $importdetail='';
-       my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+       my @curimport=split(/\&/,$env{'form.curimpdetail'});
 
        my $lastsel;
 
@@ -450,11 +451,11 @@ sub smpedt {
        }
 
        foreach (
-    &Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
+    &Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
 	   my ($name,$url)=split(/\:/,$_);
            if ($url) {
-              $importdetail.='&'.&Apache::lonnet::escape($name).'='.
-		 	         &Apache::lonnet::escape($url);
+              $importdetail.='&'.&escape($name).'='.
+		 	         &escape($url);
 	  }
        }
 
@@ -468,19 +469,19 @@ sub smpedt {
        $importdetail=~s/^\&//;
 
 # ------------------------------------------------ Groupimport/search to target
-   } elsif ($ENV{'form.importdetail'}) {
+   } elsif ($env{'form.importdetail'}) {
        my $lastsel;
        if (defined($targetselect[-1])) {
 	   $lastsel=$targetselect[-1];
        } else {
-           $lastsel=$#order+1;
+           $lastsel=$#LONCAPA::map::order+1;
        }
-       &pastetarget($lastsel,split(/\&/,$ENV{'form.importdetail'}));
-       &storemap(&Apache::lonnet::filelocation('',$url));
+       &LONCAPA::map::pastetarget($lastsel,split(/\&/,$env{'form.importdetail'}));
+       &LONCAPA::map::storemap(&Apache::lonnet::filelocation('',$url));
 # ------------------------------------------------------------------------- Cut
-   } elsif (($ENV{'form.cut'}) || ($ENV{'form.copy'})) {
+   } elsif (($env{'form.cut'}) || ($env{'form.copy'})) {
        $importdetail='';
-       my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+       my @curimport=split(/\&/,$env{'form.curimpdetail'});
 
        my $lastsel;
 
@@ -498,10 +499,10 @@ sub smpedt {
        }
 
        foreach (@targetselect) {
-	   my ($name,$url)=split(/\:/,$resources[$order[$_-1]]);
+	   my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$LONCAPA::map::order[$_-1]]);
            if ($url) {
-              $importdetail.='&'.&Apache::lonnet::escape($name).'='.
-		 	         &Apache::lonnet::escape($url);
+              $importdetail.='&'.&escape($name).'='.
+		 	         &escape($url);
 	  }
        }
 
@@ -514,224 +515,216 @@ sub smpedt {
        $importdetail=~s/\&+/\&/g;
        $importdetail=~s/^\&//;
 
-       if ($ENV{'form.cut'}) {
+       if ($env{'form.cut'}) {
            my @neworder=();
-           for (my $i=0;$i<=$#order;$i++) {
+           for (my $i=0;$i<=$#LONCAPA::map::order;$i++) {
                my $include=1;
                foreach (@targetselect) {
 		   if ($_-1==$i) { $include=0; }
                }
-               if ($include) { $neworder[$#neworder+1]=$order[$i]; }
+               if ($include) { 
+		   $neworder[$#neworder+1]=$LONCAPA::map::order[$i]; 
+	       } else {
+		   &LONCAPA::map::makezombie($LONCAPA::map::order[$i]);
+	       }
            }
-           @order=@neworder;
-           &storemap(&Apache::lonnet::filelocation('',$url));      
+           @LONCAPA::map::order=@neworder;
+           &LONCAPA::map::storemap(&Apache::lonnet::filelocation('',$url));      
        }
 
 # ----------------------------------------------------------------------- Paste
-   } elsif ($ENV{'form.paste'}) {
+   } elsif ($env{'form.paste'}) {
        my $lastsel;
        if (defined($targetselect[-1])) {
 	   $lastsel=$targetselect[-1];
        } else {
-           $lastsel=$#order+1;
+           $lastsel=$#LONCAPA::map::order+1;
        }
        my @newsequence;
-       my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+       my @curimport=split(/\&/,$env{'form.curimpdetail'});
        foreach (@importselect) {
           $newsequence[$#newsequence+1]=$curimport[$_];
        }
-       &pastetarget($lastsel,@newsequence);
-       &storemap(&Apache::lonnet::filelocation('',$url));
-# ------------------------------------------------ 
+       &LONCAPA::map::pastetarget($lastsel,@newsequence);
+       &LONCAPA::map::storemap(&Apache::lonnet::filelocation('',$url));
+# -------------------------------------------------------------------- Move up 
+   } elsif ($env{'form.moveup'}) {
+       foreach (sort @targetselect) {
+           if ($_-1>0) {
+              my $movethis=$LONCAPA::map::order[$_-1];
+              $LONCAPA::map::order[$_-1]=$LONCAPA::map::order[$_-2];
+              $LONCAPA::map::order[$_-2]=$movethis;
+	  }
+       }
+       &LONCAPA::map::storemap(&Apache::lonnet::filelocation('',$url));
+# ------------------------------------------------------------------ Move down
+   } elsif ($env{'form.movedown'}) {
+       foreach (reverse sort @targetselect) {
+           if ($_-1<$#LONCAPA::map::order) {
+              my $movethis=$LONCAPA::map::order[$_-1];
+              $LONCAPA::map::order[$_-1]=$LONCAPA::map::order[$_];
+              $LONCAPA::map::order[$_]=$movethis;
+	   }
+       }
+       &LONCAPA::map::storemap(&Apache::lonnet::filelocation('',$url));
+# --------------------------------------------------------------------- Rename
+   } elsif ($env{'form.renameres'}) {
+       my $residx=$LONCAPA::map::order[$env{'form.renameidx'}-1];
+       my ($name,@resrest)=split(/\:/,$LONCAPA::map::resources[$residx]);
+       $name=$env{'form.renametitle'};
+       $name=~s/\:/\&colon\;/g;
+       $LONCAPA::map::resources[$residx]=$name.':'.join(':',@resrest);
+       &LONCAPA::map::storemap(&Apache::lonnet::filelocation('',$url));
    }
 # ------------------------------------------------------------ Assemble windows
    
    my $idx=-1;
+   $importdetail='&'.$importdetail;
+   $importdetail=~s/^\&+/\&/;
    my $importwindow=
-       '<option value="-1"> ---- Import and Paste Area ---- </option>'.
+       '<option value="-1"> ---- '.&mt('Import and Paste Area').' ---- </option>'.
      join("\n",map {
        $idx++;
        if ($_) { 
           my ($name,$url)=split(/\=/,$_);
           unless ($name) { $name=(split(/\//,$url))[-1]; }
           unless ($name) { $name='EMPTY'; }
-          '<option value="'.$idx.'">'.&Apache::lonnet::unescape($name).
+          '<option value="'.$idx.'">'.&unescape($name).
                                     '</option>';
       }
    } split(/\&/,$importdetail));
 
    $idx=0;
+   $targetdetail='';
    my $targetwindow=       
-       '<option value="0"> ------- Target Edit Map ------- </option>'.
+       '<option value="0"> ------- '.&mt('Target Edit Map').' ------- </option>'.
      join("\n",map { 
-       my ($name,$url)=split(/\:/,$resources[$_]);
+       my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$_]);
        unless ($name) {  $name=(split(/\//,$url))[-1]; }
        unless ($name) { $name='EMPTY'; }
-       $targetdetail.='&'.&Apache::lonnet::escape($name).'='.
-	                  &Apache::lonnet::escape($url);
+       $name = &LONCAPA::map::qtescape($name);
+       $url  = &LONCAPA::map::qtescape($url);
+       $targetdetail.='&'.&escape($name).'='.
+	                  &escape($url);
        $idx++;
+       $name = &HTML::Entities::encode($name,'\'"<>&');
        '<option value="'.$idx.'">'.$name.'</option>';
-   } @order);
+   } @LONCAPA::map::order);
 
 # ----------------------------------------------------- Start simple RAT screen
-   $r->print(<<ENDSMPHEAD);
-<html>
-<head>
-<script>
-var srch;
-var srchflag=-1; // 1 means currently open
-                 // 0 means closed (but has been open)
-                 // -1 means never yet opened/defined
-var srchmode='';
-
-var idx;
-var idxflag=-1; // 1 means currently open
-                 // 0 means closed (but has been open)
-                 // -1 means never yet opened/defined
-var idxmode='';
-
-// ------------------------------------------------------ Clears indexer window
-function idxclear() {
-  idx.document.clear();
-}
-
-// ------------------------------------------------------- Clears search window
-function srchclear() {
-  srch.document.clear();
-}
-
-// ------------------------------------------------------ Closes indexer window
-function idxclose() {
-  if (idx && !idx.closed) {
-    idxflag=0;
-    idx.close();
-  }
-}
-
-// ------------------------------------------------------- Closes search window
-function srchclose() {
-  if (srch && !srch.closed) {
-    srchflag=0;
-    srch.close();
-  }
-}
-
-// -------------------------------------------------------- Open indexer window
-function idxopen(mode) {
-   var options="scrollbars=1,resizable=1,menubar=0";
-   idxmode=mode;
-   idxflag=1;
-   idx=open("/res/?launch=1&mode=simple&catalogmode="+mode,"idxout",options);
-   idx.focus();
-}
-
-// --------------------------------------------------------- Open search window
-function srchopen(mode) {
-   var options="scrollbars=1,resizable=1,menubar=0";
-   srchmode=mode;
-   srchflag=1;
-   srch=open("/adm/searchcat?launch=1&mode=simple&catalogmode="+mode,"srchout",options);
-   srch.focus();
-}
-// ----------------------------------------------------- launch indexer browser
-function groupsearch() {
-   srchcheck('groupsearch');
-}
-
-function groupimport() {
-   idxcheck('groupimport');
-}
-// ------------------------------------------------------- Do srch status check
-function srchcheck(mode) {
-   if (!srch || srch.closed || srchmode!=mode) {
-      srchopen(mode);
-   }
-   srch.focus();
-}
-
-// -------------------------------------------------------- Do idx status check
-function idxcheck(mode) {
-   if (!idx || idx.closed || idxmode!=mode) {
-      idxopen(mode);
-   }
-   idx.focus();
-}
+   my $editscript=&editscript('simple');
 
+   my %lt=&Apache::lonlocal::texthash(
+				      'sa' => 'Save',
+				      'nt' => 'New Title',
+				      'se' => 'Search',
+				      'im' => 'Import',
+                                      'bk' => 'Import Bookmarks',
+				      'vi' => 'View',
+				      'lm' => 'Load Map',
+				      'ds' => 'Discard Selected',
+				      'ca' => 'Clear All',
+				      'ta' => 'Temporary Assembly Workspace',
+				      'rv' => 'Revert to Last Saved',
+                                      'sa' => 'Save',
+                                      'mu' => 'Move Up',
+                                      'md' => 'Move Down',
+                                      're' => 'Rename',
+                                      'as' => 'after selected',
+                                      'cs' => 'Cut selected',
+                                      'ps' => 'Copy selected',
+                                      'pas' => 'Paste after selected',
+                                      'reco' => 'Recover Deleted'
+				      );
+   my $js=<<ENDJS;
+<script type="text/javascript">
 
-    var editbrowser;
-    function openbrowser(formname,elementname,only,omit) {
-        var url = '/res/?';
-        if (editbrowser == null) {
-            url += 'launch=1&';
-        }
-        url += 'catalogmode=interactive&';
-        url += 'mode=edit&';
-        url += 'form=' + formname + '&';
-        if (only != null) {
-            url += 'only=' + only + '&';
-        } 
-        if (omit != null) {
-            url += 'omit=' + omit + '&';
-        }
-        url += 'element=' + elementname + '';
-        var title = 'Browser';
-        var options = 'scrollbars=1,resizable=1,menubar=0';
-        options += ',width=700,height=600';
-        editbrowser = open(url,title,options,'1');
-        editbrowser.focus();
-    }
+   $editscript
 
    function openview(entry) {
        var url=unescape((entry.split('='))[1]);
        var parts=new Array;
-       parts=url.split('&colon;');
-       url=parts.join(':');
        if (url) { open(url,'cat'); }
    }
 
    function viewtarget() {
        openview((document.forms.simpleedit.targetdetail.value.split('&'))
-                [document.forms.simpleedit.target.selectedIndex+1]);
+                [document.forms.simpleedit.target.selectedIndex]);
    }
 
    function viewimport() {
        openview((document.forms.simpleedit.curimpdetail.value.split('&'))
-                [document.forms.simpleedit.importsel.selectedIndex+1]);
+                [document.forms.simpleedit.importsel.selectedIndex]);
+   }
+
+   function renametarget() {
+       var selidx=document.forms.simpleedit.target.selectedIndex;
+       var entry=(document.forms.simpleedit.targetdetail.value.split('&'))
+                [selidx];
+       var oldname=unescape((entry.split('='))[0]);
+       newtitle=prompt('$lt{'nt'}',oldname);
+       if (newtitle) {
+           document.forms.simpleedit.renameres.value=1;
+           document.forms.simpleedit.renameidx.value=selidx;
+           document.forms.simpleedit.renametitle.value=newtitle;
+	   document.forms.simpleedit.submit();
+       }
    }
 
 </script>
-</head>                 
-<body bgcolor='#FFFFFF'>
+ENDJS
+
+    my $start_page = &Apache::loncommon::start_page(undef,$js).
+        &Apache::loncommon::help_open_menu('Sequence_Simple_Editor_Creation',
+					   'Sequence_Simple_Editor_Creation',
+					   6,'RAT');    
+    my $end_page = &Apache::loncommon::end_page();
+
+    $r->print(<<ENDSMPHEAD);
+$start_page
 $buttons
 <font color=red>$errtext</font>
-<h1>$url</h1>
 <form name=simpleedit method=post>
 <input type=hidden name=forcesmp value=1>
+<input type=hidden name=renameres value=0>
+<input type=hidden name=renametitle value=''>
+<input type=hidden name=renameidx value=0>
 <table>
-    <tr><th width="40%">Import</th>
+    <tr><th width="40%">$lt{'ta'}</th>
 <th>&nbsp;</th>
-<th width="40%">Target</th></tr>
+<th width="40%">File: $url</th></tr>
 <tr><td bgcolor="#FFFFCC">
-<input type=button onClick="javascript:groupsearch()" value="Group Search">
-<input type=button onClick="javascript:groupimport();" value="Group Import">
-after selected
+<input type=button onClick="javascript:groupsearch()" value="$lt{'se'}">
+<input type=button onClick="javascript:groupimport();" value="$lt{'im'}">
+$lt{'as'}
 <hr>
 <input type=text size=20 name=importmap>
 <input type=button 
 onClick="javascript:openbrowser('simpleedit','importmap','sequence,page','')"
-value="Browse"><input type=submit name=loadmap value="Load Map"><hr>
-<input type=submit name="discard" value="Discard Selected">
-<input type=submit name="clear" value="Clear All">
-<input type=button onClick="javascript:viewimport()" value="View">
+value="Select Map"><input type=submit name=loadmap value="$lt{'lm'}"><hr>
+<input type=submit name="discard" value="$lt{'ds'}">
+<input type=submit name="clear" value="$lt{'ca'}">
+<input type=button onClick="javascript:viewimport()" value="$lt{'vi'}">
 
     </td><td>&nbsp;</td><td bgcolor="#FFFFCC">
 
 <input type=button onClick=
-"javascript:impfortarget.value=1;groupsearch()" value="Group Search">
+"javascript:impfortarget.value=1;groupsearch()" value="$lt{'se'}">
 <input type=button onClick=
-"javascript:impfortarget.value=1;groupimport();" value="Group Import">
-after selected
-<hr><input type=button onClick="javascript:viewtarget()" value="View">
+"javascript:impfortarget.value=1;groupimport();" value="$lt{'im'}">
+<input type=button onClick=
+"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'}">
+<input type=submit name="movedown" value="$lt{'md'}">
+<input type=button onClick="javascript:renametarget()" value="$lt{'re'}">
+<hr>$targetmsg
+<input type=submit name="revert" value="$lt{'rv'}">
+<input type=submit name="save" value="$lt{'sa'}">
+<input type=button onClick="javascript:viewtarget()" value="$lt{'vi'}">
 </td></tr>
 
 <tr><td bgcolor="#FFFFCC"><select name="importsel" size=10 multiple>
@@ -739,13 +732,13 @@ $importwindow
 </select>
 </td>
 <td bgcolor="#FFFFAA" align="center">
-Cut selected<br>
+$lt{'cs'}<br>
 <input type=submit name=cut value='<<<'><p>
 <hr>
-Copy selected<br>
+$lt{'ps'}<br>
 <input type=submit name=copy value='<--'><p>
 <hr>
-Paste after selected<br>
+$lt{'pas'}<br>
 <input type=submit name=paste value='-->'>
 </td>
 <td bgcolor="#FFFFCC"><select name="target" size=10 multiple>
@@ -757,60 +750,97 @@ $targetwindow
 <input type=hidden name=targetdetail value="$targetdetail">
 <input type=hidden name=impfortarget value="0">
 </form>
-</body></html>
+$end_page
 ENDSMPHEAD
 }
 
 # ----------------------------------------------------------------- No such dir
 sub nodir {
    my ($r,$dir)=@_;
-   $dir=~s/^\/home\/\w+\/public\_html//;
-   $r->print(<<ENDNODIR);
-<html>
-<body bgcolor='#FFFFFF'>
-<h1>No such directory: $dir</h1>
-</body>
-</html>
-ENDNODIR
+   $dir=~s{^/home/$LONCAPA::username_re/public_html}{};
+   $r->print(&Apache::loncommon::start_page(undef,undef,
+					    {'only_body' => 1,
+					     'bgcolor'   => '#FFFFFF',}).
+	     "<h1>No such directory: $dir</h1>".
+	     &Apache::loncommon::end_page());
 }
 
 # ---------------------------------------------------------------- View Handler
 
 sub viewmap {
     my ($r,$url,$adv,$errtext)=@_;
-    $r->print('<html><body bgcolor="#FFFFFF">'.&buttons($adv));
+    $r->print(
+	      &Apache::loncommon::start_page('Edit Content of a Map').
+	      &Apache::loncommon::help_open_menu('','',6,'RAT').
+	      &buttons($adv));
     if ($errtext) {
-	$r->print($errtext.'<hr>');
+	$r->print($errtext.'<hr />');
     }
     my $idx=0;
-    foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) {
+    $r->print('<h1>'.$url.'</h1>');
+    if ($adv) {
+	$r->print('<p><b><font color="red">'.&mt('Map contents are not shown in order.').'</font></b></p><br />');
+    }
+    $r->print( '<table border="0" cellspacing="2" cellpadding="4">'.
+               '<tr bgcolor="#DDDDDD"><th>'.&mt('Type').'</th>'.
+               '<th>'.&mt('Title in map').'</th>'.
+               '<th>'.&mt('Filename of resource').'</th>'.
+               '<th>'.&mt('Link to published resource').'</th>'.
+               '<th>'.&mt('Link to resource in Construction Space').'</th>'.
+               '</tr>');
+    my @backgroundColors = ("#FFFFFF", "#F6F6F6");
+    foreach (&LONCAPA::map::attemptread(&Apache::lonnet::filelocation('',$url))) {
 	if (defined($_)) {
             $idx++;
-	    my ($title,$url)=split(/\:/,$_);
-            $title=~s/\&colon\;/\:/g;
-            $url=~s/\&colon\;/\:/g;
+	    my ($title,$url,$cond)=split(/\:/,$_);
+	    if ($cond eq 'cond') { next; }
+            $title= &LONCAPA::map::qtescape($title);
+            $url  = &LONCAPA::map::qtescape($url);
             unless ($title) { $title=(split(/\//,$url))[-1] };
-            unless ($title) { $title='<i>Empty</i>'; }
+            unless ($title) { $title='<i>'.&mt('Empty').'</i>'; }
+            my $resurl = $url;
+            my $resfilepath = $Apache::lonnet::perlvar{'lonDocRoot'}.$resurl;
+            my $filename; 
+            if ($resurl =~ m#/([^/]+)$#) {
+                $filename = $1;
+            }
+            my $cstrurl = $resurl;
+            $cstrurl =~ s#^/res/[^/]+/([^/]+)/#/priv/$1/#;
+            my $bgcol = $idx%2; 
+            $r->print('<tr bgcolor='.$backgroundColors[$bgcol].'><td>'.
+                      '<img src="'.&Apache::loncommon::icon($resfilepath).
+                      '" /></td><td>'.&HTML::Entities::encode(&LONCAPA::map::qtescape($title)).
+                      '</td><td>'.$filename.'</td><td>');
             if ($url) {
-		$r->print('<a href="'.&Apache::lonratsrv::qtescape($url).'">');
+		$r->print('<a href="'.$resurl.'">'.&mt('Resource space').'</a>');
             }
-            $r->print(&Apache::lonratsrv::qtescape($title));
-            if ($url) { $r->print('</a>'); }
-	    $r->print('<br>');
+            $r->print('</td><td>');
+            if ($url) {
+               $r->print('<a href="'.$cstrurl.'">'.
+                         &mt('Construction space').'</a>');
+            }
+            $r->print('</td></tr>'."\n");
         }
     }
-    $r->print('</body></html>');
+    $r->print('</table>');
+    $r->print(&Apache::loncommon::end_page());
 }
 
 # ================================================================ Main Handler
 
 sub handler {
   my $r=shift;
-  $r->content_type('text/html');
+  &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
 
   return OK if $r->header_only;
-
+  my $target = $env{'form.grade_target'};
+  if ($target eq 'meta') {
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      return OK;
+  }
+  
   my $url=$r->uri;
   my $fn=&Apache::lonnet::filelocation('',$url);
 
@@ -823,8 +853,8 @@ sub handler {
 # ------------------------------------------- Determine which tools can be used
   my $adv=0;
 
-  unless ($ENV{'form.forcesmp'}) {
-     if ($ENV{'form.forceadv'}) {
+  unless ($env{'form.forcesmp'}) {
+     if ($env{'form.forceadv'}) {
         $adv=1;
      } elsif (my $fh=Apache::File->new($fn)) {
 	 my $allmap=join('',<$fh>);
@@ -836,15 +866,15 @@ sub handler {
   my $fatal=0;
 
 # -------------------------------------------------------------------- Load map
-  ($errtext,$fatal)=&mapread($fn,$errtext);
+  ($errtext,$fatal)=&LONCAPA::map::mapread($fn,$errtext);
 
   if ($fatal==1) { $adv=1; }
 
 # ----------------------------------- adv==1 now means "graphical MUST be used"
 
-  if ($ENV{'form.forceadv'}) {
+  if ($env{'form.forceadv'}) {
       &ratedt($r,$url);
-  } elsif ($ENV{'form.forcesmp'}) {
+  } elsif ($env{'form.forcesmp'}) {
       &smpedt($r,$url,$errtext);
   } else {
       &viewmap($r,$url,$adv,$errtext);