--- loncom/publisher/Attic/lonconstruct.pm	2006/04/11 18:58:22	1.33
+++ loncom/publisher/Attic/lonconstruct.pm	2013/06/04 22:20:16	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
-# Construction Space Page Wrapper for Construction
+# Authoring Space Page Wrapper
 #
-# $Id: lonconstruct.pm,v 1.33 2006/04/11 18:58:22 albertel Exp $
+# $Id: lonconstruct.pm,v 1.38 2013/06/04 22:20:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,16 +27,22 @@
 #
 #
 
-package Apache::lonconstruct;
 
+=pod
 
-use strict;
-use Apache::Constants qw(:common :http :methods);
-use Apache::lonnet;
-use HTML::Entities();
+=head1
+
+=head1 NAME
+
+Apache::lonconstruct
+
+=head1 SYNOPSIS
+
+Page wrapper for handling construction space.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
 
-my $DEBUG = 0;
-=pod
 
 =item Debug($request, $message)
 
@@ -59,6 +65,17 @@ my $DEBUG = 0;
 
 =cut
 
+package Apache::lonconstruct;
+
+
+use strict;
+use Apache::Constants qw(:common :http :methods);
+use Apache::lonnet;
+use HTML::Entities();
+
+my $DEBUG = 0;
+
+
 sub Debug {
     # Put out the indicated message but only if DEBUG is true.
     if ($DEBUG) {
@@ -92,45 +109,20 @@ sub handler {
    &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['forceedit']);
    if ($env{'form.forceedit'}) {
-       $lowerframe.='?editmode=Edit&problemmode=EditXML';
+       $lowerframe.='?editmode=Edit&problemmode=editxml';
    }	
    &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['forceColoredit']);
    if ($env{'form.forceColoredit'}) {
-       $lowerframe.='?editmode=Edit&problemmode=Edit';
-   }
-
-#
-# Checking to see if we should display the topframe
-#
-   my $toprows = 0;
-   my $topsrc = '';
-   if ($env{'environment.remote'} ne 'off') {
-       $toprows = '110';
-       $topsrc = '/adm/localize/adm/publisher.html';
+       $lowerframe.='?editmode=Edit&problemmode=edit';
    }
 
-   my $js=qq|
-<script type="text/javascript">
-var lastknownpriv="$lowerframe";
-</script>
-    |;
-
-   my $start_page=
-       &Apache::loncommon::start_page('Construction Space',$js,
-				      {'frameset'    => 1,
-				       'add_entries' => {
-					   'rows'   => "$toprows,*",
-					   'border' => "0",}});
-   my $end_page=
-       &Apache::loncommon::end_page({'frameset' => 1});
-
-   $r->print(<<ENDPAGE);
-$start_page
-<frame src='$topsrc' />
-<frame src="$lowerframe" name="LONCAPAToBePublished" />
-$end_page
-ENDPAGE
+   # when the remote control existed we used to force the
+   # pages of construction space into a frameset.
+   # without remote control, we can elimnate this frameset
+   # and redirect to the url of the content frame.
+   # This keeps all URLs intact. 
+   $r->internal_redirect($lowerframe);
    return OK;
 }
 1;