From 6c6cfec1fa9abb5428cbf3ea5df82c16185758d1 Mon Sep 17 00:00:00 2001
From: alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>
Date: Fri, 27 Feb 2009 17:29:15 +0000
Subject: Bugzilla 224835, 367171: edit nicknames and sizepanel

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@262 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
---
 .../ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm       | 6 +++++-
 .../ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm       | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'pki/dogtag/ra-ui/shared/docroot')

diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm
index 3fd932df4..798f16598 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm
@@ -26,7 +26,7 @@ function performPanel() {
     }
 }
 </SCRIPT>
-Each certificate associated with this instance needs to have a unique name within the PKI hierarchy. The following information will be used to generate these unique names. <a href="javascript:toggle_details();">[Details]</a>
+Each certificate associated with this instance needs to have a unique name within the PKI hierarchy. The following information will be used to generate these unique names. Each certificate will be stored in the security module using a unique nickname. <a href="javascript:toggle_details();">[Details]</a>
 <SCRIPT type="text/JavaScript">
 function toggle_details()
 {
@@ -58,6 +58,10 @@ Each unique name, called the certificate's subject name, is referenced as the di
         <th>DN:</th>
         <td><input type="text" size="70" name="$item.getCertTag()" value="$item.getDN()"/></td>
       </tr>
+      <tr> 
+        <th>Nickname:</th>
+        <td><input type="text" size="70" name="$item.getCertTag()_nick" value="$item.getNickname()"/></td>
+      </tr>
     </table>
 <p>
 #end
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm
index 08a36a438..b7a7a820c 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm
@@ -166,7 +166,7 @@ Within each key pair type (but not comparable between two different key pair typ
 #if ($select == "default")
  checked
 #end
- onChange="defaultChange()" type=radio name="choice" value="default"><b>Use the default key size (2048 bits for RSA, 256 bits for ECC)</b>.
+ onChange="defaultChange()" type=radio name="choice" value="default"><b>Use the default key size ($default_keysize bits for RSA, $default_ecc_keysize bits for ECC)</b>.
     <p>
     <input
 #if ($select == "custom")
@@ -204,7 +204,7 @@ Within each key pair type (but not comparable between two different key pair typ
 #if ($item.useDefaultKey())
  checked
 #end
- type=radio name=$item.getCertTag()_choice value="default"><b>Use the default key size ($default_keysize bits).
+ type=radio name=$item.getCertTag()_choice value="default"><b>Use the default key size ($default_keysize bits for RSA, $default_ecc_keysize bits for ECC).
     <p>
     <input
 #if (!$item.useDefaultKey())
-- 
cgit