--- loncom/interface/courseprefs.pm	2011/01/14 00:32:47	1.42
+++ loncom/interface/courseprefs.pm	2011/07/28 04:26:36	1.46
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.42 2011/01/14 00:32:47 www Exp $
+# $Id: courseprefs.pm,v 1.46 2011/07/28 04:26:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -353,7 +353,7 @@ sub handler {
     my %prefs = (
         'courseinfo' =>
                    { text => $lt{'gens'},
-                     help => 'Course_Environment',
+                     help => 'Course_Prefs_General',
                      ordered => ['owner','co-owners','loncaparev','description',
                                  'courseid','categories','hidefromcat',
                                  'externalsyllabus','cloners','url','rolenames'],
@@ -373,7 +373,7 @@ sub handler {
                     },
         'localization' =>
                     { text => 'Language and time localization',
-                      help => 'Course_Environment',
+                      help => 'Course_Prefs_Language',
                       ordered => ['languages','timezone','datelocale'],
                       itemtext => {
                                     languages  => 'Languages used',
@@ -383,7 +383,7 @@ sub handler {
                     },
         'feedback' =>
                     { text => 'Feedback messages',
-                      help => 'Course_Environment',
+                      help => 'Course_Prefs_Feedback',
                       header => [{col1 => 'Questions about:',
                                   col2 => 'Recipients'}],
                       ordered => ['question.email','comment.email','policy.email'],
@@ -395,7 +395,7 @@ sub handler {
                     },
         'discussion' =>
                     { text => 'Discussion and Chat',
-                      help => 'Course_Environment',
+                      help => 'Course_Prefs_Discussions',
                       ordered => ['pch.roles.denied','pch.users.denied',
                                   'plc.roles.denied','plc.users.denied',
                                   'allow_limited_html_in_feedback',
@@ -411,7 +411,7 @@ sub handler {
                     },
         'classlists' =>
                    { text => $lt{'clas'},
-                     help => 'Course_Environment',
+                     help => 'Course_Prefs_Classlists',
                      header => [{col1 => 'Type',
                                  col2 => $lt{'defd'}},
                                 {col1 => 'Setting',
@@ -433,7 +433,7 @@ sub handler {
                    },
         'appearance' =>
                    { text => 'Display of resources ',
-                     help => 'Course_Environment',
+                     help => 'Course_Prefs_Display',
                      ordered => ['default_xml_style','pageseparators',
                                  'disable_receipt_display','texengine',
                                  'tthoptions'],
@@ -447,7 +447,7 @@ sub handler {
                   },
         'grading' =>
                   { text => 'Grading',
-                    help => 'Course_Environment',
+                    help => 'Course_Prefs_Grading',
                     ordered => ['grading','rndseed',
                                 'receiptalg','disablesigfigs'],
                     itemtext => {
@@ -460,7 +460,7 @@ sub handler {
                   },
         'printouts' =>
                   { text => 'Printout generation',
-                    help => 'Course_Environment',
+                    help => 'Course_Prefs_Printouts',
                     ordered => ['problem_stream_switch','suppress_tries',
                                 'default_paper_size','print_header_format',
                                 'disableexampointprint','canuse_pdfforms'],
@@ -475,7 +475,7 @@ sub handler {
                   },
         'spreadsheet' =>
                   { text => 'Spreadsheets',
-                    help => 'Course_Environment',
+                    help => 'Course_Prefs_Spreadsheet',
                     ordered => ['spreadsheet_default_classcalc',
                                 'spreadsheet_default_studentcalc',
                                 'spreadsheet_default_assesscalc','hideemptyrows'],
@@ -488,7 +488,7 @@ sub handler {
                   },
         'bridgetasks' =>
                   { text => 'Bridge tasks',
-                    help => 'Course_Environment',
+                    help => 'Course_Prefs_Bridgetasks',
                     ordered => ['task_messages','task_grading',
                                 'suppress_embed_prompt'],
                     itemtext => {
@@ -499,7 +499,7 @@ sub handler {
                   },
         'other' =>
                   { text => 'Other settings',
-                    help => 'Course_Environment',
+                    help => 'Course_Prefs_Other',
                     header => [ {col1 => 'Item',
                                  col2 => 'Value',
                               }],
@@ -544,11 +544,16 @@ sub print_config_box {
     my $itemtext = $item->{'itemtext'};
     my $rowtotal = 0;
     my $output =
-        '<h3><a href="#">'.&mt($item->{text}).'</a></h3>
-        <div>&nbsp;<span style="float:right">'.
-         &Apache::loncommon::help_open_topic($item->{'help'}).'</span>';
+         '<table class="LC_nested_outer">
+          <tr>
+           <th align="left" valign="middle"><span class="LC_nobreak" style="font-size: larger;" >'.
+           &mt($item->{text}).'&nbsp;'.
+           &Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".
+          '</tr>';
     if (($action eq 'feedback') || ($action eq 'classlists')) {
         $output .= '
+          <tr>
+           <td>
             <table class="LC_nested">';   
         if (exists $item->{'header'}->[0]->{'col1'} || 
             exists $item->{'header'}->[0]->{'col2'}) {
@@ -566,6 +571,10 @@ sub print_config_box {
         }
         $output .= '
            </table>
+          </td>
+         </tr>
+         <tr>
+          <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
               <td class="LC_left_item">'.&mt($item->{'header'}->[1]->{'col1'}).'</td>';
@@ -576,18 +585,24 @@ sub print_config_box {
             $output .= &print_classlists('middle',$cdom,$settings,$itemtext,\$rowtotal,$crstype).
                        '
             </table>
+           </td>
+          </tr>
+          <tr>
+           <td>
             <table class="LC_nested">';
-            if (exists $item->{'header'}->[0]->{'col1'} || 
-            	exists $item->{'header'}->[0]->{'col2'}) {
+            if (exists $item->{'header'}->[2]->{'col1'} || 
+            	exists $item->{'header'}->[2]->{'col2'}) {
 				$output .= '          
 				<tr class="LC_info_row">
-				  <td class="LC_left_item">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
-				  <td class="LC_right_item">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
+				  <td class="LC_left_item">'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+				  <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>
 				</tr>';
         	}
         }
     } else {
         $output .= '
+          <tr>
+           <td>
             <table class="LC_nested">';
         if (exists $item->{'header'}->[0]->{'col1'} || 
             exists $item->{'header'}->[0]->{'col2'}) {
@@ -624,7 +639,9 @@ sub print_config_box {
     }
     $output .= '
    </table>
-</div>';
+  </td>
+ </tr>
+</table><br />';
     return ($output,$rowtotal);
 }
 
@@ -1346,9 +1363,9 @@ sub store_changes {
                     $output .= '</ul>';
                 } else {
                     if ($crstype eq 'Community') {
-                        $output = &mt('No changes made to community settings.');
+                        $output .= &mt('No changes made to community settings.');
                     } else {
-                        $output = &mt('No changes made to course settings.');
+                        $output .= &mt('No changes made to course settings.');
                     }
                 }
             }