[LON-CAPA-cvs] cvs: loncom /homework grades.pm /interface domainprefs.pm

[raeburn]

raeburn		Thu Jan 31 17:44:18 2019 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
    /loncom/homework	grades.pm 
  Log:
  - Uploaded bubblesheet data can consist of comma separated values.
    Wording changes and display style for bubbletype div ste to "block".
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.347 loncom/interface/domainprefs.pm:1.348
--- loncom/interface/domainprefs.pm:1.347	Mon Jan 28 21:36:45 2019
+++ loncom/interface/domainprefs.pm	Thu Jan 31 17:44:07 2019
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.347 2019/01/28 21:36:45 raeburn Exp $
+# $Id: domainprefs.pm,v 1.348 2019/01/31 17:44:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8313,7 +8313,7 @@
                                           csv => 'Comma separated values (.csv)',
                                           hdr => 'Remove first line in file (contains column titles)',
                                           pad => 'Prepend 0s to PaperID',
-                                          rem => 'Remove leading spaces (except Q columns)',
+                                          rem => 'Remove leading spaces (except Question Response columns)',
                                           CODE => 'CODE',
                                           ID   => 'Student ID',
                                           PaperID => 'Paper ID',
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.756 loncom/homework/grades.pm:1.757
--- loncom/homework/grades.pm:1.756	Mon Jan 28 21:36:53 2019
+++ loncom/homework/grades.pm	Thu Jan 31 17:44:18 2019
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.756 2019/01/28 21:36:53 raeburn Exp $
+# $Id: grades.pm,v 1.757 2019/01/31 17:44:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9111,7 +9111,9 @@
                             }
                             if ($count > 1) {
                                 $formatextra = '<div style="display:none" id="bubbletype">'.
-                                               &scantron_scantab().'</div>';
+                                               '<span class="LC_nobreak">'.
+                                               &mt('Bubblesheet type:').' '.
+                                               &scantron_scantab().'</span></div>';
                                 $onclick = ' onclick="toggleScantab(this.form);"';
                                 $formatjs = <<"END";
 function toggleScantab(form) {
@@ -9126,7 +9128,7 @@
                     if (chosen == 'dat') {
                         document.getElementById(divid).style.display = 'none';
                     } else if (chosen == 'csv') {
-                        document.getElementById(divid).style.display = 'inline-block';
+                        document.getElementById(divid).style.display = 'block';
                     }
                 }
             }
@@ -9152,7 +9154,7 @@
             } elsif (keys(%{$domconfig{'scantron'}{'config'}}) == 1) {
                 if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
                     if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) {
-                        $formattitle = &mt('Format of bubblesheet data file:');
+                        $formattitle = &mt('Bubblesheet type');
                         $formatoptions = &scantron_scantab();
                     }
                 }