--- loncom/homework/structuretags.pm	2009/12/02 18:22:12	1.444.4.2.2.2
+++ loncom/homework/structuretags.pm	2010/01/28 18:15:51	1.444.4.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.444.4.2.2.2 2009/12/02 18:22:12 raeburn Exp $
+# $Id: structuretags.pm,v 1.444.4.3 2010/01/28 18:15:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -236,17 +236,16 @@ sub page_start {
     $body_args{'no_auto_mt_title'} = 1;
     my $page_start = &Apache::loncommon::start_page($name,$extra_head,
 						    \%body_args);
-    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'
+	&& ($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>';
         }
     }
 
@@ -895,34 +894,29 @@ 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.'" />';
-            unless ($env{'request.gcicontext'} eq 'buildtest') {
-		$form_tag_start .= '<input type="submit" name="resetdata"
+		$rndseed.'" />'.
+		    '<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'}.'" />';
 	    }
-            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 ($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();
             }
-            unless ($env{'request.gcicontext'} eq 'buildtest') {
-	        $form_tag_start.='<hr />';
-            }
+	    $form_tag_start.='<hr />';
 	}
 
 	($status,$accessmsg,my $slot_name,my $slot) = 
@@ -1112,7 +1106,9 @@ sub end_problem {
 			'\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}}';}
+                    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) {
+                        $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
+                    }
 		}
 	    } else {
 		$frontmatter .= '\vskip 1mm\textit{'.$duedate_text.'} \\\\\\\\'.$startminipage;
@@ -1120,7 +1116,9 @@ sub end_problem {
 	} else {
 	    if (not $env{'request.symb'} =~ m/\.page_/) {
 		$frontmatter .= $begin_doc.$toc_line;
-		if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
+                if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) {
+                    $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
+                }
 	    } else {
 		$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
 	    }
@@ -1762,7 +1760,9 @@ sub start_part {
 				    '.disableexampointprint'}) eq 'yes') {
 			$allow_print_points=0;
 		    }
-		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
+                    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { 
+                        $result .= '\vskip 10mm\fbox{\textit{'.$weight.' pt}}';
+                    }
 		} elsif ($target eq 'web') {
 		    $result.='<a name="'.&escape($Apache::inputtags::part).'" />';
 		}