--- loncom/interface/lonsource.pm	2012/04/21 02:48:24	1.28
+++ loncom/interface/lonsource.pm	2015/05/23 21:02:39	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Source Code handler
 #
-# $Id: lonsource.pm,v 1.28 2012/04/21 02:48:24 raeburn Exp $
+# $Id: lonsource.pm,v 1.34 2015/05/23 21:02:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,10 +52,11 @@ sub make_link {
 sub stage_2 {
     my ($r, $filename, $listname) = @_;
     my ($author)=($filename=~/\/res\/[^\/]+\/([^\/]+)\//);
-    $r->print(&Apache::loncommon::start_page('Copy Problem Source Code to Construction Space')
+    $r->print(&Apache::loncommon::start_page('Copy Problem Source Code to Authoring Space',undef,
+                                             {'only_body' => 1,})
              .&mt('Please enter the directory that you would like the source code to go into.')
              .'<p>'
-             .&mt('Note: the path is in reference to the root of your construction space,'
+             .&mt('Note: the path is in reference to the root of your Authoring Space,'
                  .' and new directories will be automatically created.')
              .'</p>');
     $r->print('<form name="copy" action="/adm/source" target="_parent" method="post">
@@ -64,7 +65,8 @@ sub stage_2 {
               <input type="hidden" name="action" value="copy_stage" />
               <input type="text" size="50" name="newpath" value="/'.&mt('shared_source').'/'.$author.'" />&nbsp;
               <input type="submit" value="'.&mt('Copy').'" />
-              </form>');
+              </form>'.
+              &Apache::loncommon::end_page());
     return OK;
 }
 
@@ -98,17 +100,17 @@ sub copy_stage {
 
 #Just checking again for access as we want to make sure that it is really ok now that we have the real path
 
-    my ($uname,$udom)= &Apache::loncacc::constructaccess($path_to_new_file);
+    my ($uname,$udom)= &Apache::lonnet::constructaccess($path_to_new_file);
 
     if (!$uname || !$udom) {
-	$r->print(&Apache::loncommon::start_page('Not Allowed'));
+	$r->print(&Apache::loncommon::start_page('Not Allowed',undef,{'only_body' => 1}));
 	$r->print(&mt('Not allowed to create file [_1]', $path_to_new_file));
 	$r->print(&Apache::loncommon::end_page());
 	return;
     }
 
     #allowed
-    $r->print(&Apache::loncommon::start_page('Copying Source'));
+    $r->print(&Apache::loncommon::start_page('Copying Source',undef,{'only_body' => 1}));
     my $result = &Apache::loncfile::exists($uname, $udom, $path_to_new_file);
     $r->print($result);
     if(($result) && ($result =~ m|published|) ) {
@@ -120,11 +122,12 @@ sub copy_stage {
     }
     
     $r->print(&Apache::loncommon::end_page());
+    return;
 }
 
 sub confirm {
     my ($r, $newpath, $filename, $path_to_new_file) = @_;
-    $r->print("<b>Press delete to remove file and replace it with a copy of the source you are viewing</b><br /><br /	>");
+    $r->print('<b>'.&mt('Press delete to remove file and replace it with a copy of the source you are viewing.').'</b><br /><br />');
     $r->print('<form name="delete_confirm" action="/adm/source" target="_parent" method="post">
               <input type="hidden" name="filename" value="'.$filename.'" />
               <input type="hidden" name="path" value="'.$path_to_new_file.'" />
@@ -133,6 +136,7 @@ sub confirm {
 
               <input type="submit" value="Delete" />
               </form>');
+    return;
 }
 
 sub delete_copy_file {
@@ -143,26 +147,30 @@ sub delete_copy_file {
                  .'</span><br />'
                  .&mt('Please use the code view in previous window to use shared code.')
                  .'<br /><br />');
-        $r->print('<input type="button" value="Close Window" name="close"'
+        $r->print('<form name="delete_done" action="/adm/source" target="_parent" method="post">'
+                 .'<input type="button" value="'.&mt('Close Window').'" name="close"'
                  .' onclick="window.close()" />'
-                 .'</p>');
+                 .'</form></p>');
     } else {
+        $r->print(&Apache::loncommon::start_page('Copying Source',undef,{'only_body' => 1}));
         if(-e $path_to_new_file) {
             unless(unlink($path_to_new_file)) {
                 $r->print('<p class="LC_error"">'.&mt('Error:').' '.$!.'</p>');
                 return 0;
             }
         } else {
-            $r->print('<p class="LC_error">'.&mt('No such file').'</p></form>');
+            $r->print('<p class="LC_error">'.&mt('No such file').'</p>');
             return 0;
         }
         &copy_file($r, $newpath, $filename, $path_to_new_file);
+        $r->print(&Apache::loncommon::end_page());
     }
+    return;
 }
 
 sub copy_file {
     my ($r, $newpath, $filename, $path_to_new_file) = @_;
-    $r->print("<b>Creating directories</b>");
+    $r->print('<b>'.&mt('Creating directories').'</b>');
 
 #Figure out if we are author or co-author
     my ($role,$author_name,$domain)=&copy_author();
@@ -188,7 +196,7 @@ sub copy_file {
         } else { } #Just move along
 
     }
-    $r->print("<br /><b>Copying File</b>");
+    $r->print('<br /><b>'.&mt('Copying File').'</b>');
     my $problem_filename = $Apache::lonnet::perlvar{'lonDocRoot'}.$filename;
     my $file_output = &includemeta(&Apache::lonnet::getfile($problem_filename),$filename);
     my $fs=Apache::File->new(">$path_to_new_file");
@@ -196,8 +204,12 @@ sub copy_file {
         print $fs $file_output;
     }
     $r->print("<br /><br />");
-    $r->print('<input type="button" value="Close Window" name="close" onclick="window.close()" />');
+    $r->print('<form name="copied_file" action="/adm/source" target="_parent" method="post">'
+              .'<input type="button" value="'
+              .&mt('Close Window').'" name="close" onclick="window.close()" />'
+              .'</form>');
     #Some 1.3'ish feature is to include the derivative feature, will go here..'
+    return;
 }
 
 sub print_item {
@@ -236,7 +248,7 @@ sub print_item {
               <input type="hidden" name="filename" value="'.$filename.'" />
               <input type="hidden" name="listname" value="'.$listname.'" />
               <input type="hidden" name="action" value="stage2" />
-              <input type="submit" value="'.&mt('Copy to Construction Space').'" />
+              <input type="submit" value="'.&mt('Copy to Authoring Space').'" />
              </form><hr />
                 ');
             } else {