--- rat/lonratedt.pm	2009/05/25 17:49:43	1.96
+++ rat/lonratedt.pm	2012/12/16 16:02:15	1.105.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.96 2009/05/25 17:49:43 bisitz Exp $
+# $Id: lonratedt.pm,v 1.105.2.3 2012/12/16 16:02:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,7 +44,7 @@ use HTML::Entities();
 sub ratedt {
   my ($r,$url)=@_;
   my %layout = ('border' => "0");
-    if ($env{'environment.remote'} eq 'off') {
+  if ($env{'environment.remote'} eq 'off') {
       $layout{'rows'} = "1,250,*";
   } else {
       $layout{'rows'} = "1,70,*";
@@ -76,17 +76,27 @@ ENDDOCUMENT
 
 sub buttons {
     my $adv=shift;
-    my $output='<form method="post">';     
+    my $output='<form method="post" action="">';     
     if ($adv==1) {
-	$output.='<input type="submit" name="forceadv" value="'.&mt('Edit').'" />'.
-	    &Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');
+        $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="'.&mt('Simple Edit').'" />'.
-	    &Apache::loncommon::help_open_topic('Sequence_Simple_Editor_Creation');
+           $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="'.&mt('Advanced Edit').'" />'.
-	    &Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');
+        $output.=
+            '<input type="submit" name="forceadv"'
+           .' value="'.&mt('Advanced Edit').'" />'
+           .&Apache::loncommon::help_open_topic(
+                'Sequence_Advanced_Editor_Creation');
     }
     return $output.'</form>';
 }
@@ -145,10 +155,10 @@ function idxopen(mode) {
 }
 
 // ------------------------------------------------------ Open groupsort window
-function groupopen(url,recover,bookmarks) {
+function groupopen(url,recover) {
    var options="scrollbars=1,resizable=1,menubar=0";
    idxflag=1;
-   idx=open("/adm/groupsort?inhibitmenu=yes&mode=$mode&recover="+recover+"&readfile="+url+"&bookmarks="+bookmarks,"idxout",options);
+idx=open("/adm/groupsort?inhibitmenu=yes&mode=$mode&recover="+recover+"&readfile="+url,"idxout",options);
    idx.focus();
 }
 
@@ -485,7 +495,7 @@ sub smpedt {
 				      'nt' => 'New Title',
 				      'se' => 'Search',
 				      'im' => 'Import',
-                                      'bk' => 'Import Bookmarks',
+                                      'wl' => 'Import from Stored Links',
 				      'vi' => 'View',
 				      'lm' => 'Load Map',
 				      'ds' => 'Discard Selected',
@@ -543,7 +553,7 @@ ENDJS
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({
         text  => 'Construction Space',
-        href  => '', # FIXME Add link to priv/[user]
+        href  => &Apache::loncommon::authorspace($url),
         faq   => 6,
         bug   => 'RAT',
         help  => 'Sequence_Simple_Editor_Creation',});
@@ -556,8 +566,8 @@ ENDJS
         title => 'Simple Editor',
         href  => '',});
 
+    # Breadcrumbs are included by &start_page
     my $start_page = &Apache::loncommon::start_page('Construction Space',$js)
-                    .&Apache::lonhtmlcommon::breadcrumbs('')
                     .&Apache::loncommon::head_subbox(
                          &Apache::loncommon::CSTR_pageheader()
                         .&buttons(2));
@@ -566,7 +576,7 @@ ENDJS
     $r->print(<<ENDSMPHEAD);
 $start_page
 <span class="LC_error">$errtext</span>
-<form name="simpleedit" method="post">
+<form name="simpleedit" method="post" action="">
 <input type="hidden" name="forcesmp" value="1" />
 <input type="hidden" name="renameres" value="0" />
 <input type="hidden" name="renametitle" value="" />
@@ -576,37 +586,37 @@ $start_page
 <th>&nbsp;</th>
 <th width="40%">File: $url</th></tr>
 <tr><td bgcolor="#FFFFCC">
-<input type="button" onClick="javascript:groupsearch()" value="$lt{'se'}" />
-<input type="button" onClick="javascript:groupimport();" value="$lt{'im'}" />
+<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','')"
+onclick="javascript:openbrowser('simpleedit','importmap','sequence,page','')"
 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'}" />
+<input type="button" onclick="javascript:viewimport()" value="$lt{'vi'}" />
 
     </td><td>&nbsp;</td><td bgcolor="#FFFFCC">
 
-<input type="button" onClick=
+<input type="button" onclick=
 "javascript:impfortarget.value=1;groupsearch()" value="$lt{'se'}" />
-<input type="button" onClick=
+<input type="button" onclick=
 "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'}" />
+<input type="button" onclick=
+"javascript:impfortarget.value=1;open_StoredLinks_Import('simple');" value="$lt{'wl'}" />
+<input type="button" onclick=
+"javascript:impfortarget.value=1;groupopen('$url',1);" 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'}" />
+<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'}" />
+<input type="button" onclick="javascript:viewtarget()" value="$lt{'vi'}" />
 </td></tr>
 
 <tr><td bgcolor="#FFFFCC"><select name="importsel" size="10" multiple="multiple">
@@ -639,9 +649,16 @@ ENDSMPHEAD
 # ----------------------------------------------------------------- No such dir
 sub nodir {
    my ($r,$dir)=@_;
-   $dir=~s{^/home/$LONCAPA::username_re/public_html}{};
-   $r->print(&Apache::loncommon::start_page('Construction Space',undef)
-            .&Apache::lonhtmlcommon::breadcrumbs() # FIXME add breadcrumbs
+   my $londocroot = $r->dir_config('lonDocRoot');
+   my ($path) = ($dir =~ m{^\Q$londocroot\E?(/priv/[^/]+/[^/]+/)});
+   $dir=~s{^\Q$londocroot/priv/\E[^/]+/[^/]+}{};
+   my $brcrum = [{'href' => &Apache::loncommon::authorspace($path),
+                  'text' => 'Construction Space'}];
+#                 {'href' => '',
+#                  'text' => 'No such directory'}];
+   $r->print(&Apache::loncommon::start_page('Construction Space',
+                                            undef,
+                                            {'bread_crumbs' => $brcrum,})
             .&Apache::loncommon::head_subbox(
                  &Apache::loncommon::CSTR_pageheader())
             .'<p class="LC_error">'
@@ -659,7 +676,7 @@ sub viewmap {
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({
         text  => 'Construction Space',
-        href  => '', # FIXME Add link to priv/[user]
+        href  => &Apache::loncommon::authorspace($url),
         faq   => 6,
         bug   => 'RAT',
         help  => 'Sequence_Simple_Editor_Creation',});
@@ -668,8 +685,8 @@ sub viewmap {
         title => 'Resource Assembly Tool',
         href  => '',});
 
+    # Breadcrumbs are included by &start_page
     $r->print(&Apache::loncommon::start_page('Edit Content of a Map')
-             .&Apache::lonhtmlcommon::breadcrumbs('')
              .&Apache::loncommon::head_subbox(
                   &Apache::loncommon::CSTR_pageheader()
                  .&buttons($adv))
@@ -682,7 +699,7 @@ sub viewmap {
         );
     }
     my $idx=0;
-    $r->print('<h1>'.$url.'</h1>');
+    $r->print('<p><span class="LC_filename">'.$url.'</span></p>');
     if ($adv) {
 	$r->print('<p class="LC_warning">'
                  .&mt('Map contents are not shown in order.')
@@ -714,10 +731,10 @@ sub viewmap {
                 $filename = $1;
             }
             my $cstrurl = $resurl;
-            $cstrurl =~ s#^/res/[^/]+/([^/]+)/#/priv/$1/#;
+            $cstrurl =~ s{^/res/}{/priv/};
             $r->print(&Apache::loncommon::start_data_table_row()
                      .'<td>'
-                     .'<img src="'.&Apache::loncommon::icon($resfilepath).'" />'
+                     .'<img src="'.&Apache::loncommon::icon($resfilepath).'" alt="" />'
                      .'</td>'
                      .'<td>'
                      .&HTML::Entities::encode(&LONCAPA::map::qtescape($title))