--- loncom/interface/domainprefs.pm	2012/05/02 18:27:46	1.160.6.1
+++ loncom/interface/domainprefs.pm	2012/05/30 16:29:20	1.161
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.1 2012/05/02 18:27:46 raeburn Exp $
+# $Id: domainprefs.pm,v 1.161 2012/05/30 16:29:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -210,13 +210,13 @@ sub handler {
                 'quotas','autoenroll','autoupdate','autocreate',
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
-                'serverstatuses','requestcourses','usersessions',
-                'loadbalancing'],$dom);
+                'serverstatuses','requestcourses','helpsettings',
+                'coursedefaults','usersessions','loadbalancing'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','usermodification','scantron',
-                       'requestcourses','coursecategories','serverstatuses',
-                       'usersessions');
+                       'requestcourses','coursecategories','serverstatuses','helpsettings',
+                       'coursedefaults','usersessions');
     if (keys(%servers) > 1) {
         push(@prefs_order,'loadbalancing');
     }
@@ -340,6 +340,28 @@ sub handler {
                               col3 => 'Specific IPs',
                             }],
                  },
+        'helpsettings' =>
+                 {text   => 'Help page settings',
+                  help   => 'Domain_Configuration_Help_Settings',
+                  header => [{col1 => 'Authenticated Help Settings',
+                              col2 => ''},
+                             {col1 => 'Unauthenticated Help Settings',
+                              col2 => ''}],
+                 },
+        'coursedefaults' => 
+                 {text => 'Course/Community defaults',
+                  help => 'Domain_Configuration_Course_Defaults',
+                  header => [{col1 => 'Defaults which can be overridden in each course by a CC',
+                              col2 => 'Value',},
+                             {col1 => 'Defaults which can be overridden for each course by a DC',
+                              col2 => 'Value',},],
+                 },
+        'privacy' => 
+                 {text   => 'User Privacy',
+                  help   => 'Domain_Configuration_User_Privacy',
+                  header => [{col1 => 'Setting',
+                              col2 => 'Value',}],
+                 },
         'usersessions' =>
                  {text  => 'User session hosting/offloading',
                   help  => 'Domain_Configuration_User_Sessions',
@@ -465,6 +487,10 @@ sub process_changes {
         $output = &modify_serverstatuses($dom,%domconfig);
     } elsif ($action eq 'requestcourses') {
         $output = &modify_quotas($dom,$action,%domconfig);
+    } elsif ($action eq 'helpsettings') {
+        $output = &modify_helpsettings($r,$dom,$confname,%domconfig);
+    } elsif ($action eq 'coursedefaults') {
+        $output = &modify_coursedefaults($dom,%domconfig);
     } elsif ($action eq 'usersessions') {
         $output = &modify_usersessions($dom,%domconfig);
     } elsif ($action eq 'loadbalancing') {
@@ -523,10 +549,15 @@ sub print_config_box {
             $colspan = ' colspan="2"';
         } elsif ($action eq 'requestcourses') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
+        } elsif ($action eq 'helpsettings') {
+            $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'usersessions') {
             $output .= &print_usersessions('top',$dom,$settings,\$rowtotal); 
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'coursedefaults') {
+            $output .= &print_coursedefaults('top',$dom,$settings,\$rowtotal);
+        }
         $output .= '
            </table>
           </td>
@@ -2883,6 +2914,7 @@ sub loadbalance_rule_row {
     } else {
         push(@rulenames,'specific');
     }
+    push(@rulenames,'none');
     my $style = $targets_div_style;
     if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
         $style = $homedom_div_style;
@@ -2939,6 +2971,7 @@ sub offloadtype_text {
            'homeserver'       => "Offloads to user's home server",
            'externalbalancer' => "Offloads to Load Balancer in user's domain",
            'specific'         => 'Offloads to specific server',
+           'none'             => 'No offload',
     );
     return %ruletitles;
 }