Small styling fixes and renamings (#1869)

src/main/resources/assets/js/app/wizard/AddPublicKeysDialog.ts → src/main/resources/assets/js/app/wizard/NewPublicKeyDialog.ts

@@ -8,12 +8,12 @@ import {TextInput} from '@enonic/lib-admin-ui/ui/text/TextInput';
 import {CryptoWorker} from '../../util/CryptoWorker';
 import {AddPublicKeyRequest} from '../../graphql/principal/user/AddPublicKeyRequest';
 import {User} from '../principal/User';
-import {ConfirmationOfGenerationKeysDialog} from './ConfirmationOfGenerationKeysDialog';
 import {i18n} from '@enonic/lib-admin-ui/util/Messages';
 import {PublicKey} from '../browse/serviceaccount/PublicKey';
 import {DefaultErrorHandler} from '@enonic/lib-admin-ui/DefaultErrorHandler';
+import {showSuccess} from '@enonic/lib-admin-ui/notify/MessageBus';
 
-export class AddPublicKeysDialog
+export class NewPublicKeyDialog
     extends ModalDialog {
 
     private labelTextInput: TextInput;
@@ -31,7 +31,7 @@ export class AddPublicKeysDialog
 
         this.principal = principal;
 
-        this.getEl().addClass('add-public-keys-dialog');
+        this.getEl().addClass('new-public-key-dialog');
 
         this.labelTextInput = new TextInput('middle');
 
@@ -56,7 +56,7 @@ export class AddPublicKeysDialog
     private saveKeysToClient(user: User, event: MessageEvent): void {
         const filename = `${user.getKey().getId()}-${event.data.kid}.json`;
         this.downloadFile(this.createContentAsBlob(event, user), filename);
-        new ConfirmationOfGenerationKeysDialog(filename).open();
+        showSuccess(i18n('dialog.addUserKey.success', filename));
     }
 
     private createContentAsBlob(event: MessageEvent, user: User): Blob {

src/main/resources/assets/js/app/wizard/ConfirmationOfGenerationKeysDialog.ts → src/main/resources/assets/js/app/wizard/PublicKeyDetailsDialog.ts

@@ -2,18 +2,17 @@ import {ModalDialog} from '@enonic/lib-admin-ui/ui/dialog/ModalDialog';
 import {DivEl} from '@enonic/lib-admin-ui/dom/DivEl';
 import {i18n} from '@enonic/lib-admin-ui/util/Messages';
 
-export class ConfirmationOfGenerationKeysDialog
+export class PublicKeyDetailsDialog
     extends ModalDialog {
 
     constructor(filename: string) {
         super({
             title: i18n('dialog.userKeysGenerated.title')
         });
-        this.getEl().addClass('confirmation-of-generation-keys-dialog');
+        this.getEl().addClass('public-key-details-dialog');
         const informationText: DivEl = new DivEl('information-text-section');
         informationText.setHtml(i18n('dialog.userKeysGenerated.msg', filename));
         this.appendChildToContentPanel(informationText);
-        this.addCancelButtonToBottom(i18n('dialog.userKeysGenerated.closeBtn'));
     }
 
     close(): void {

src/main/resources/assets/js/app/wizard/UserKeyDetailsDialog.ts

@@ -14,7 +14,7 @@ export class UserKeyDetailsDialog
 
         const publicKey = new TextArea('public-key', value);
         this.appendChildToContentPanel(publicKey);
-        this.addCancelButtonToBottom(i18n('dialog.userKeyDetails.closeBtn'));
+        this.addCancelButtonToBottom(i18n('action.ok'));
     }
 
     close(): void {

src/main/resources/assets/js/app/wizard/UserPasswordWizardStepForm.ts

@@ -7,7 +7,7 @@ import {Button} from '@enonic/lib-admin-ui/ui/button/Button';
 import {i18n} from '@enonic/lib-admin-ui/util/Messages';
 import {ValidityChangedEvent} from '@enonic/lib-admin-ui/ValidityChangedEvent';
 import {UserItemWizardStepForm} from './UserItemWizardStepForm';
-import {AddPublicKeysDialog} from './AddPublicKeysDialog';
+import {NewPublicKeyDialog} from './NewPublicKeyDialog';
 import {User} from '../principal/User';
 import {PublicKeysGrid} from '../view/PublicKeysGrid';
 
@@ -76,7 +76,7 @@ export class UserPasswordWizardStepForm
 
         this.addPublicKeyButton.onClicked(() => {
             const user = this.principal as User;
-            const publicKeysDialog = new AddPublicKeysDialog(user);
+            const publicKeysDialog = new NewPublicKeyDialog(user);
             publicKeysDialog.setCallback((publicKey) => {
                 this.publicKeysGrid.addPublicKey(user, publicKey);
             });

src/main/resources/assets/styles/wizard/service-account-dialog.less

@@ -1,17 +1,9 @@
-.add-public-keys-dialog {
+.new-public-key-dialog {
   .form-input {
     width: 100%;
   }
 }
 
-.confirmation-of-generation-keys-dialog {
-  .information-text-section {
-    background-color: #fac93f;
-    padding: 20px 15px;
-  }
-
-}
-
 .public-keys-grid {
   margin-bottom: 15px;
 
@@ -23,7 +15,7 @@
     font-size: 12px;
 
     .public-keys-grid-row {
-      color: #53585F;
+      color: @admin-dark-gray;
       display: grid;
       grid-template-columns: 47% 20% 23% 10%;
       grid-template-rows: 100% auto;

src/main/resources/i18n/phrases.properties

@@ -54,7 +54,7 @@ field.pswGenerator.complexity.medium=Medium
 field.pswGenerator.complexity.weak=Weak
 field.pswGenerator.complexity.bad=Bad
 field.pswGenerator.helpText=The password must be at least 10 characters long and either contain at least one uppercase/special character or be a passphrase
-field.userKeys.grid.title=Public Keys:
+field.userKeys.grid.title=Public Keys
 field.userKeys.grid.kid.column=KID
 field.userKeys.grid.creationTime.column=Creation Time
 field.userKeys.grid.label.column=Label
@@ -97,10 +97,6 @@ dialog.new=Create New
 
 dialog.addUserKey.title=New Public Key
 dialog.addUserKey.generateBtn=Generate
-
-dialog.userKeysGenerated.title=Successfully generated keys
-dialog.userKeysGenerated.msg=NB! The private key was stored on your computer as a "{0}".
-dialog.userKeysGenerated.closeBtn=Close
+dialog.addUserKey.success=A file with the private key was stored on your computer as "{0}".
 
 dialog.userKeyDetails.title=Public Key Details
-dialog.userKeyDetails.closeBtn=Close