[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm /interface/spreadsheet lonspreadsheet.pm

raeburn raeburn at source.lon-capa.org
Tue Sep 1 12:36:38 EDT 2020


raeburn		Tue Sep  1 16:36:38 2020 EDT

  Modified files:              
    /loncom/interface/spreadsheet	lonspreadsheet.pm 
    /loncom/homework	bridgetask.pm 
  Log:
  - Bug 6938
  
  
Index: loncom/interface/spreadsheet/lonspreadsheet.pm
diff -u loncom/interface/spreadsheet/lonspreadsheet.pm:1.59 loncom/interface/spreadsheet/lonspreadsheet.pm:1.60
--- loncom/interface/spreadsheet/lonspreadsheet.pm:1.59	Mon Sep 26 12:15:39 2011
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	Mon Sep 26 15:48:06 2011
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.59 2011/09/26 12:15:39 raeburn Exp $
+# $Id: lonspreadsheet.pm,v 1.60 2011/09/26 15:48:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -107,10 +107,13 @@
         $spreadsheet->filename($env{'form.savefilename'});
         my $save_status = $spreadsheet->save();
         if ($save_status ne 'ok') {
-            $message .= "An error occurred while saving the spreadsheet".
-                "There error is:".$save_status;
+            $message .= '<span class="LC_error">'.
+                &mt('An error occurred while saving the spreadsheet. The error is: [_1].',
+                    $save_status).'</span>';
         } else {
-            $message .= "Spreadsheet saved as ".$spreadsheet->filename();
+            $message .= '<span class="LC_info">'.&mt('Spreadsheet saved as: [_1] .',
+                        '<span class="LC_filename">'.$spreadsheet->filename().'</span>').
+                        '</span>';
         }
     } elsif (exists($env{'form.newformula'}) && 
              exists($env{'form.cell'})       && 
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.270 loncom/homework/bridgetask.pm:1.271
--- loncom/homework/bridgetask.pm:1.270	Wed Jan 31 15:28:28 2018
+++ loncom/homework/bridgetask.pm	Tue Sep  1 16:36:38 2020
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.270 2018/01/31 15:28:28 raeburn Exp $
+# $Id: bridgetask.pm,v 1.271 2020/09/01 16:36:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,6 +65,7 @@
 sub proctor_check_auth {
     my ($slot_name,$slot,$type)=@_;
     my $user=$env{'form.proctorname'};
+    $user =~ s/^\s+|\s+$//g;
     my $domain=$env{'form.proctordomain'};
     
     my @allowed=split(",",$slot->{'proctor'});
@@ -3329,9 +3330,9 @@
 <input type="hidden" name="validate" value="yes" />
 <input type="hidden" name="submitted" value="yes" />
 <table>
-  <tr><td>$lt{'prus'}</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>
-  <tr><td>$lt{'pasw'}</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
-  <tr><td>$lt{'prdo'}</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>
+  <tr><td>$lt{'prus'}</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" autocomplete="off" /></td></tr>
+  <tr><td>$lt{'pasw'}</td><td><input type="password" name="proctorpassword" value="" autocomplete="off" /></td></tr>
+  <tr><td>$lt{'prdo'}</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" autocomplete="off" /></td></tr>
 </table>
 <input type="submit" name="checkoutbutton" value="$lt{'vali'}"  /><br />
 <table border="1">




More information about the LON-CAPA-cvs mailing list