[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonparmset.pm

raeburn raeburn at source.lon-capa.org
Thu Aug 8 01:52:15 EDT 2013


raeburn		Thu Aug  8 05:52:15 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonparmset.pm 
  Log:
  - For 2.11.
    - Backport 1.536 (part), 1.537, 1.538, 1.539
  
  
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.522.2.7 loncom/interface/lonparmset.pm:1.522.2.8
--- loncom/interface/lonparmset.pm:1.522.2.7	Thu Jun 27 18:22:41 2013
+++ loncom/interface/lonparmset.pm	Thu Aug  8 05:52:14 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.522.2.7 2013/06/27 18:22:41 raeburn Exp $
+# $Id: lonparmset.pm,v 1.522.2.8 2013/08/08 05:52:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -751,7 +751,7 @@
             $result =
                 '<img src="/res/adm/pages/editmap.png"'
                .' alt="'.&mt('Change').'"'
-               .' title="'.&mt('Change').'" />';
+               .' title="'.&mt('Change').'" style="border:0;" />';
         } else {
             $result=' ';
         }
@@ -1486,23 +1486,21 @@
 
     #Print parameters
     for my $key (sort { $category_order{$a} <=> $category_order{$b} } keys %categoryList) {
-        if(@{$categoryList{$key}} == 0) {
-            next;
-        } else { 
-            $r->print('<div class="LC_Box LC_400Box">'
-                     .'<h4 class="LC_hcell">'
-                     .&mt($categories{$key})
-                     .'</h4>'."\n");
-            foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
-                    $r->print('<span class="LC_nobreak">'
-                             .'<label><input type="checkbox" name="pscat" ');
-                $r->print('value="'.$tempkey.'" ');
-                if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
-                    $r->print(' checked="checked"');
-                }
-                $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
+        next if(@{$categoryList{$key}} == 0);
+        $r->print('<div class="LC_Box LC_400Box">'
+                  .'<h4 class="LC_hcell">'
+                  .&mt($categories{$key})
+                  .'</h4>'."\n");
+        foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
+            $r->print('<span class="LC_nobreak">'
+                     .'<label><input type="checkbox" name="pscat" '
+                     .'value="'.$tempkey.'" ');
+            if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
+                $r->print(' checked="checked"');
+            }
+            $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
                                                       : $tempkey)
-                        .'</label></span><br />'."\n");
+                     .'</label></span><br />'."\n");
             }
             $r->print("</div>\n");
         }
@@ -1673,13 +1671,13 @@
 # This function shows on table Mode the available Parameters for the selected Resources
 #
 sub displaymenu {
-    my ($r,$allparms,$pscat,$psprt,$keyorder)=@_;
+    my ($r,$allparms,$pscat,$psprt,$keyorder,$divid)=@_;
 
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
 
     &parmmenu($r,$allparms,$pscat,$keyorder);
-    $r->print(&Apache::loncommon::start_scrollbox());
+    $r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));
     &parmboxes($r,$allparms,$pscat,$keyorder);
     $r->print(&Apache::loncommon::end_scrollbox());
 
@@ -1753,7 +1751,7 @@
            .'</div>'
         );
 
-        $r->print(&Apache::loncommon::start_scrollbox(undef,undef,undef,'mapmenuscroll'));
+        $r->print(&Apache::loncommon::start_scrollbox('700px','680px','400px','mapmenuscroll'));
         $r->print(&Apache::loncommon::start_data_table(undef,'mapmenuinner'));
 
         # Display row: "All Maps or Folders"
@@ -2264,7 +2262,7 @@
 
         # Step 2
         $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification'),'parmstep2'));
-        &displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder);
+        &displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder,'parmmenuscroll');
 
         # Step 3
         $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)'),'parmstep3'));
@@ -3613,7 +3611,7 @@
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
-    $r->print('<form name="shiftform" method="post">'.
+    $r->print('<form name="shiftform" method="post" action="">'.
               '<table><tr><td>'.&mt('Currently set date:').'</td><td>'.
               &Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.
               '<tr><td>'.&mt('Shifted date:').'</td><td>'.
@@ -3783,6 +3781,7 @@
             }]}
           );
     $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
+    $r->print('</form>'.&Apache::loncommon::end_page());
     return;
 }
 
@@ -3911,7 +3910,7 @@
     foreach my $key (@fields_in_order) {
         $r->print('<tr><td>');
         $r->print('<form method="post" action="">');
-        $r->print('<select name="newpos" onChange="this.form.submit()">');
+        $r->print('<select name="newpos" onchange="this.form.submit()">');
         for (my $i = 1;$i le $num_fields;$i ++) {
             if ($i eq $idx) {
                 $r->print('<option value="'.$i.'"  SELECTED>('.$i.')</option>');




More information about the LON-CAPA-cvs mailing list