--- loncom/interface/lonmanagekeys.pm	2006/06/05 20:44:12	1.20
+++ loncom/interface/lonmanagekeys.pm	2009/02/19 22:11:53	1.23
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to manage course access keys 
 #
-# $Id: lonmanagekeys.pm,v 1.20 2006/06/05 20:44:12 raeburn Exp $
+# $Id: lonmanagekeys.pm,v 1.23 2009/02/19 22:11:53 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -193,7 +193,7 @@ sub handler {
 	    ($cenv{'domain'},$cenv{'num'})=split(/\_/,$env{'form.cid'});
 	    $keytype='auth';
 	} elsif ($cenv{'keyauth'}) {
-	    ($cenv{'num'},$cenv{'domain'})=split(/\W/,$cenv{'keyauth'});
+	    ($cenv{'num'},$cenv{'domain'})=split(/:/,$cenv{'keyauth'});
 	    $keytype='auth';
 	} else {
 	    $keytype='course';
@@ -260,8 +260,8 @@ Comments/Remarks/Notes: <input type="tex
 <hr /><h3>List Keys</h3>
 Comments/Remarks/Notes/User/Batch Number Filter:
 <input type="text" name="listcom" size="30" value="$batchnumber" /><br />
-<input type="checkbox" name="newonly" /> Unused keys only<br />
-<input type="checkbox" name="checkonly" /> Used keys only<br />
+<label><input type="checkbox" name="newonly" /> Unused keys only</label><br />
+<label><input type="checkbox" name="checkonly" /> Used keys only</label><br />
 <input type="submit" name="listkeys" value="List Keys/Add Comments" />
 <input type="submit" name="listkeyscsv" value="CSV List of Keys" />
 ENDKEYMENU
@@ -272,14 +272,15 @@ ENDKEYMENU
 	&Apache::loncommon::content_type($r,'text/html');
 	$r->send_http_header;
 	$r->print(&header().&Apache::loncommon::coursebrowser_javascript());
-        $r->print(
-   &mt('Course ID of Key Authority').': <input input type="text" size="25" name="course" value="" />');
-        $r->print(&mt('Domain').': '.&Apache::loncommon::select_dom_form(
-               $env{'request.role.domain'},'domain'));
+        $r->print('<table><tr><td>'
+   .&mt('Course ID of Key Authority').':</td><td> <input input type="text" size="25" name="course" value="" />');
         $r->print(&Apache::loncommon::selectcourse_link(
 					        'keyform','course','domain',
                                                 undef,undef,undef,'Course'));
-        $r->print('<br /><input type="submit" value="'.&mt('Manage Access Keys').'" />');
+        $r->print('</td></tr>');
+        $r->print('<tr><td>'.&mt('Domain').':</td><td> '.&Apache::loncommon::select_dom_form(
+               $env{'request.role.domain'},'domain'));
+        $r->print('</td></tr></table><input type="submit" value="'.&mt('Next').'" />');
 	$r->print('</form>'.&Apache::loncommon::end_page());
     }
     return OK;