--- loncom/homework/lonhomework.pm 2006/04/11 21:05:54 1.238 +++ loncom/homework/lonhomework.pm 2006/04/21 15:26:25 1.241 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.238 2006/04/11 21:05:54 albertel Exp $ +# $Id: lonhomework.pm,v 1.241 2006/04/21 15:26:25 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -266,6 +266,7 @@ sub check_slot_access { my $slotstatus='NOT_IN_A_SLOT'; my ($returned_slot,$slot_name); foreach my $slot (@slots) { + $slot =~ s/(^\s*|\s*$)//g; &Apache::lonxml::debug("getting $slot"); my %slot=&Apache::lonnet::get_slot($slot); &Apache::lonhomework::showhash(%slot); @@ -623,8 +624,8 @@ sub handle_save_or_undo { sub analyze_header { my ($request) = @_; my $result = - &Apache::loncommon::start_page('Analyzing a problem',undef, - {'only_body' => ($env{'environment.remote'} ne 'off'),}); + &Apache::loncommon::start_page('Analyzing a problem',undef); + $result .= &Apache::lonxml::message_location().'
- ($env{'environment.remote'} ne 'off')}); + &Apache::edit::js_change_detection()); $result.=$start_page. &renderpage($request,$file,['no_output_web'],1). @@ -911,8 +910,8 @@ sub newproblem { $errormsg='

'.&mt('You did not select a template.').'

'."\n"; } my $instructions; - my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, - ($env{'environment.remote'} ne 'off')); + my $start_page = + &Apache::loncommon::start_page("Create New $extension"); if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'
'.&mt("Then");} my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new', 'resource' => 'resource', @@ -923,7 +922,7 @@ sub newproblem { 'Create' => 'Create', 'button' => 'button'); $request->print(<$lt{'create'} $extension $lt{'resource'} $errormsg $lt{'requested'} $shownurl $lt{'not exist'}. @@ -941,25 +940,6 @@ ENDNEWPROBLEM return ''; } -sub view_or_edit_menu { - my ($request) = @_; - my $url=&HTML::Entities::encode($request->uri,'<>&"'); - my %lt=&Apache::lonlocal::texthash( 'would' => 'Would you like to', - 'view' => 'View', - 'Edit' => 'edit', - 'or' => 'or', - 'the problem' => 'the problem'); - $request->print(< - -$lt{'would'} -<{'or'} -<{'the problem'}. - - -EDITMENU -} - sub handler { #my $t0 = [&gettimeofday()]; my $request=$_[0]; @@ -997,7 +977,6 @@ sub handler { ['problemmode']); if (!(defined $env{'form.problemmode'})) { #first visit to problem in construction space - #&view_or_edit_menu($request); $env{'form.problemmode'}='View'; &renderpage($request,$file); } elsif ($env{'form.problemmode'} eq &mt('EditXML') ||