--- loncom/interface/lonparmset.pm	2008/05/28 23:53:35	1.396
+++ loncom/interface/lonparmset.pm	2008/06/16 23:35:58	1.400
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.396 2008/05/28 23:53:35 bisitz Exp $
+# $Id: lonparmset.pm,v 1.400 2008/06/16 23:35:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2339,7 +2339,12 @@ sub crsenv {
 	     'texengine'
 	         => '<b>'.&mt('Force all students in the course to use a specific math rendering engine.').'</b><br />'
                    .'('.&mt('[_1], [_2] (Convert to Images), [_3] (TeX to HTML), or blank for student\'s preference','"<tt>jsMath</tt>"','"<tt>mimetex</tt>"','"<tt>tth</tt>"').')',
+             'timezone'
+                 => '<b>'.&mt('Timezone in which the course takes place').'</b>',
 
+             'suppress_embed_prompt'
+                 => '<b>'.&mt('Suppress prompt to upload items referenced in a web page being uploaded to portfolio, when current role is student.').'</b><br />'.
+                    ' ('.&mt('[_1] to suppress, anything else to not suppress','"<tt>yes</tt>"').')',  
              ); 
         my @Display_Order = ('url','description','courseid','cloners','grading',
                              'externalsyllabus',
@@ -2353,11 +2358,13 @@ sub crsenv {
                              'allow_limited_html_in_feedback',
                              'allow_discussion_post_editing',
                              'languages',
+                             'timezone',
 			     'nothideprivileged',
                              'rndseed',
                              'receiptalg',
                              'problem_stream_switch',
 			     'suppress_tries',
+                             'suppress_embed_prompt',
                              'default_paper_size',
 			     'print_header_format',
                              'disable_receipt_display',
@@ -2397,6 +2404,13 @@ sub crsenv {
                                                         $values{$parameter},
                                                         $onchange).
                                                         '</td>';
+            } elsif ($parameter eq 'timezone') {
+                my $includeempty = 1;
+                my $timezone = &Apache::lonlocal::gettimezone();
+                $output .= '<td>'.
+                    &Apache::loncommon::select_timezone($parameter.'_value',
+                                                        $timezone,
+                                                        $onchange,$includeempty).'</td>';
             } else {
                 $output .= '<td>'.
                     &Apache::lonhtmlcommon::textbox($parameter.'_value',