--- loncom/interface/lonmanagekeys.pm	2006/04/26 14:52:22	1.19
+++ loncom/interface/lonmanagekeys.pm	2009/04/15 11:16:44	1.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to manage course access keys 
 #
-# $Id: lonmanagekeys.pm,v 1.19 2006/04/26 14:52:22 albertel Exp $
+# $Id: lonmanagekeys.pm,v 1.24 2009/04/15 11:16:44 bisitz 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,22 @@ 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(&Apache::loncommon::selectcourse_link(
-					        'keyform','course','domain'));
-        $r->print('<br /><input type="submit" value="'.&mt('Manage Access Keys').'" />');
-	$r->print('</form>'.&Apache::loncommon::end_page());
+        $r->print(&Apache::lonhtmlcommon::start_pick_box()
+                 .&Apache::lonhtmlcommon::row_title(&mt('Course ID of Key Authority'))
+                 .'<input input type="text" size="25" name="course" value="" />'
+                 .' '.&Apache::loncommon::selectcourse_link(
+                          'keyform','course','domain',
+                          undef,undef,undef,'Course')
+                 .&Apache::lonhtmlcommon::row_closure()
+                 .&Apache::lonhtmlcommon::row_title(&mt('Domain'))
+                 .&Apache::loncommon::select_dom_form($env{'request.role.domain'},'domain')
+                 .&Apache::lonhtmlcommon::row_closure(1)
+                 .&Apache::lonhtmlcommon::end_pick_box()
+        );
+        $r->print('<input type="submit" value="'.&mt('Next').'" />'
+                .'</form>'
+                .&Apache::loncommon::end_page()
+        );
     }
     return OK;
 }