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

[raeburn]

raeburn		Tue Jan 24 05:35:35 2017 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncreateuser.pm 
  Log:
  - Helpdesk Access menu item moved to correct context (i.e., course not domain).
  - Some white space changes.
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.406.2.10 loncom/interface/loncreateuser.pm:1.406.2.11
--- loncom/interface/loncreateuser.pm:1.406.2.10	Sun Jan 22 16:00:17 2017
+++ loncom/interface/loncreateuser.pm	Tue Jan 24 05:35:35 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.406.2.10 2017/01/22 16:00:17 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.406.2.11 2017/01/24 05:35:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4375,7 +4375,6 @@
               );
     my $args = { bread_crumbs          => $brcrum,
                  bread_crumbs_component => 'User Management'};
-
     $r->print(&Apache::loncommon::start_page('Custom Role Editor',
                                              $head_script,$args).
               $body_top);
@@ -5022,7 +5021,6 @@
             $r->print(&header(undef,{'no_nav_bar' => 1}).
                      '<span class="LC_error">'.&mt('You do not have permission to manage self-enrollment').'</span>');
         }
-
     } elsif ($env{'form.action'} eq 'changelogs') {
         if ($permission->{cusr} || $permission->{view}) {
             &print_userchangelogs_display($r,$context,$permission,$brcrum);
@@ -5300,7 +5298,6 @@
       unless ($permission->{'cusr'}) {
           $links{'domain'}{'singleuser'} = 'View a User';
           $linktitles{'domain'}{'singleuser'} = 'View information about a user in the domain';
-
       }
   } elsif ($linkcontext eq 'course') {
       unless ($permission->{'cusr'}) {
@@ -5370,14 +5367,6 @@
         
         push(@{ $menu[2]->{items} }, #Category: Administration
             {
-             linktext => 'Helpdesk Access',
-             icon => 'helpdesk-access.png',
-             #help => 'Course_Helpdesk_Access',
-             url => '/adm/createuser?action=helpdesk',
-             permission => ($permission->{'owner'} || $permission->{'co-owner'}),
-             linktitle => 'Helpdesk access options',
-            },
-            {
              linktext => 'Custom Roles',
              icon => 'emblem-photos.png',
              #help => 'Course_Editing_Custom_Roles',
@@ -5462,7 +5451,15 @@
             },
         );
         push(@{ $menu[2]->{items} }, #Category: Administration
-            {    
+            {
+             linktext => 'Helpdesk Access',
+             icon => 'helpdesk-access.png',
+             #help => 'Course_Helpdesk_Access',
+             url => '/adm/createuser?action=helpdesk',
+             permission => ($permission->{'owner'} || $permission->{'co-owner'}),
+             linktitle => 'Helpdesk access options',
+            },
+            {
              linktext => 'Custom Roles',
              icon => 'emblem-photos.png',
              #help => 'Course_Editing_Custom_Roles',
@@ -6179,8 +6176,8 @@
                    .&mt('Save').'" onclick="validate_types(this.form);" />';
     }
     $output .= '<input type="hidden" name="action" value="selfenroll" />'
-               .'<input type="hidden" name="state" value="done" />'."\n"
-               .$additional.'</form>';
+              .'<input type="hidden" name="state" value="done" />'."\n"
+              .$additional.'</form>';
     $r->print($output);
     return;
 }