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

[raeburn]

raeburn		Tue Nov 29 13:22:12 2016 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncreateuser.pm 
  Log:
  - For 2.11
    - Backport 1.423, 1.424, 1.425.
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.406.2.7 loncom/interface/loncreateuser.pm:1.406.2.8
--- loncom/interface/loncreateuser.pm:1.406.2.7	Sun Nov 13 15:47:04 2016
+++ loncom/interface/loncreateuser.pm	Tue Nov 29 13:22:10 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.406.2.7 2016/11/13 15:47:04 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.406.2.8 2016/11/29 13:22:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5520,7 +5520,7 @@
             {
              linktext => 'User Access Log',
              icon => 'document-properties.png',
-             #help => 'User_Access_Logs',
+             #help => 'Domain_User_Access_Logs',
              url => '/adm/createuser?action=accesslogs',
              permission => $permission->{'activity'},
              linktitle => 'View user access log.',
@@ -6845,10 +6845,13 @@
     push(@{$brcrum},
              {href => '/adm/createuser?action=accesslogs',
               text => 'User access logs',
-              help => 'User_Access_Logs'});
+              help => 'Domain_User_Access_Logs'});
     my $bread_crumbs_component = 'User Access Logs';
     my $args = { bread_crumbs           => $brcrum,
                  bread_crumbs_component => 'User Management'};
+    if ($env{'form.popup'}) {
+        $args->{'no_nav_bar'} = 1;
+    }
 
 # set javascript
     my ($jsback,$elements) = &crumb_utilities();
@@ -7054,6 +7057,10 @@
                  .'</p>');
     }
 
+    if ($env{'form.popup'} == 1) {
+        $r->print('<input type="hidden" name="popup" value="1" />'."\n");
+    }
+
     # Form Footer
     $r->print(
         '<input type="hidden" name="currstate" value="" />'