From e1d344b55fd8cefc72ef071b0454defdfb3e186b Mon Sep 17 00:00:00 2001
From: Volker Theile <vtheile@suse.com>
Date: Fri, 27 Apr 2018 13:17:06 +0200
Subject: [PATCH] mgr/dashboard: Address review comments

Signed-off-by: Volker Theile <vtheile@suse.com>
---
 .../rgw-bucket-form.component.html                |  3 ++-
 .../rgw-user-form/rgw-user-form.component.html    | 15 ++++++++++-----
 .../rgw-user-s3-key-modal.component.html          |  3 +--
 .../rgw-user-swift-key-modal.component.html       |  5 +++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
index cc14db99f2143..1682b433b7f17 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
@@ -128,7 +128,8 @@
       </div>
       <div class="panel-footer">
         <div class="button-group text-right">
-          <cd-submit-button (submitAction)="submit()"
+          <cd-submit-button type="button"
+                            (submitAction)="submit()"
                             [form]="bucketForm"
                             i18n>
             {editing, select, 1 {Update} other {Add}}
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
index 0a93303d7b01f..93ba8f4460546 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
@@ -240,7 +240,8 @@
             <span *ngIf="subusers.length === 0"
                   class="form-control no-border">
               <span class="text-muted"
-                    i18n>Empty
+                    i18n>
+                There are no subusers.
               </span>
             </span>
 
@@ -304,7 +305,8 @@
             <span *ngIf="s3Keys.length === 0"
                   class="form-control no-border">
               <span class="text-muted"
-                    i18n>Empty
+                    i18n>
+                There are no keys.
               </span>
             </span>
 
@@ -356,7 +358,8 @@
             <span *ngIf="swiftKeys.length === 0"
                   class="form-control no-border">
               <span class="text-muted"
-                    i18n>Empty
+                    i18n>
+                There are no keys.
               </span>
             </span>
 
@@ -392,7 +395,8 @@
             <span *ngIf="capabilities.length === 0"
                   class="form-control no-border">
               <span class="text-muted"
-                    i18n>Empty
+                    i18n>
+                There are no capabilities.
               </span>
             </span>
 
@@ -645,7 +649,8 @@
 
       <div class="panel-footer">
         <div class="button-group text-right">
-          <cd-submit-button (submitAction)="onSubmit()"
+          <cd-submit-button type="button"
+                            (submitAction)="onSubmit()"
                             [form]="userForm"
                             i18n>
             {editing, select, 1 {Update} other {Add}}
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.html
index 64b29025eab32..043a6f87591db 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.html
@@ -148,9 +148,8 @@
                       [form]="formGroup"
                       i18n>Add
     </cd-submit-button>
-    <button class="btn btn-sm"
+    <button class="btn btn-sm btn-default"
             type="button"
-            [ngClass]="{'btn-primary': viewing, 'btn-default': !viewing}"
             (click)="bsModalRef.hide()"
             i18n>Close
     </button>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.html
index 67253144b7716..39ea551cf5c06 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.html
@@ -60,8 +60,9 @@
   </form>
 </div>
 <div class="modal-footer">
-  <button class="btn btn-sm btn-primary"
+  <button class="btn btn-sm btn-default"
           type="button"
           (click)="bsModalRef.hide()"
-          i18n>Close</button>
+          i18n>Close
+  </button>
 </div>
-- 
2.39.5