--- loncom/homework/inputtags.pm	2008/12/10 22:54:12	1.248.2.2
+++ loncom/homework/inputtags.pm	2009/09/14 17:03:42	1.248.4.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.248.2.2 2008/12/10 22:54:12 raeburn Exp $
+# $Id: inputtags.pm,v 1.248.4.2 2009/09/14 17:03:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -776,7 +776,6 @@ sub decideoutput {
         $message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.');
         $css_class=$possible_class{'not_charged_try'};
         $button=1;
-
     } elsif ($award eq 'INVALID_FILETYPE') {
 	$message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');
 	$css_class=$possible_class{'not_charged_try'};
@@ -830,6 +829,11 @@ sub decideoutput {
 	$button=1;
     } elsif ($award eq 'SUBMITTED') {
 	$message = &mt("Your submission has been recorded.");
+        if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
+            if ($target eq 'web') {
+                $message .= '<br />'.&mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');
+            }
+        }
 	$css_class=$possible_class{'no_grade'};
 	$button=1;
     } elsif ($award eq 'DRAFT') {
@@ -855,21 +859,41 @@ sub decideoutput {
     my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
     foreach my $resid(@Apache::inputtags::response){
         if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {
-	    $message.='<br />';
+            if ($target eq 'tex') {
+                $message.= "\\\\\n";
+            } else {
+                $message.='<br />';
+            }
 	    my @files = split(/\s*,\s*/,
 			      $Apache::lonhomework::history{"resource.$part.$resid.handback"});
 	    my $file_msg;
 	    foreach my $file (@files) {
-		$file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>';
+                if ($target eq 'tex') {
+                    $file_msg.= "\\\\\n".$file;
+                } else {
+                    $file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>';
+                }
 	    }
 	    $message .= &mt('Returned file(s): [_1]',$file_msg);
+            if ($target eq 'tex') {
+                $message.= "\\\\\n";
+            } else {
+                $message.='<br />';
+            }
 	}
     }
 
     if (&Apache::lonhomework::hide_problem_status()
 	&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
 	&& &hide_award($award)) {
-	$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
+        if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
+            if ($target eq 'web') {
+                $message = &mt("Your submission has been recorded.").'<br />'.
+                           &mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');
+            }
+        } else {
+            $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
+        }
 	$css_class=$possible_class{'no_grade'};
 	$button=1;
     }
@@ -1184,16 +1208,20 @@ sub get_grade_messages {
 		$trystr = '\vskip 0 mm ';
 	    }
 	} else {
-	    $trystr = "<td><nobr>".$tries_text." $tries";
-	    if ($Apache::lonhomework::parsing_a_task) {
-	    } elsif($env{'request.state'} ne 'construct') {
-		$trystr.="/$maxtries";
-	    } else {
-		if (defined($Apache::inputtags::params{'maxtries'})) {
-		    $trystr.="/".$Apache::inputtags::params{'maxtries'};
-		}
-	    }
-	    $trystr.="</nobr></td>";
+            $trystr = '<td><span class="LC_nobreak">';
+            my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
+            if ($parmhash{'suppress_tries'} ne 'yes') {
+                $trystr .= "$tries_text $tries";
+	        if ($Apache::lonhomework::parsing_a_task) {
+	        } elsif($env{'request.state'} ne 'construct') {
+		    $trystr.="/$maxtries";
+	        } else {
+		    if (defined($Apache::inputtags::params{'maxtries'})) {
+		        $trystr.="/".$Apache::inputtags::params{'maxtries'};
+		    }
+	        }
+            }
+	    $trystr.="</span></td>";
 	}
     }
 
@@ -1233,14 +1261,18 @@ sub gradestatus {
 	if ( $status eq 'SHOW_ANSWER') {
 	    undef($previousmsg);
 	}
-	if ( $showbutton ) { 
-	    if ($target ne 'tex') {
+	if ( $showbutton ) {
+            if ($target ne 'tex') {
+                my $submit_text = &mt('Submit Answer');
+                if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
+                    $submit_text = &mt('Submit Questions');
+                }
 		$button = 
 		    '<input 
                           onmouseup="javascript:setSubmittedPart(\''.$id.'\')"
                            onsubmit="javascript:setSubmittedPart(\''.$id.'\')"
                         type="submit" name="submit_'.$id.'"
-                         value="'.&mt('Submit Answer').'" />';
+                         value="'.$submit_text.'" />';
 	    }
 	}
 
@@ -1348,11 +1380,15 @@ sub previous_tries {
     $prefix =~ tr{.}{_};
     my $function_name = "LONCAPA_previous_tries_".$prefix.
 	$Apache::lonxml::curdepth.'_'.$env{'form.counter'};
+    my $triestext = &mt('Previous Tries');
+    if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
+        $triestext = &mt('Submission History');
+    }
     my $result ="<script type=\"text/javascript\">
 // <![CDATA[
     function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}
 // ]]>
-</script><a href=\"javascript:$function_name();void(0);\">".&mt("Previous Tries")."</a><br />";
+</script><a href=\"javascript:$function_name();void(0);\">".$triestext."</a><br />";
     #use Data::Dumper;
     #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
     return $result;