--- rat/lonratedt.pm	2009/08/14 02:16:31	1.94.2.1
+++ rat/lonratedt.pm	2012/12/16 15:55:25	1.105.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.94.2.1 2009/08/14 02:16:31 raeburn Exp $
+# $Id: lonratedt.pm,v 1.105.2.2 2012/12/16 15:55:25 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,*";
@@ -58,6 +58,7 @@ sub ratedt {
       &Apache::loncommon::start_page('Edit Sequence',$js,
 				     {'frameset'    => 1,
 				      'add_entries' => \%layout});
+
   my $end_page = 
       &Apache::loncommon::end_page({'frameset' => 1});
 
@@ -75,19 +76,29 @@ 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><hr />';
+    return $output.'</form>';
 }
 
 # ----------------------------------------------------------------- Edit script
@@ -147,7 +158,7 @@ function idxopen(mode) {
 function groupopen(url,recover,bookmarks) {
    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+"&bookmarks="+bookmarks,"idxout",options);
    idx.focus();
 }
 
@@ -214,7 +225,6 @@ ENDSCRIPT
 
 sub smpedt {
    my ($r,$url,$errtext)=@_;
-   my $buttons=&buttons(2);
    my $tmpfn=&Apache::lonnet::filelocation('',$url).'.tmp';
    my $targetmsg='';
    if ($env{'form.save'}) {
@@ -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',
@@ -540,17 +550,33 @@ sub smpedt {
 </script>
 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');    
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        text  => 'Construction Space',
+        href  => &Apache::loncommon::authorspace($url),
+        faq   => 6,
+        bug   => 'RAT',
+        help  => 'Sequence_Simple_Editor_Creation',});
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        text  => 'RAT',
+        title => 'Resource Assembly Tool',
+        href  => '',});
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        text  => 'Editor',
+        title => 'Simple Editor',
+        href  => '',});
+
+    # Breadcrumbs are included by &start_page
+    my $start_page = &Apache::loncommon::start_page('Construction Space',$js)
+                    .&Apache::loncommon::head_subbox(
+                         &Apache::loncommon::CSTR_pageheader()
+                        .&buttons(2));
     my $end_page = &Apache::loncommon::end_page();
 
     $r->print(<<ENDSMPHEAD);
 $start_page
-$buttons
 <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="" />
@@ -560,37 +586,37 @@ $buttons
 <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">
@@ -623,24 +649,48 @@ ENDSMPHEAD
 # ----------------------------------------------------------------- No such dir
 sub nodir {
    my ($r,$dir)=@_;
-   $dir=~s{^/home/$LONCAPA::username_re/public_html}{};
-   $r->print(&Apache::loncommon::start_page(undef,undef,
-					    {'only_body' => 1,
-					     'bgcolor'   => '#FFFFFF',}).
-             '<p class="LC_error">'.
-             &mt('No such directory: [_1]','<span class="LC_filename">'.$dir.'</span>').
-             '</p>'.
-	     &Apache::loncommon::end_page());
+   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">'
+            .&mt('No such directory: [_1]','<span class="LC_filename">'.$dir.'</span>'
+            .'</p>'
+            .&Apache::loncommon::end_page())
+   );
 }
 
 # ---------------------------------------------------------------- View Handler
 
 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').
-	      &buttons($adv));
+
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        text  => 'Construction Space',
+        href  => &Apache::loncommon::authorspace($url),
+        faq   => 6,
+        bug   => 'RAT',
+        help  => 'Sequence_Simple_Editor_Creation',});
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        text  => 'RAT',
+        title => 'Resource Assembly Tool',
+        href  => '',});
+
+    # Breadcrumbs are included by &start_page
+    $r->print(&Apache::loncommon::start_page('Edit Content of a Map')
+             .&Apache::loncommon::head_subbox(
+                  &Apache::loncommon::CSTR_pageheader()
+                 .&buttons($adv))
+    );
     if ($errtext) {
 	$r->print('<div class="LC_error">'
                  .$errtext
@@ -681,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))