[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface domainprefs.pm

[raeburn]

raeburn		Fri Jan 11 17:55:37 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - For 2.11
    - Backport 1.188.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.13 loncom/interface/domainprefs.pm:1.160.6.14
--- loncom/interface/domainprefs.pm:1.160.6.13	Wed Jan  9 21:37:04 2013
+++ loncom/interface/domainprefs.pm	Fri Jan 11 17:55:36 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.13 2013/01/09 21:37:04 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.14 2013/01/11 17:55:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -854,10 +854,11 @@
     } elsif ($caller eq 'page') {
         my %defaultchecked = ( 
                                'coursecatalog' => 'on',
+                               'helpdesk'      => 'on',
                                'adminmail'     => 'off',
                                'newuser'       => 'off',
                              );
-        my @toggles = ('coursecatalog','adminmail','newuser');
+        my @toggles = ('coursecatalog','adminmail','helpdesk','newuser');
         my (%checkedon,%checkedoff);
         foreach my $item (@toggles) {
             if ($defaultchecked{$item} eq 'on') { 
@@ -1073,6 +1074,7 @@
         &Apache::lonlocal::texthash (
             coursecatalog => 'Display Course/Community Catalog link?',
             adminmail     => "Display Administrator's E-mail Address?",
+            helpdesk      => 'Display "Contact Helpdesk" link',
             disallowlogin => "Login page requests redirected",
             hostid        => "Server",
             server        => "Redirect to:",
@@ -4635,6 +4637,7 @@
         %curr_loginvia,%loginhash, at currlangs, at newlangs,$addedfile,%title, at offon);
     %title = ( coursecatalog => 'Display course catalog',
                adminmail => 'Display administrator E-mail address',
+               helpdesk  => 'Display "Contact Helpdesk" link',
                newuser => 'Link for visitors to create a user account',
                loginheader => 'Log-in box header');
     @offon = ('off','on');
@@ -4647,7 +4650,7 @@
     }
     ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
                                            \%domconfig,\%loginhash);
-    my @toggles = ('coursecatalog','adminmail','newuser');
+    my @toggles = ('coursecatalog','adminmail','helpdesk','newuser');
     foreach my $item (@toggles) {
         $loginhash{login}{$item} = $env{'form.'.$item};
     }
@@ -4835,9 +4838,10 @@
     my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash,
                                              $dom);
     if ($putresult eq 'ok') {
-        my @toggles = ('coursecatalog','adminmail','newuser');
+        my @toggles = ('coursecatalog','adminmail','helpdesk','newuser');
         my %defaultchecked = (
                     'coursecatalog' => 'on',
+                    'helpdesk'      => 'on',
                     'adminmail'     => 'off',
                     'newuser'       => 'off',
         );