--- loncom/interface/loncreateuser.pm	2008/01/20 01:40:37	1.232
+++ loncom/interface/loncreateuser.pm	2008/03/07 11:19:16	1.236
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.232 2008/01/20 01:40:37 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.236 2008/03/07 11:19:16 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -355,7 +355,7 @@ ENDBLOCK
 <input type="hidden" name="action" value="$env{'form.action'}" />
 <input type="hidden" name="phase" value="createnewuser" />
 <input type="hidden" name="srchtype" value="exact" />
-<input type="hidden" name="srchby" value="username" />
+<input type="hidden" name="srchby" value="uname" />
 <input type="hidden" name="srchin" value="dom" />
 <input type="hidden" name="forcenewuser" value="1" />
 <input type="hidden" name="origform" value="crtusername" />
@@ -603,9 +603,12 @@ sub print_user_modification_page {
 
     my $js = &validation_javascript($context,$ccdomain,$pjump_def,
                                $groupslist,$newuser,$formname,\%loaditem);
+    my $args = {'add_entries' => \%loaditem};  
+    if ($env{'form.popup'}) {
+       $args->{'no_nav_bar'} = 1; 
+    }
     my $start_page = 
-	&Apache::loncommon::start_page('User Management',
-				       $js,{'add_entries' => \%loaditem,});
+	&Apache::loncommon::start_page('User Management',$js,$args);
     my %breadcrumb_text = &singleuser_breadcrumb();
     &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage($form)",
@@ -1318,6 +1321,7 @@ ENDBADAUTH
                 $outcome .= <<ENDNOPRIV;
 <h3>$lt{'ccld'}</h3>
 $lt{'yodo'} $lt{'ifch'}: $ccdomain
+<input type="hidden" name="login" value="nochange" />
 ENDNOPRIV
             }
         }
@@ -1486,7 +1490,13 @@ sub update_user_data {
     my $jscript = '<script type="text/javascript">'."\n".
                   $jsback."\n".'</script>'."\n";
     my %breadcrumb_text = &singleuser_breadcrumb();
-    $r->print(&Apache::loncommon::start_page($title,$jscript));
+    my $args;
+    if ($env{'form.popup'}) {
+        $args->{'no_nav_bar'} = 1;
+    } else {
+        $args = undef;
+    }
+    $r->print(&Apache::loncommon::start_page($title,$jscript,$args));
     &Apache::lonhtmlcommon::add_breadcrumb
        ({href=>"javascript:backPage(document.userupdate)",
          text=>$breadcrumb_text{'search'},
@@ -2054,8 +2064,12 @@ END
             }
         }
         my $userinfo = &Apache::loncommon::plainname($env{'form.ccuname'},
-                                                     $env{'form.ccdomain'}); 
-        $r->print('<p><a href="javascript:backPage(document.userupdate,'."'$env{'form.prevphase'}','modify'".')">'.&mt('Modify this user: <span class="LC_cusr_emph">([_1])</span>',$userinfo).'</a>'.('&nbsp;'x5).'<a href="javascript:backPage(document.userupdate)">'.&mt('Create/Modify Another User').'</a></p>');
+                                                     $env{'form.ccdomain'});
+        if ($env{'form.popup'}) {
+            $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
+        } else {
+            $r->print('<p><a href="javascript:backPage(document.userupdate,'."'$env{'form.prevphase'}','modify'".')">'.&mt('Modify this user: <span class="LC_cusr_emph">([_1])</span>',$userinfo).'</a>'.('&nbsp;'x5).'<a href="javascript:backPage(document.userupdate)">'.&mt('Create/Modify Another User').'</a></p>');
+        }
     }
     $r->print(&Apache::loncommon::end_page());
 }
@@ -2542,7 +2556,7 @@ sub custom_role_editor {
 		    'crl'  => "Course Level",
                     'dml'  => "Domain Level",
                     'ssl'  => "System Level");
-    $r->print('Select a Template<br />');
+    $r->print(&mt('Select a Template').'<br />');
     $r->print('<form action="">');
     $r->print($button_code);
     $r->print('</form>');
@@ -2752,7 +2766,8 @@ sub handler {
         $context = 'domain';
     }
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-        ['action','state','callingform','roletype','showrole','bulkaction']);
+        ['action','state','callingform','roletype','showrole','bulkaction','popup','phase',
+         'username','domain','srchterm','srchdomain','srchin','srchby','srchtype']);
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     if ($env{'form.action'} ne 'dateselect') {
         &Apache::lonhtmlcommon::add_breadcrumb
@@ -3077,6 +3092,10 @@ sub print_main_menu {
     foreach my $menu_item (@menu) {
         next if (! $menu_item->{'permission'});
         $menu_html.='<p>';
+        if (exists($menu_item->{'help'})) {
+            $menu_html.=
+                &Apache::loncommon::help_open_topic($menu_item->{'help'});
+        }
         $menu_html.='<font size="+1">';
         if (exists($menu_item->{'url'})) {
             $menu_html.=qq{<a href="$menu_item->{'url'}">};
@@ -3085,10 +3104,6 @@ sub print_main_menu {
                 qq{<a href="/adm/createuser?action=$menu_item->{'action'}">};
         }
         $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
-        if (exists($menu_item->{'help'})) {
-            $menu_html.=
-                &Apache::loncommon::help_open_topic($menu_item->{'help'});
-        }
         $menu_html.='</p>';
     }
     return $menu_html;