--- loncom/interface/lonconfigsettings.pm	2009/04/26 00:09:53	1.3
+++ loncom/interface/lonconfigsettings.pm	2010/03/23 20:53:09	1.8.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.3 2009/04/26 00:09:53 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.8.2.2 2010/03/23 20:53:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,17 +38,35 @@ use Apache::lonlocal;
 
 sub print_header {
     my ($r,$phase,$context,$jscript) = @_;
-    my ($pagetitle,$brcrumtitle,$action);
+    my ($pagetitle,$brcrumtitle,$action,$call_category_check);
     if ($context eq 'domain') {
-        ($pagetitle, $brcrumtitle) = ('View/Modify Domain Settings','Domain Settings');
+        ($pagetitle, $brcrumtitle) = ('View/Modify Domain Settings','View/Modify Domain Settings');
         $action = '/adm/domainprefs';
+        if ($phase eq 'display') {
+            my @actions = &Apache::loncommon::get_env_multiple('form.actions');
+            if (grep(/^coursecategories$/,@actions)) {
+                $call_category_check = qq|
+    if (formname == document.display) {
+        if (!categoryCheck(formname)) {
+            return;
+        }
+    }
+|;
+            }
+        }
     } else {
-        ($pagetitle, $brcrumtitle) = ('Course Configuration','Course Configuration');
+        if (&Apache::loncommon::course_type() eq 'Community') {
+            ($pagetitle,$brcrumtitle) = ('Community Configuration','Community Configuration');
+        } else {
+            ($pagetitle,$brcrumtitle) = ('Course Configuration','Course Configuration');
+        }
         $action = '/adm/courseprefs';
     }
     my $alert = &mt('You must select at least one functionality type to display.');
     my $js = '
 <script type="text/javascript">
+// <![CDATA[
+
 function changePage(formname,newphase) {
     formname.phase.value = newphase;
     numchecked = 0;
@@ -71,16 +89,18 @@ function changePage(formname,newphase) {
             return;
         }
     }
+    '.$call_category_check.'
     formname.submit();
 }'."\n";
     if ($phase eq 'pickactions') {
         $js .=
-            &Apache::lonhtmlcommon::set_form_elements({actions => 'checkbox',numcols => 'radio',})."\n".
-            &javascript_set_colnums();
+            &Apache::lonhtmlcommon::set_form_elements({actions => 'checkbox'})."\n";
     } elsif ($phase eq 'display') {
         $js .= &color_pick_js()."\n";
     }
     $js .= &Apache::loncommon::viewport_size_js().'
+
+// ]]>
 </script>
 ';
     if ($jscript) {
@@ -93,12 +113,7 @@ $jscript
     my $additem;
     if ($phase eq 'pickactions') {
         my %loaditems = (
-                    'onload' => "javascript:getViewportDims(document.$phase.width,document.$phase.height);setDisplayColumns();setFormElements(document.pickactions);",
-                        );
-        $additem = {'add_entries' => \%loaditems,};
-    } else {
-        my %loaditems = (
-                    'onload' => "javascript:getViewportDims(document.$phase.width,document.$phase.height);",
+                    'onload' => "setFormElements(document.pickactions);",
                         );
         $additem = {'add_entries' => \%loaditems,};
     }
@@ -119,18 +134,16 @@ $jscript
 sub print_footer {
     my ($r,$phase,$newphase,$button_text,$actions) = @_;
     $button_text = &mt($button_text);
-    $r->print('<input type="hidden" name="phase" value="" />'.
-              '<input type="hidden" name="width" value="'.
-              $env{'form.width'}.'" />'.
-              '<input type="hidden" name="height" value="'.
-              $env{'form.height'}.'" />');
+    $r->print('<input type="hidden" name="phase" value="" />');
+    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}) {
                 $r->print('<input type="hidden" name="actions" value="'.$item.'" />')."\n";
             }
         }
-        $r->print('<input type="hidden" name="numcols" value="'.$env{'form.numcols'}.'" />');
     }
     my $dest='"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
     if ($phase eq 'process') {
@@ -152,47 +165,88 @@ sub print_footer {
 }
 
 sub make_changes {
-    my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$roles) = @_;
+    my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$roles,$allitems) = @_;
     my %brcrumtext = &get_crumb_text();
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
+    my ($numchanged,%changes,%disallowed);
     &Apache::lonhtmlcommon::add_breadcrumb
       ({href=>"javascript:changePage(document.$phase,'display')",
         text=>$brcrumtext{$context}},
        {href=>"javascript:changePage(document.$phase,'$phase')",
         text=>"Updated"});
     &print_header($r,$phase,$context);
