--- loncom/homework/grades.pm 2006/04/11 20:20:53 1.350 +++ loncom/homework/grades.pm 2006/07/02 00:51:25 1.368 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.350 2006/04/11 20:20:53 albertel Exp $ +# $Id: grades.pm,v 1.368 2006/07/02 00:51:25 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,10 +36,13 @@ use Apache::lonhtmlcommon; use Apache::lonnavmaps; use Apache::lonhomework; use Apache::loncoursedata; -use Apache::lonmsg qw(:user_normal_msg); +use Apache::lonmsg(); use Apache::Constants qw(:common); use Apache::lonlocal; use String::Similarity; +use lib '/home/httpd/lib/perl'; +use LONCAPA; + use POSIX qw(floor); my %oldessays=(); @@ -1143,7 +1146,7 @@ sub sub_page_kw_js { my $iconpath = $request->dir_config('lonIconsURL'); &commonJSfunctions($request); - my $inner_js=< function checkInput() { opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value); @@ -1184,12 +1187,37 @@ sub sub_page_kw_js { INNERJS - my $start_page = - &Apache::loncommon::start_page('MessageCentral',$inner_js, + my $inner_js_highlight_central=< + function updateChoice(flag) { + opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr); + opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize); + opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle); + opener.document.SCORE.refresh.value = "on"; + if (opener.document.SCORE.keywords.value!=""){ + opener.document.SCORE.submit(); + } + self.close() + } + +INNERJS + + my $start_page_msg_central = + &Apache::loncommon::start_page('Message Central',$inner_js_msg_central, {'js_ready' => 1, 'only_body' => 1, 'bgcolor' =>'#FFFFFF',}); - my $end_page = + my $end_page_msg_central = + &Apache::loncommon::end_page({'js_ready' => 1}); + + + my $start_page_highlight_central = + &Apache::loncommon::start_page('Highlight Central', + $inner_js_highlight_central, + {'js_ready' => 1, + 'only_body' => 1, + 'bgcolor' =>'#FFFFFF',}); + my $end_page_highlight_central = &Apache::loncommon::end_page({'js_ready' => 1}); my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); @@ -1307,7 +1335,7 @@ INNERJS pWin.focus(); pDoc = pWin.document; pDoc.$docopen; - pDoc.write('$start_page'); + pDoc.write('$start_page_msg_central'); pDoc.write("
"); pDoc.write(""); @@ -1348,7 +1376,7 @@ INNERJS pDoc.write("  "); pDoc.write("

"); pDoc.write("
"); - pDoc.write('$end_page'); + pDoc.write('$end_page_msg_central'); pDoc.close(); } @@ -1394,26 +1422,7 @@ INNERJS hwdWin.focus(); var hDoc = hwdWin.document; hDoc.$docopen; - hDoc.write(""); - hDoc.write("Highlight Central"); - - hDoc.write(" ENDSCRIPT my $href="/adm/pickcode?". - "form=".&Apache::lonnet::escape("scantronupload"). - "&scantron_format=".&Apache::lonnet::escape($env{'form.scantron_format'}). - "&scantron_CODElist=".&Apache::lonnet::escape($env{'form.scantron_CODElist'}). - "&curCODE=".&Apache::lonnet::escape($$scan_record{'scantron.CODE'}). - "&scantron_selectfile=".&Apache::lonnet::escape($env{'form.scantron_selectfile'}); + "form=".&escape("scantronupload"). + "&scantron_format=".&escape($env{'form.scantron_format'}). + "&scantron_CODElist=".&escape($env{'form.scantron_CODElist'}). + "&curCODE=".&escape($$scan_record{'scantron.CODE'}). + "&scantron_selectfile=".&escape($env{'form.scantron_selectfile'}); if ($env{'form.scantron_CODElist'} =~ /\S/) { $r->print(" Selected CODE is "); $r->print("\n
"); @@ -5930,7 +5961,7 @@ sub handler { if ($#commands > 0) { &Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands)); } - &send_header($request); + $request->print(&Apache::loncommon::start_page('Grading')); if ($symb eq '' && $command eq '') { if ($env{'user.adv'}) { if (($env{'form.codeone'}) && ($env{'form.codetwo'}) && @@ -6021,20 +6052,8 @@ sub handler { $request->print("Access Denied ($command)"); } } - &send_footer($request); - return ''; -} - -sub send_header { - my ($request)= @_; - &Apache::lontexconvert::init_tth(); - $request->print(&Apache::loncommon::start_page('Grading')); - $request->rflush(); -} - -sub send_footer { - my ($request)= @_; $request->print(&Apache::loncommon::end_page()); + return ''; } 1;