--- loncom/homework/structuretags.pm 2006/04/20 03:28:52 1.350
+++ loncom/homework/structuretags.pm 2007/04/06 21:22:24 1.375
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.350 2006/04/20 03:28:52 albertel Exp $
+# $Id: structuretags.pm,v 1.375 2007/04/06 21:22:24 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,6 +38,9 @@ use Apache::lonlocal;
use Apache::lonxml;
use Apache::lonenc();
use Time::HiRes qw( gettimeofday tv_interval );
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
}
@@ -85,6 +88,14 @@ sub page_start {
$parstack,$parser,$safeeval);
}
+ $extra_head.= '
+
+';
+
my %body_args;
if (defined($found{'html'})) {
$body_args{'skip_phases'}{'head'}=1;
@@ -131,7 +142,7 @@ sub page_start {
$body_args{'force_register'} = 1;
$body_args{'add_entries'} = \%add_entries;
}
-
+ $body_args{'no_auto_mt_title'} = 1;
my $page_start = &Apache::loncommon::start_page($name,$extra_head,
\%body_args);
@@ -139,7 +150,7 @@ sub page_start {
&& $env{'request.state'} ne 'construct'
&& ($target eq 'web' || $target eq 'webgrade')) {
- my ($symb,undef,undef,undef,$publicuser)= &Apache::lonxml::whichuser();
+ my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
if ($symb eq '' && !$publicuser) {
my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
$help=&mt("Browsing resource, all submissions are temporary.")."
";
@@ -159,9 +170,16 @@ sub page_start {
if ($target eq 'edit') {
$form_tag_start.=&Apache::edit::form_change_detection();
}
- $form_tag_start.='>';
+ $form_tag_start.='>'."\n";
+
+ my $symb=&Apache::lonnet::symbread();
+ if ($symb =~ /\S/) {
+ $symb=
+ &HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb));
+ $form_tag_start.=
+ "\t".''."\n";
+ }
}
- &Apache::lonnet::logthis("page_start -- ".length($page_start));
return ($page_start,$form_tag_start);
}
@@ -171,7 +189,7 @@ sub get_resource_name {
if (defined($Apache::lonhomework::name)) {
return $Apache::lonhomework::name;
}
- my ($symb)=&Apache::lonxml::whichuser();
+ my ($symb)=&Apache::lonnet::whichuser();
my $name=&Apache::lonnet::gettitle($symb);
if ($name eq '') {
$name=&Apache::lonnet::EXT('resource.title');
@@ -188,7 +206,7 @@ sub get_resource_name {
sub setup_rndseed {
my ($safeeval)=@_;
my $rndseed;
- my ($symb)=&Apache::lonxml::whichuser();
+ my ($symb)=&Apache::lonnet::whichuser();
if ($env{'request.state'} eq "construct"
|| $symb eq ''
|| $Apache::lonhomework::type eq 'practice'
@@ -203,7 +221,8 @@ sub setup_rndseed {
}
$env{'form.rndseed'}=$rndseed;
}
- if ($env{'form.resetdata'} eq &mt('New Problem Variation') ||
+ if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')
+ && $env{'form.submitted'} eq 'yes') ||
$env{'form.newrandomization'} eq &mt('New Randomization')) {
srand(time);
$rndseed=int(rand(2100000000));
@@ -241,7 +260,7 @@ sub problem_edit_header {
'. - &Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help') + &Apache::loncommon::help_open_menu('Problem Editing Help','Problem_Editor_XML_Index',5,'Authoring',undef,undef,undef,'Problem Editing Help') .' |
';
}
@@ -266,9 +285,7 @@ sub option {
sub problem_web_to_edit_header {
my ($rndseed)=@_;
my $result.='';
- if (!$Apache::lonhomework::parsing_a_task) {
- $result .= '';
- }
+ $result .= '';
$result .= '
@@ -283,9 +300,9 @@ sub problem_web_to_edit_header {
: &mt(' Show All Foils');
if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }
- $result.= ' />'.$show_all_foils_text.
+ $result.= ' />'.$show_all_foils_text.''.
&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
- ' '; + ' '; if (!$Apache::lonhomework::parsing_a_task) { $result.=" $lt{'id_expln'} $lt{'warning'} - @@ -459,9 +490,10 @@ sub firstaccess_msg { my ($map)=&Apache::lonnet::decode_symb($symb); my $foldertitle=&Apache::lonnet::gettitle($map); &Apache::lonxml::debug("map is $map title is $foldertitle"); + my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'}); return (< |
". &Apache::edit::insertlist($target,$token). + ' | ' .
+ &Apache::loncommon::helpLatexCheatsheet().
&Apache::edit::end_row().
- &Apache::edit::start_spanning_row()."\n"
- . &Apache::loncommon::helpLatexCheatsheet () .
+ &Apache::edit::start_spanning_row()."\n".
&Apache::edit::editfield($token->[1],$text,"",80,8,1);
}
if ($target eq 'modified') {
@@ -1613,9 +1671,9 @@ sub start_simpleeditbutton {
(&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
my $url=$env{'request.noversionuri'};
$url=~s/\?.*$//;
- my ($symb) = &Apache::lonxml::whichuser();
+ my ($symb) = &Apache::lonnet::whichuser();
$result='
'; } return $result; |