[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm structuretags.pm

[raeburn]

raeburn		Fri Mar 27 01:07:11 2009 EDT

  Modified files:              
    /loncom/homework	bridgetask.pm structuretags.pm 
  Log:
  - Eliminate ending . from button text.
  - Use same phrase for both .task and .problem when slots in use and status is "NOT_IN_A_SLOT".
  
  
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.246 loncom/homework/bridgetask.pm:1.247
--- loncom/homework/bridgetask.pm:1.246	Fri Mar 27 00:20:39 2009
+++ loncom/homework/bridgetask.pm	Fri Mar 27 01:07:10 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.246 2009/03/27 00:20:39 raeburn Exp $
+# $Id: bridgetask.pm,v 1.247 2009/03/27 01:07:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -315,7 +315,7 @@
     my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);
     my $action='get_reservation';
     if ($slot_name) {
-	$text=&mt('Change reservation.');
+	$text=&mt('Change reservation');
 	$action='change_reservation';
 	my $description=&Apache::slotrequest::get_description($slot_name,
 							      $slot);
@@ -698,7 +698,7 @@
 		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
 		} elsif ($status eq 'NOT_IN_A_SLOT') {
 		    $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
-		    $msg.=&add_request_another_attempt_button("Sign up for time to work.");
+		    $msg.=&add_request_another_attempt_button("Sign up for time to work");
 		} elsif ($status eq 'NEEDS_CHECKIN') {
 		    $msg.='<h1>'.&mt('You need the Proctor to validate you.').
 			'</h1>'.&proctor_validation_screen($slot);
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.440 loncom/homework/structuretags.pm:1.441
--- loncom/homework/structuretags.pm:1.440	Wed Mar 18 13:46:26 2009
+++ loncom/homework/structuretags.pm	Fri Mar 27 01:07:10 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.440 2009/03/18 13:46:26 bisitz Exp $
+# $Id: structuretags.pm,v 1.441 2009/03/27 01:07:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -939,6 +939,8 @@
 		my $msg;
 		if ($status eq 'UNAVAILABLE') {
 		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+                } elsif ($status eq 'NOT_IN_A_SLOT') {
+                    $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
 		} elsif ($status ne 'NOT_YET_VIEWED') {
 		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
 		}
@@ -949,7 +951,7 @@
 		} elsif ($status eq 'NOT_YET_VIEWED') {
 		    $msg.=&firstaccess_msg($accessmsg,$symb);
 		} elsif ($status eq 'NOT_IN_A_SLOT') {
-		    $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work.");
+		    $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
 		}
 		$result.=$msg.'<br />';
 	    } elsif ($target eq 'tex') {