+    my $crstype;
+    if ($context eq 'course') {
+        $crstype = &Apache::loncommon::course_type();
+    }
     if ((ref($prefs_order) eq 'ARRAY') && (ref($prefs) eq 'HASH') && 
         (ref($prefs) eq 'HASH')) {
         foreach my $item (@{$prefs_order}) {
             if (grep(/^\Q$item\E$/,@actions)) {
-                $r->print('<h3>'.&mt($prefs->{$item}{'text'}).'</h3>');
                 if ($context eq 'domain') {
-                    $r->print(&Apache::domainprefs::process_changes($r,$dom,$confname,$item,$roles,$values));
+                    $r->print('<h3>'.&mt($prefs->{$item}{'text'}).'</h3>'.
+                              &Apache::domainprefs::process_changes($r,$dom,
+                                          $confname,$item,$roles,$values));
                 } else {
-                    $r->print(&Apache::courseprefs::process_changes($r,$dom,$item,$values));
+                    $changes{$item} = {};
+                    &Apache::courseprefs::process_changes($dom,$item,$values,
+                                                          $prefs->{$item},$changes{$item},
+                                                          $allitems,\%disallowed,$crstype);
+                    if (keys(%{$changes{$item}}) > 0) {
+                        $numchanged ++;
+                    }
+                }
+            }
+        }
+    }
+    if ($context eq 'course') {
+        if ($numchanged) {
+            my $message = &Apache::courseprefs::store_changes($dom,$confname,$prefs_order,\@actions,
+                                                          $prefs,$values,\%changes,$crstype);
+            $r->print(&Apache::loncommon::confirmwrapper($message));
+        } else {
+            if ($crstype eq 'Community') {
+                $r->print(&Apache::loncommon::confirmwrapper(&mt("No changes made to community configuration.")));
+            } else {
+                $r->print(&Apache::loncommon::confirmwrapper(&mt("No changes made to course configuration.")));
+            }
+        }
+        if (keys(%disallowed) > 0) {
+            $r->print('<p>');
+            foreach my $item ('cloners','rolenames','feedback','discussion','localization') {
+                if (ref($disallowed{$item}) eq 'HASH') {
+                    if (keys(%{$disallowed{$item}}) > 0) {
+                        $r->print(&Apache::courseprefs::display_disallowed($item,$disallowed{$item},
+                                                                           $prefs,$crstype));
+                    }
                 }
             }
+            $r->print('</p>');
         }
     }
     $r->print('<p>');
-    &print_footer($r,$phase,'display','Back to configuration display',\@actions);
+    my $footer_text = 'Back to configuration display';
+    if ($context eq 'course') {
+        $footer_text = 'Back to display/edit settings'; 
+    }
+    &print_footer($r,$phase,'display',$footer_text,\@actions);
     $r->print('</p>');
 }
 
 sub display_settings {
     my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$jscript,
-        $allitems) = @_;
+        $allitems,$crstype) = @_;
     my %brcrumtext = &get_crumb_text();
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"javascript:changePage(document.$phase,'display')",
-          text=>"Course Settings"});
+          text=>"Display/Edit Settings"});
     &print_header($r,$phase,$context,$jscript);
+    my $divwidth = 900;
     if ((ref($prefs_order) eq 'ARRAY') && (ref($prefs) eq 'HASH') && (ref($values) eq 'HASH')) { 
         if (@actions > 0) {
             my $rowsum = 0;
             my (%output,%rowtotal,@items);
-            my $halfway = @actions/2;
             foreach my $item (@{$prefs_order}) {
                 if (grep(/^\Q$item\E$/,@actions)) {
                     push(@items,$item);
@@ -203,57 +257,21 @@ sub display_settings {
                     } else {
                         ($output{$item},$rowtotal{$item}) =
                             &Apache::courseprefs::print_config_box($r,$dom,$phase,
-                                $item,$prefs->{$item},$values,$allitems);
+                                $item,$prefs->{$item},$values,$allitems,$crstype);
                     }
                     $rowsum += $rowtotal{$item};
                 }
             }
-            my $colend;
-            my $halfway = $rowsum/2;
-            my $aggregate = 0;
-            my $sumleft = 0;
-            my $sumright = 0;
-            my $crossover;
+            $r->print('<div id="prefs" style="max-width:'.$divwidth.'px;margin: 10px auto 10px auto;">');
             for (my $i=0; $i<@items; $i++) {
-                $aggregate += $rowtotal{$items[$i]};
-                if ($aggregate > $halfway) {
-                    $crossover = $i;
-                    last;
-                }
-            }
-            for (my $i=0; $i<$crossover; $i++) {
-                $sumleft += $rowtotal{$items[$i]};
-            }
-            for (my $i=$crossover+1; $i<@items; $i++) {
-                $sumright += $rowtotal{$items[$i]};
-            }
-            if ((@items > 1) && ($env{'form.numcols'} == 2)) {
-                my $sumdiff = $sumright - $sumleft;
-                if ($sumdiff > 0) {
-                    $colend = $crossover + 1;
-                } else {
-                    $colend = $crossover;
-                }
-            } else {
-                $colend = @items;
-            }
-            $r->print('<p><table class="LC_double_column"><tr><td class="LC_left_col">');            for (my $i=0; $i<$colend; $i++) {
                 $r->print($output{$items[$i]});
             }
-            $r->print('</td><td></td><td class="LC_right_col">');
-            if ($colend < @items) {
-                for (my $i=$colend; $i<@items; $i++) {
-                    $r->print($output{$items[$i]});
-                }
-            }
-            $r->print('</td></tr></table></p>');
+            $r->print('</div>');
             $r->print(&print_footer($r,$phase,'process','Save',\@actions));
         } else {
             $r->print('<input type="hidden" name="phase" value="" />'.
-                  '<input type="hidden" name="numcols" value="'.
-                  $env{'form.numcols'}.'" />'."\n".
-                  '<span class="LC_error">'.&mt('No settings chosen').
-                  '</span>');
+                      '<span class="LC_error">'.&mt('No settings chosen').
+                      '</span>');
         }
         $r->print('</form>');
     }
