--- loncom/interface/domainprefs.pm	2008/07/19 21:44:55	1.65
+++ loncom/interface/domainprefs.pm	2008/09/19 03:27:04	1.68
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.65 2008/07/19 21:44:55 raeburn Exp $
+# $Id: domainprefs.pm,v 1.68 2008/09/19 03:27:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,6 +42,7 @@ use LONCAPA::Enrollment;
 use File::Copy;
 use Locale::Language;
 use DateTime::TimeZone;
+use DateTime::Locale;
 
 sub handler {
     my $r=shift;
@@ -80,7 +81,7 @@ sub handler {
     my %prefs = (
         'rolecolors' =>
                    { text => 'Default color schemes',
-                     help => 'Default_Color_Schemes',
+                     help => 'Domain_Configuration_Color_Schemes',
                      header => [{col1 => 'Student Settings',
                                  col2 => '',},
                                 {col1 => 'Coordinator Settings',
@@ -92,31 +93,31 @@ sub handler {
                     },
         'login' =>  
                     { text => 'Log-in page options',
-                      help => 'Domain_Log-in_Page',
+                      help => 'Domain_Configuration_Login_Page',
                       header => [{col1 => 'Item',
                                   col2 => '',}],
                     },
         'defaults' => 
                     { text => 'Default authentication/language/timezone',
-                      help => '',
+                      help => 'Domain_Configuration_LangTZAuth',
                       header => [{col1 => 'Setting',
                                   col2 => 'Value'}],
                     },
         'quotas' => 
                     { text => 'Default quotas for user portfolios',
-                      help => 'Default_User_Quota',
+                      help => 'Domain_Configuration_Quotas',
                       header => [{col1 => 'User type',
                                   col2 => 'Default quota'}],
                     },
         'autoenroll' =>
                    { text => 'Auto-enrollment settings',
-                     help => 'Domain_Auto_Enrollment',
+                     help => 'Domain_Configuration_Auto_Enrollment',
                      header => [{col1 => 'Configuration setting',
                                  col2 => 'Value(s)'}],
                    },
         'autoupdate' => 
                    { text => 'Auto-update settings',
-                     help => 'Domain_Auto_Update',
+                     help => 'Domain_Configuration_Auto_Updates',
                      header => [{col1 => 'Setting',
                                  col2 => 'Value',},
                                 {col1 => 'User population',
@@ -124,20 +125,20 @@ sub handler {
                   },
         'directorysrch' => 
                   { text => 'Institutional directory searches',
-                    help => 'Domain_Directory_Search',
+                    help => 'Domain_Configuration_InstDirectory_Search',
                     header => [{col1 => 'Setting',
                                 col2 => 'Value',}],
                   },
         'contacts' =>
                   { text => 'Contact Information',
-                    help => 'Domain_Contact_Information',
+                    help => 'Domain_Configuration_Contact_Info',
                     header => [{col1 => 'Setting',
                                 col2 => 'Value',}],
                   },
 
         'usercreation' => 
                   { text => 'User creation',
-                    help => 'Domain_User_Creation',
+                    help => 'Domain_Configuration_User_Creation',
                     header => [{col1 => 'Format rule type',
                                 col2 => 'Format rules in force'},
                                {col1 => 'User account creation',
@@ -147,7 +148,7 @@ sub handler {
                   },
         'usermodification' => 
                   { text => 'User modification',
-                    help => 'Domain_User_Modification',
+                    help => 'Domain_Configuration_User_Modification',
                     header => [{col1 => 'Target user has role',
                                 col2 => 'User information updateable in author context'},
                                {col1 => 'Target user has role',
@@ -157,14 +158,14 @@ sub handler {
                   },
         'scantron' => 
                   { text => 'Scantron format file',
-                    help => 'Domain_Scantron_Formats',
+                    help => 'Domain_Configuration_Scantron_Format',
                     header => [ {col1 => 'Item',
                                  col2 => '',
                               }],
                   },
         'coursecategories' => 
                   { text => 'Cataloging of courses',
-                    help => 'Domain_Course_Catalog',
+                    help => 'Domain_Configuration_Cataloging_Courses',
                     header => [{col1 => 'Category settings',  
                                 col2 => '',},
                                {col1 => 'Categories',
@@ -319,7 +320,10 @@ sub handler {
         }
         $count = 0;
         foreach my $item (@prefs_order) {
-            $r->print('<h4><label><input type="checkbox" name="actions" value="'.$item.'" />&nbsp;'.&mt($prefs{$item}->{'text'}).'</label></h4>');
+            $r->print('<h4>'.
+                      &Apache::loncommon::help_open_topic($prefs{$item}->{'help'}).
+                      '<label><input type="checkbox" name="actions" value="'.$item.
+                      '" />&nbsp;'.&mt($prefs{$item}->{'text'}).'</label></h4>');
             $count ++;
             if ((!$seconddiv) && ($count >= $midpoint)) {
                 $r->print('</div>'."\n".'<div class="LC_left_float">'."\n");
@@ -382,13 +386,10 @@ sub print_config_box {
     $output .= 
          '<table class="LC_nested_outer">
           <tr>
-           <th align="left"><span class="LC_nobreak">'.&mt($item->{text}).
-           '&nbsp;</span></th></tr>';
-# 
-# FIXME - put the help link back in when the help files exist
-#           <th>'.&mt($item->{text}).'&nbsp;'.
-#           &Apache::loncommon::help_open_topic($item->{'help'}).'</th>
-#          </tr>');
+           <th align="left" valign="middle"><span class="LC_nobreak">'.
+           &mt($item->{text}).'&nbsp;'.
+           &Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".
+          '</tr>';
     $rowtotal ++;
     if (($action eq 'autoupdate') || ($action eq 'rolecolors') || 
         ($action eq 'usercreation') || ($action eq 'usermodification') ||
@@ -1823,7 +1824,8 @@ sub print_usermodification {
 
 sub print_defaults {
     my ($dom,$rowtotal) = @_;
-    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def');
+    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
+                 'datelocale_def');
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
     my $titles = &defaults_titles();
     my $rownum = 0;
@@ -1858,6 +1860,9 @@ sub print_defaults {
         } elsif ($item eq 'timezone_def') {
             my $includeempty = 1;
             $datatable .= &Apache::loncommon::select_timezone($item,$domdefaults{$item},undef,$includeempty);
+        } elsif ($item eq 'datelocale_def') {
+            my $includeempty = 1;
+            $datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty);
         } else {
             $datatable .= '<input type="text" name="'.$item.'" value="'.
                           $domdefaults{$item}.'" />';
@@ -1875,6 +1880,7 @@ sub defaults_titles {
                    'auth_arg_def'  => 'Default authentication argument',
                    'lang_def'      => 'Default language',
                    'timezone_def'  => 'Default timezone',
+                   'datelocale_def' => 'Default locale for dates',
                  );
     return (\%titles);
 }
@@ -4251,7 +4257,7 @@ sub modify_defaults {
     my ($dom,$r) = @_;
     my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors);
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def');
+    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def');
     my @authtypes = ('internal','krb4','krb5','localauth');
     foreach my $item (@items) {
         $newvalues{$item} = $env{'form.'.$item};
@@ -4278,6 +4284,13 @@ sub modify_defaults {
                     push(@errors,$item);   
                 }
             }
+        } elsif ($item eq 'datelocale_def') {
+            if ($newvalues{$item} ne '') {
+                my @datelocale_ids = DateTime::Locale->ids();
+                if (!grep(/^\Q$newvalues{$item}\E$/,@datelocale_ids)) {
+                    push(@errors,$item);
+                }
+            }
         }
         if (grep(/^\Q$item\E$/,@errors)) {
             $newvalues{$item} = $domdefaults{$item};
@@ -4290,6 +4303,7 @@ sub modify_defaults {
                                        auth_arg_def => $newvalues{'auth_arg_def'},
                                        lang_def => $newvalues{'lang_def'},
                                        timezone_def => $newvalues{'timezone_def'},
+                                       datelocale_def => $newvalues{'datelocale_def'},
                                      }
                        );
     my $title = &defaults_titles();
@@ -4322,7 +4336,7 @@ sub modify_defaults {
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,
                                           $defaults_hash{'defaults'},$cachetime);
-            if ($changes{'auth_def'} || $changes{'auth_arg_def'} || $changes{'lang_def'}) {
+            if ($changes{'auth_def'} || $changes{'auth_arg_def'} || $changes{'lang_def'} || $changes{'datelocale_def'}) {
                 my $sysmail = $r->dir_config('lonSysEMail');
                 &Apache::lonmsg::sendemail($sysmail,"LON-CAPA Domain Settings Change - $dom",$mailmsgtext);
             }