[LON-CAPA-cvs] cvs: loncom /interface courseprefs.pm lonconfigsettings.pm

[raeburn]

raeburn		Sun May 17 00:54:38 2009 EDT

  Modified files:              
    /loncom/interface	courseprefs.pm lonconfigsettings.pm 
  Log:
  - Include "Parameter Manager" in breadcrumb trail, if course configuration accessed from there.
  - Wording change: Functionality -> Settings.  
  
  
Index: loncom/interface/courseprefs.pm
diff -u loncom/interface/courseprefs.pm:1.3 loncom/interface/courseprefs.pm:1.4
--- loncom/interface/courseprefs.pm:1.3	Tue May 12 21:20:42 2009
+++ loncom/interface/courseprefs.pm	Sun May 17 00:54:38 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.3 2009/05/12 21:20:42 raeburn Exp $
+# $Id: courseprefs.pm,v 1.4 2009/05/17 00:54:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,15 +66,18 @@
         return HTTP_NOT_ACCEPTABLE;
     }
 
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['phase','actions','origin']);
     &Apache::lonhtmlcommon::clear_breadcrumbs();
+    if ($env{'form.origin'} eq 'params') {
+        &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
+                                                text=>"Parameter Manager"});
+    }
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/courseprefs',
         text=>"Course Configuration"});
     my $breadcrumbs =
         &Apache::lonhtmlcommon::breadcrumbs('Edit Course Configuration');
 
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['phase','actions']);
-
     my $phase = 'pickactions';
     if ( exists($env{'form.phase'}) ) {
         $phase = $env{'form.phase'};
Index: loncom/interface/lonconfigsettings.pm
diff -u loncom/interface/lonconfigsettings.pm:1.4 loncom/interface/lonconfigsettings.pm:1.5
--- loncom/interface/lonconfigsettings.pm:1.4	Tue May 12 21:20:42 2009
+++ loncom/interface/lonconfigsettings.pm	Sun May 17 00:54:38 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.4 2009/05/12 21:20:42 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.5 2009/05/17 00:54:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -124,6 +124,9 @@
               $env{'form.width'}.'" />'.
               '<input type="hidden" name="height" value="'.
               $env{'form.height'}.'" />');
+    if (defined($env{'form.origin'})) {
+        $r->print('<input type="hidden" name="origin" value="'.$env{'form.origin'}.'" />'."\n");
+    }
     if (($phase eq 'display') || ($phase eq 'process')) {
         if (ref($actions) eq 'ARRAY') {
             foreach my $item (@{$actions}) {
@@ -300,7 +303,7 @@
     }
     my %helphash;
     &print_header($r,$phase,$context);
-    $r->print('<h3>'.&mt('Functionality to display/modify').'</h3>');
+    $r->print('<h3>'.&mt('Settings to display/modify').'</h3>');
     $r->print('<script type="text/javascript">'."\n".
               &Apache::loncommon::check_uncheck_jscript()."\n".
               '</script>'."\n".'<p><input type="button" value="'.&mt('check all').'" '.