===================================================================
RCS file: /cvs/palm/Palm-Keyring/examples/cgi/bin/keyring.cgi,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -r1.2 -r1.4
--- palm/Palm-Keyring/examples/cgi/bin/keyring.cgi	2009/06/15 18:45:46	1.2
+++ palm/Palm-Keyring/examples/cgi/bin/keyring.cgi	2009/07/16 21:08:45	1.4
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $RedRiver: keyring.cgi,v 1.1 2009/06/11 20:40:45 andrew Exp $
+# $RedRiver: keyring.cgi,v 1.3 2009/06/16 01:39:09 andrew Exp $
 ########################################################################
 # keyring.cgi *** Update and modify keyring files
 #
@@ -39,7 +39,7 @@
 #$pjx->JSDEBUG(1);
 #$pjx->DEBUG(1);
 
-my $password = $query->param('password');
+my $password = $query->param('unlock_password');
 my $file     = $query->param('file') || '';
 my $category = $query->param('category');
 my $record   = $query->param('record');
@@ -120,14 +120,14 @@
         else {
             return
                   'Unlocked: '
-                . $query->hidden( 'password', $password )
+                . $query->hidden( 'unlock_password', $password )
                 . $query->submit( -name => 'lock', -value => 'Lock', );
         }
     }
 
-    return 'Password: '
+    return 'Locked - Enter Password to Unlock: ' . $query->br() 
         . $query->password_field(
-        -name     => 'password',
+        -name     => 'unlock_password',
         -value    => '',
         -override => 1,
         );
@@ -152,7 +152,7 @@
                 -default  => $file,
                 -onChange => "changeFile("
                     . "['file'],"
-                    . "['passwords','files','categories','lists','records','errors']);",
+                    . "['unlock_passwords','files','categories','lists','records','errors']);",
             );
         }
         else {
@@ -180,11 +180,14 @@
 
     return $query->popup_menu(
         -name     => 'category',
-        -values   => [ sort { $a <=> $b } keys %categories ],
+        -values   => [ 
+            sort { lc( $categories{$a} ) cmp lc( $categories{$b} ) } 
+            	keys %categories 
+        ],
         -default  => $category,
         -labels   => \%categories,
         -onChange => "changeCategory("
-            . "['password','file','category'],"
+            . "['unlock_password','file','category'],"
             . "['lists','errors'], 'POST');",
     );
 }
@@ -211,9 +214,8 @@
         ],
         -default  => [$record],
         -labels   => \%records,
-        -size     => 25,
         -onChange => "changeRecord("
-            . "['password','file','record'],"
+            . "['unlock_password','file','record'],"
             . "['records','errors'], 'POST');",
     );
 }
@@ -271,9 +273,14 @@
             $label = 'Last Change';
         }
 
+        my $type = 'textfield';
+        if ($key eq 'notes') {
+            $type = 'textarea';
+        }
+
         $output 
             .= $label . ': '
-            . $query->textfield(
+            . $query->$type(
             -name     => 'acct_' . $key,
             -value    => $acct{$key}{data},
             -override => 1,