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

[raeburn]

raeburn		Mon Aug 27 15:49:24 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonparmset.pm 
  Log:
  - For 2.11.
    - Backport 1.507 (part), 1.524, 1.525, 1.526.
  
  
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.522.2.2 loncom/interface/lonparmset.pm:1.522.2.3
--- loncom/interface/lonparmset.pm:1.522.2.2	Thu May 10 17:50:07 2012
+++ loncom/interface/lonparmset.pm	Mon Aug 27 15:49:24 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.522.2.2 2012/05/10 17:50:07 raeburn Exp $
+# $Id: lonparmset.pm,v 1.522.2.3 2012/08/27 15:49:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -640,7 +640,7 @@
 }
 
 sub log_parmset {
-    return &Apache::lonnet::instructor_log('parameterlog', at _);
+    return &Apache::lonnet::write_log('course','parameterlog', at _);
 }
 
 sub storeparm_by_symb_inner {
@@ -3672,7 +3672,7 @@
 
 
 sub header {
-    return &Apache::loncommon::start_page('Parameter Manager');
+    return &Apache::loncommon::start_page('Content and Problem Settings');
 }
 
 
@@ -3681,7 +3681,7 @@
     my ($r,$parm_permission)=@_;
     #
     $r->print(&header());
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Manager'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content and Problem Settings'));
     $r->print(<<ENDMAINFORMHEAD);
 <form method="post" enctype="multipart/form-data"
       action="/adm/parmset" name="studentform">
@@ -4559,10 +4559,10 @@
                           action  => 'reserve',
                           context => 'parameter',
                         );
-        &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
+        &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
                                         '',$uname,$udom,$cnum,$cdom);
 
-        &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+        &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
                                         '',$uname,$udom,$uname,$udom);
     }
     return $success;
@@ -4593,9 +4593,9 @@
                                   action  => 'release',
                                   context => 'parameter',
                                 );
-                &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
+                &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
                                                 1,$uname,$udom,$cnum,$cdom);
-                &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+                &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
                                                 1,$uname,$udom,$uname,$udom);
             }
         }
@@ -4682,7 +4682,7 @@
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
-                        text=>"Parameter Manager",
+                        text=>"Content and Problem Settings",
                         faq=>10,
                         bug=>'Instructor Interface',
                                             help =>