--- rat/lonratedt.pm	2012/04/18 17:37:12	1.105
+++ rat/lonratedt.pm	2014/05/20 14:36:39	1.111
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.105 2012/04/18 17:37:12 raeburn Exp $
+# $Id: lonratedt.pm,v 1.111 2014/05/20 14:36:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,7 +72,7 @@ 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"'
@@ -229,22 +229,27 @@ sub smpedt {
        my ($errtext,$fatal)=
 	   &LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$url),'');
        unless ($fatal) {
-	   $targetmsg='<b>'.&mt('Saved.').'</b><br />';
+	   $targetmsg=&Apache::lonhtmlcommon::confirm_success(&mt('Saved'));
        } else {
-	   $targetmsg='<b>'.&mt('An error occurred while saving.').'</b><br />';
+	   $targetmsg=&Apache::lonhtmlcommon::confirm_success(
+                          &mt('An error occurred while saving.'),1);
        }
    }
    if ($env{'form.revert'}) {
-       $targetmsg='<b>'.&mt('Reverted.').'</b><br />';
+       $targetmsg=&Apache::lonhtmlcommon::confirm_success(&mt('Reverted'));
        unlink($tmpfn);
        my ($errtext,$fatal)=
 	   &LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$url),'');
    }
+   $targetmsg = &Apache::loncommon::confirmwrapper($targetmsg) if ($targetmsg);
    if (-e $tmpfn) {
       $targetmsg=
-        '<span class="LC_warning">'.&mt('You are working with an unsaved version of your map.').'</span><br />';
+        '<p class="LC_warning">'
+       .&mt('You are working with an unsaved version of your map.')
+       .'</p>';
       my ($errtext,$fatal)=&LONCAPA::map::mapread($tmpfn,'');
    }
+   $errtext = '<p class="LC_error">'.$errtext.'</p>' if ($errtext);
 # ---------------------------------------------------------- Process form input
 
    my @importselect=&Apache::loncommon::get_env_multiple('form.importsel');
@@ -487,11 +492,12 @@ sub smpedt {
    my $editscript=&editscript('simple');
 
    my %lt=&Apache::lonlocal::texthash(
+				      'sm' => 'Select Map',
 				      'sa' => 'Save',
 				      'nt' => 'New Title',
 				      'se' => 'Search',
 				      'im' => 'Import',
-                                      'wl' => 'Import from Wishlist',
+                                      'wl' => 'Import from Stored Links',
 				      'vi' => 'View',
 				      'lm' => 'Load Map',
 				      'ds' => 'Discard Selected',
@@ -508,9 +514,7 @@ sub smpedt {
                                       'pas' => 'Paste after selected',
                                       'reco' => 'Recover Deleted'
 				      );
-   my $js=<<ENDJS;
-<script type="text/javascript">
-
+   my $js=&Apache::lonhtmlcommon::scripttag("
    $editscript
 
    function openview(entry) {
@@ -542,13 +546,11 @@ sub smpedt {
 	   document.forms.simpleedit.submit();
        }
    }
-
-</script>
-ENDJS
+");
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({
-        text  => 'Construction Space',
+        text  => 'Authoring Space',
         href  => &Apache::loncommon::authorspace($url),
         faq   => 6,
         bug   => 'RAT',
@@ -563,16 +565,18 @@ ENDJS
         href  => '',});
 
     # Breadcrumbs are included by &start_page
-    my $start_page = &Apache::loncommon::start_page('Construction Space',$js)
+    my $start_page = &Apache::loncommon::start_page('Authoring Space',$js)
                     .&Apache::loncommon::head_subbox(
                          &Apache::loncommon::CSTR_pageheader()
                         .&buttons(2));
     my $end_page = &Apache::loncommon::end_page();
 
+    my $filetext = &mt('File: [_1]','<span class="LC_filename">'.$url.'</span>');
     $r->print(<<ENDSMPHEAD);
 $start_page
-<span class="LC_error">$errtext</span>
-<form name="simpleedit" method="post">
+$targetmsg
+$errtext
+<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="" />
@@ -580,39 +584,39 @@ $start_page
 <table>
     <tr><th width="40%">$lt{'ta'}</th>
 <th>&nbsp;</th>
-<th width="40%">File: $url</th></tr>
+<th width="40%">$filetext</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','')"
-value="Select Map" /><input type="submit" name="loadmap" value="$lt{'lm'}" /><hr />
+onclick="javascript:openbrowser('simpleedit','importmap','sequence,page','')"
+value="$lt{'sm'}" /><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;open_Wishlist_Import('simple');" value="$lt{'wl'}" />
-<input type="button" onClick=
+<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'}" />
-<hr />$targetmsg
+<input type="button" onclick="javascript:renametarget()" value="$lt{'re'}" />
+<hr />
 <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">
@@ -621,17 +625,18 @@ $importwindow
 </td>
 <td bgcolor="#FFFFAA" align="center">
 $lt{'cs'}<br />
-<input type="submit" name="cut" value="<<<" /><p>
+<input type="submit" name="cut" value="&lt;&lt;&lt;" />
 <hr />
 $lt{'ps'}<br />
-<input type="submit" name="copy" value="<--" /><p>
-<h /r>
+<input type="submit" name="copy" value="&lt;--" />
+<hr />
 $lt{'pas'}<br />
-<input type="submit" name="paste" value="-->" />
+<input type="submit" name="paste" value="--&gt;" />
 </td>
 <td bgcolor="#FFFFCC"><select name="target" size="10" multiple="multiple">
 $targetwindow
 </select>
+</td></tr>
 </table>
 <input type="hidden" name="importdetail" value="" />
 <input type="hidden" name="curimpdetail" value="$importdetail" />
@@ -649,10 +654,10 @@ sub nodir {
    my ($path) = ($dir =~ m{^\Q$londocroot\E?(/priv/[^/]+/[^/]+/)});
    $dir=~s{^\Q$londocroot/priv/\E[^/]+/[^/]+}{};
    my $brcrum = [{'href' => &Apache::loncommon::authorspace($path),
-                  'text' => 'Construction Space'}];
+                  'text' => 'Authoring Space'}];
 #                 {'href' => '',
 #                  'text' => 'No such directory'}];
-   $r->print(&Apache::loncommon::start_page('Construction Space',
+   $r->print(&Apache::loncommon::start_page('Authoring Space',
                                             undef,
                                             {'bread_crumbs' => $brcrum,})
             .&Apache::loncommon::head_subbox(
@@ -671,7 +676,7 @@ sub viewmap {
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({
-        text  => 'Construction Space',
+        text  => 'Authoring Space',
         href  => &Apache::loncommon::authorspace($url),
         faq   => 6,
         bug   => 'RAT',
@@ -708,7 +713,7 @@ sub viewmap {
              .'<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>'
+             .'<th>'.&mt('Link to resource in Authoring Space').'</th>'
              .&Apache::loncommon::end_data_table_header_row()
     );
     foreach (&LONCAPA::map::attemptread(&Apache::lonnet::filelocation('',$url))) {
@@ -730,7 +735,7 @@ sub viewmap {
             $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))
@@ -746,7 +751,7 @@ sub viewmap {
             $r->print('</td><td>');
             if ($url) {
                $r->print('<a href="'.$cstrurl.'">'.
-                         &mt('Construction space').'</a>');
+                         &mt('Authoring Space').'</a>');
             } else {
                 $r->print('&nbsp;');
             }