@@ -268,62 +286,54 @@ sub display_choices {
     }
     my %helphash;
     &print_header($r,$phase,$context);
-    $r->print('<h3>'.&mt('Functionality to display/modify').'</h3>');
     $r->print('<script type="text/javascript">'."\n".
+              '// <![CDATA['."\n".
               &Apache::loncommon::check_uncheck_jscript()."\n".
-              '</script>'."\n".'<p><input type="button" value="'.&mt('check all').'" '.
+              '// ]]>'."\n".
+              '</script>'."\n");
+    $r->print('<h3>'.&mt('Settings to display/modify').'</h3>'."\n".
+              '<div><input type="button" value="'.&mt('check all').'" '.
               'onclick="javascript:checkAll(document.pickactions.actions)"'.
               ' />'.('&nbsp;'x2).
               '<input type="button" value="'.&mt('uncheck all').'" '.
-              'onclick="javascript:uncheckAll(document.pickactions.actions)"'.
-              ' /></p><div class="LC_left_float">');
-    my ($numitems,$midpoint,$seconddiv,$count);
+              'onclick="javascript:uncheckAll(document.pickactions.actions)" />'.
+              '</div><br />'."\n".
+              '<div class="LC_left_float">');
+    my ($numitems,$maxincol,$firstthird,$secondthird,$seconddiv,$thirddiv,$count);
     if (ref($prefs_order) eq 'ARRAY') {
         $numitems = @{$prefs_order};
     }
-    $midpoint = int($numitems/2);
-    if ($numitems%2) {
-        $midpoint ++;
+    my $numcols = 3;
+    $maxincol = int($numitems/$numcols);
+    if ($numitems%$numcols) {
+        $maxincol ++;
     }
+    my $firstthird = $maxincol;
+    my $secondthird = $firstthird + $maxincol;
     $count = 0;
     if ((ref($prefs_order) eq 'ARRAY') && (ref($prefs) eq 'HASH')) {
         foreach my $item (@{$prefs_order}) {
-            $r->print('<h4>'.
-                      &Apache::loncommon::help_open_topic($prefs->{$item}->{'help'}).
+            $r->print(&Apache::loncommon::help_open_topic($prefs->{$item}->{'help'}).
                       '<label><input type="checkbox" name="actions" value="'.$item.
-                      '" />&nbsp;'.&mt($prefs->{$item}->{'text'}).'</label></h4>');
+                      '" />&nbsp;'.&mt($prefs->{$item}->{'text'}).'</label><br />');
             $count ++;
-            if ((!$seconddiv) && ($count >= $midpoint)) {
+            if ((!$seconddiv) && ($count >= $firstthird)) {
                 $r->print('</div>'."\n".'<div class="LC_left_float">'."\n");
                 $seconddiv = 1;
             }
+            if ((!$thirddiv) && ($count >= $secondthird)) {
+                $r->print('</div>'."\n".'<div class="LC_left_float">'."\n");
+                $thirddiv = 1;
+            }
         }
-        $r->print('</div><div class="LC_clear_float_footer"></div><h3>'.
-                  &mt('Display options').'</h3>'."\n".
-                  '<p><span class="LC_nobreak">'.&mt('Display using: ')."\n".
-                  '<label><input type="radio" name="numcols" value="1" />'.
-                  &mt('one column').'</label>&nbsp;&nbsp;<label>'.
-                  '<input type="radio" name="numcols" value="2" />'.
-                  &mt('two columns').'</label></span></p>');
+        $r->print('</div><br clear="all" />');
     }
-    $r->print(&print_footer($r,$phase,'display','Go'));
+    $r->print(&print_footer($r,$phase,'display','Display'));
     $r->print('</form>');
     $r->print(&Apache::loncommon::end_page());
     return;
 }
 
-sub javascript_set_colnums {
-    return <<END;
-function setDisplayColumns() {
-    if (document.pickactions.width.value > 1100) {
-        document.pickactions.numcols[1].checked = true;
-    } else {
-        document.pickactions.numcols[0].checked = true;
-    }
-}
-END
-}
-
 sub color_pick_js {
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     my $output = <<"ENDCOL";
@@ -373,7 +383,7 @@ ENDCOL
 sub get_crumb_text {
     my %brcrumbtext = (
                        domain => 'Domain Settings',
-                       course => 'Course Settings',
+                       course => 'Display/Edit Settings',
                      );
     return %brcrumbtext;
 }