--- loncom/homework/structuretags.pm	2009/05/28 12:39:17	1.447
+++ loncom/homework/structuretags.pm	2010/08/09 23:39:50	1.461.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.447 2009/05/28 12:39:17 bisitz Exp $
+# $Id: structuretags.pm,v 1.461.2.1 2010/08/09 23:39:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -212,8 +212,21 @@ sub page_start {
 	    if ($env{'environment.remote'} ne 'off') {
 		$body_args{'only_body'}  = 1;
 	    }
-        $pageheader = &Apache::lonhtmlcommon::breadcrumbs() # FIXME add breadcrumbs
-                     .&Apache::loncommon::head_subbox(
+        # Breadcrumbs for Construction Space
+        &Apache::lonhtmlcommon::clear_breadcrumbs();
+        &Apache::lonhtmlcommon::add_breadcrumb({
+            'text'  => 'Construction Space',
+            'href'  => &Apache::loncommon::authorspace(),
+        });
+        # breadcrumbs (and tools) will be created 
+        # in start_page->bodytag->innerregister
+
+# FIXME Where are we?
+#        &Apache::lonhtmlcommon::add_breadcrumb({
+#            'text'  => 'Problem Editing', # 'Problem Testing'
+#            'href'  => '',
+#        });
+        $pageheader =&Apache::loncommon::head_subbox(
                 &Apache::loncommon::CSTR_pageheader());
 	}
     } elsif (!defined($found{'body'})) {
@@ -241,16 +254,19 @@ sub page_start {
     my $page_start = &Apache::loncommon::start_page($name,$extra_head,
 						    \%body_args);
     $page_start .= $pageheader;
-    if (!defined($found{'body'}) 
-	&& $env{'request.state'} ne 'construct'
-	&& ($target eq 'web' || $target eq 'webgrade')) {
-
-	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.")."<br />";
-	    $page_start .= $help;
-	}
+
+    unless ($env{'request.gcicontext'} eq 'buildtest') {
+        if (!defined($found{'body'})
+            && $env{'request.state'} ne 'construct'
+            && ($target eq 'web' || $target eq 'webgrade')) {
+
+            my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
+            if ($symb eq '' && !$publicuser) {
+                $page_start .= '<p class="LC_info">'
+                              .&mt('Browsing resource, all submissions are temporary.')
+                              .'</p>';
+            }
+        }
     }
 
     if (!defined($found{'body'}) && $env{'request.state'} ne 'construct') {
@@ -260,7 +276,8 @@ sub page_start {
     my $form_tag_start;
     if (!defined($found{'form'})) {
 	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
-	my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
+	my $uri = Apache::loncommon::inhibit_menu_check(
+                &Apache::lonenc::check_encrypt($env{'request.uri'}));
 	$form_tag_start.=$uri.'" ';
 	if ($target eq 'edit') {
 	    $form_tag_start.=&Apache::edit::form_change_detection();
@@ -375,19 +392,19 @@ sub problem_edit_header {
 '.&mt('Problem Editing').&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
 </div>'.
 &problem_edit_buttons().'
-<hr class="LC_edit_problem_divide" />
+<hr style="clear:both;" />
 '.&Apache::lonxml::message_location().'
 </div>
 '.
-       '<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';
+       '<table border="0" width="100%"><tr><td bgcolor="#F8F8F8">';
 }
 
 sub problem_edit_footer {
     return '</td></tr></table><br />
 <div class="LC_edit_problem_footer">
-  <hr class="LC_edit_problem_divide" />'.
+  <hr />'.
 &problem_edit_buttons().'
-  <hr class="LC_edit_problem_divide" />
+  <hr style="clear:both;" />
 </div>
 '.
 
@@ -424,12 +441,14 @@ sub problem_web_to_edit_header {
     
     my $show_all_foils_text = 
 	($Apache::lonhomework::parsing_a_task) ?
-	&mt('&nbsp;Show&nbsp;All&nbsp;Instances')
-	: &mt('&nbsp;Show&nbsp;All&nbsp;Foils');
+	&mt('Show All Instances')
+	: &mt('Show All Foils');
 
-    my $show_all= '<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils"';
+    my $show_all= '<span class="LC_nobreak"><label for="showallfoils">'
+                 .'<input type="checkbox" name="showallfoils"';
     if (defined($env{'form.showallfoils'})) { $show_all.=' checked="checked"'; }
-    $show_all.= ' />'.$show_all_foils_text.'</label></span>';
+    $show_all.= ' /> '.$show_all_foils_text
+               .'</label></span>';
 
 
 
@@ -502,7 +521,7 @@ $show_all
      <input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" />
      <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
    </div>
-   <hr class="LC_edit_problem_divide" />
+   <hr />
    <div class="LC_edit_problem_header_randomize_row">
      <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
      <input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
@@ -526,7 +545,7 @@ $show_all
 
     $result.='
    </div>
-   <hr class="LC_edit_problem_divide" />
+   <hr />
    <div>';
     $result.='<input type="hidden" name="problemmode" value="view" />';
     $result .= '<input type="button" name="submitmode" accesskey="e" value="'.&mt('Edit').'" '.
@@ -535,7 +554,7 @@ $show_all
                'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
     $result.='
    </div>
-   <hr class="LC_edit_problem_divide" />
+   <hr />
    '.&Apache::lonxml::message_location().'
 </div>';
     return $result;
@@ -635,7 +654,11 @@ item store_aggregates()
 
 sub store_aggregates {
     my ($symb,$courseid) = @_;
-    my %aggregate;
+    my (%aggregate,%subtracker);
+    my $tracksub;
+    if ($symb =~ m{^uploaded/gcitest/$LONCAPA::match_courseid/default_1261144274.sequence___\d+___gci/gci/}) {
+        $tracksub = 1;
+    }
     my @parts;
     my $cdomain = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -650,6 +673,9 @@ sub store_aggregates {
 	    $Apache::lonhomework::results{'resource.'.$part.'.award'}
 	    eq 'EXACT_ANS') {
             $aggregate{$symb."\0".$part."\0correct"} = 1;
+            if ($tracksub) {
+                $subtracker{$env{'user.name'}.':'.$env{'user.domain'}."\0correct"} ++;
+            }
         }
         if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {
             $aggregate{$symb."\0".$part."\0users"} = 1;
@@ -662,11 +688,22 @@ sub store_aggregates {
             }
         }
         $aggregate{$symb."\0".$part."\0attempts"} = 1;
+        if ($tracksub) {
+            if ($Apache::lonhomework::type eq 'survey') {
+                $subtracker{$env{'user.name'}.':'.$env{'user.domain'}."\0surveysubs"} ++;
+            } else {
+                $subtracker{$env{'user.name'}.':'.$env{'user.domain'}."\0attempts"} ++;
+            }
+        }
     }
     if (keys (%aggregate) > 0) {
 	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
                             $cdomain,$cname);
     }
+    if (keys(%subtracker) > 0) {
+        &Apache::lonnet::cinc('nohist_submissiontracker',\%subtracker,
+                            $cdomain,$cname);
+    }
 }
 
 sub checkout_msg {
@@ -680,9 +717,7 @@ sub checkout_msg {
     return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>
     <p>$lt{'id_expln'}</p>
-<font color="red">
-<p>$lt{'warning'}</p>
-</font>
+<p class="LC_warning">$lt{'warning'}</p>
 <form name="checkout" method="post" action="$uri">
 <input type="hidden" name="doescheckout" value="yes" />
 <input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
@@ -900,27 +935,34 @@ sub start_problem {
 	if ($env{'request.state'} ne "construct" && 
 	    ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
-		$rndseed.'" />'.
-		    '<input type="submit" name="resetdata"
-                             value="'.&mt('New Problem Variation').'" />';
+		$rndseed.'" />';
+            unless ($env{'request.gcicontext'} eq 'buildtest') {
+                $form_tag_start .= '<input type="submit" name="resetdata"'.
+                            ' value="'.&mt('New Problem Variation').'" />';
+            }
 	    if (exists($env{'form.username'})) {
 		$form_tag_start.=
 		    '<input type="hidden" name="username"
                              value="'.$env{'form.username'}.'" />';
 	    }
-	    if ($env{'request.role.adv'}) {
-		$form_tag_start.=
-		    ' <label><input type="checkbox" name="showallfoils"';
-		if (defined($env{'form.showallfoils'})) {
-		    $form_tag_start.=' checked="checked"';
-		}
-		$form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
-		    '</label>';
-	    }
+            unless ($env{'request.gcicontext'} eq 'buildtest') {
+	        if ($env{'request.role.adv'}) {
+		    $form_tag_start.= ' <label class="LC_nobreak">'
+                              .'<input type="checkbox" name="showallfoils"';
+		    if (defined($env{'form.showallfoils'})) {
+		        $form_tag_start.=' checked="checked"';
+		    }
+                    $form_tag_start.= ' /> '
+                                     .&mt('Show All Foils')
+                                     .'</label>';
+	        }
+            }
             if ($Apache::lonhomework::type eq 'practice') {
                 $form_tag_start.=&practice_problem_header();
             }
-	    $form_tag_start.='<hr />';
+            unless ($env{'request.gcicontext'} eq 'buildtest') {
+	        $form_tag_start.='<hr />';
+            }
 	}
 
 	($status,$accessmsg,my $slot_name,my $slot) = 
@@ -1074,6 +1116,8 @@ sub end_problem {
 	
 	my $duetime = &Apache::lonnet::EXT("resource.$id.duedate"); 
 	my $duedate = POSIX::strftime("%c",localtime($duetime));
+        my $duedate_text = &mt('Due date: [_1]'
+                              ,&Apache::lonlocal::locallocaltime($duetime));
 	my $temp_file;
 	my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
 	
@@ -1105,13 +1149,13 @@ sub end_problem {
 	    if (not $env{'request.symb'} =~ m/\.page_/) {
 		if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
 		    $frontmatter .= $begin_doc.
-			'\textit{Due date: '.$duedate.'} '.$toc_line;
+			'\textit{'.$duedate_text.'} '.$toc_line;
 		} else {
 		    $frontmatter.= $begin_doc.$toc_line;
 		    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
 		}
 	    } else {
-		$frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'.$startminipage;
+		$frontmatter .= '\vskip 1mm\textit{'.$duedate_text.'} \\\\\\\\'.$startminipage;
 	    }
 	} else {
 	    if (not $env{'request.symb'} =~ m/\.page_/) {
@@ -2040,15 +2084,16 @@ sub start_simpleeditbutton {
         my $url=$env{'request.noversionuri'};
         $url=~s/\?.*$//;
 	my ($symb) = &Apache::lonnet::whichuser();
-#       Warning make more sense and is more important on edit screen
+#       Warning makes more sense and is more important on edit screen
 #       $result='<p class="LC_warning">'
 #              .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.')
 #              .&Apache::loncommon::help_open_topic('Caching')
 #              .'</p>';
-        $result.=&Apache::lontemplate::start_functionslist()
-                .&Apache::lontemplate::item_functionslist(
-                     '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'.&mt('Edit').'</a>')
-                .&Apache::lontemplate::end_functionslist();
+        $result.=&Apache::lonhtmlcommon::start_funclist()
+                .&Apache::lonhtmlcommon::add_item_funclist(
+                     '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'
+                    .&mt('Edit').'</a>')
+                .&Apache::lonhtmlcommon::end_funclist();
 
     }
     return $result;