--- loncom/homework/inputtags.pm	2009/09/23 03:15:18	1.259.2.1
+++ loncom/homework/inputtags.pm	2009/07/17 15:27:17	1.260
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.259.2.1 2009/09/23 03:15:18 gci Exp $
+# $Id: inputtags.pm,v 1.260 2009/07/17 15:27:17 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -869,11 +869,7 @@ sub decideoutput {
 	$css_class=$possible_class{'charged_try'};
 	$button=1;
     } elsif ($award eq 'SUBMITTED') {
-        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.');
-            }
-        }
+	$message = &mt("Your submission has been recorded.");
 	$css_class=$possible_class{'no_grade'};
 	$button=1;
     } elsif ($award eq 'DRAFT') {
@@ -926,16 +922,9 @@ sub decideoutput {
     if (&Apache::lonhomework::hide_problem_status()
 	&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
 	&& &hide_award($award)) {
-        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;
+	$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
+	$css_class=$possible_class{'no_grade'};
+	$button=1;
     }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && 
 	!$added_computer_text && $target ne 'tex') {
@@ -1248,20 +1237,16 @@ sub get_grade_messages {
 		$trystr = '\vskip 0 mm ';
 	    }
 	} else {
-            $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>";
+	    $trystr = '<td><span class="LC_nobreak">'.$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>";
 	}
     }
 
@@ -1302,17 +1287,11 @@ sub gradestatus {
 	    undef($previousmsg);
 	}
 	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');
-                }
+	    if ($target ne 'tex') {
 		$button = 
-		    '<input 
-                          onmouseup="javascript:setSubmittedPart(\''.$id.'\')"
-                           onsubmit="javascript:setSubmittedPart(\''.$id.'\')"
-                        type="submit" name="submit_'.$id.'"
-                         value="'.$submit_text.'" />';
+            '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\')"
+                    type="submit" name="submit_'.$id.'"
+                    value="'.&mt('Submit Answer').'" />';
 	    }
 	}
 
@@ -1420,15 +1399,11 @@ 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);\">".$triestext."</a><br />";
+</script><a href=\"javascript:$function_name();void(0);\">".&mt("Previous Tries")."</a><br />";
     #use Data::Dumper;
     #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
     return $result;