Merge pull request #826 from cardosogabriel/HAWKULAR-921_adjustments

HAWKULAR-921 adjustments
hawkular · Feb 2, 2016 · a5e24e5 · a5e24e5
2 parents c4ffc16 + f09f229
commit a5e24e5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/console/src/main/scripts/plugins/accounts/html/organization-memberships.html b/console/src/main/scripts/plugins/accounts/html/organization-memberships.html
@@ -99,7 +99,7 @@ <h2>Members</h2>
 
             <span ng-show="membership.member.id !== controller.organization.owner.id">
               <span ng-show="controller.isAllowedToChangeRoleOfMembers">
-                <select
+                <select pf-select
                   ng-model="membership.role"
                   ng-change="controller.changeRole(membership)"
                   ng-options="role.name for role in controller.possibleRoles track by role.name"
@@ -111,14 +111,16 @@ <h2>Members</h2>
                 {{membership.role.name}}
               </span>
 
-              <span ng-show="controller.membershipsToUpdate[membership.id] === PersistenceState.PERSISTING">
-                <i class="fa fa-spinner fa-spin"></i>
-              </span>
-              <span ng-show="controller.membershipsToUpdate[membership.id] === PersistenceState.SUCCESS">
-                <i class="fa fa-check"></i>
-              </span>
-              <span ng-show="controller.membershipsToUpdate[membership.id] === PersistenceState.ERROR">
-                <i class="fa fa-exclamation"></i>
+              <span class="hk-select-feedback">
+                <span ng-show="controller.membershipsToUpdate[membership.id] === PersistenceState.PERSISTING">
+                  <div class="spinner spinner-sm hk-inline-block"></div>
+                </span>
+                <span ng-show="controller.membershipsToUpdate[membership.id] === PersistenceState.SUCCESS">
+                  <i class="fa fa-check"></i>
+                </span>
+                <span ng-show="controller.membershipsToUpdate[membership.id] === PersistenceState.ERROR">
+                  <i class="fa fa-exclamation"></i>
+                </span>
               </span>
             </span>
               </td>

diff --git a/console/src/main/scripts/plugins/accounts/html/tokens.html b/console/src/main/scripts/plugins/accounts/html/tokens.html
@@ -71,21 +71,14 @@ <h2 class="card-pf-title">
             <input ng-model="controller.newDescriptions[token.id]" placeholder="Description" class="form-control  hk-form-buttons-offset"/>
           </div>
 
-          <img
-            height="50"
-            width="50"
-            class="pull-right hk-cursor-pointer"
-            tooltip-trigger
-            tooltip="Click to expand"
-            ng-src="/secret-store/qrcode?tokenId={{token.id}}&size=50"
-            ng-click="controller.showQRCode(token)"/>
-
           <p>
             <small><b>Key:</b> {{token.id}}</small><br/>
             <small><b>Secret:</b> {{token.secret}}</small><br/>
             <small><b>Persona:</b> {{controller.personaForToken(token)}}</small><br/>
           </p>
 
+          <button class="btn btn-default" ng-click="controller.showQRCode(token)"><i class="fa fa-qrcode"></i> Get QR Code</button>
+
         </div>
         <div class="card-pf-footer">
           <button type="button"

diff --git a/console/src/main/scripts/plugins/accounts/less/accounts.less b/console/src/main/scripts/plugins/accounts/less/accounts.less
@@ -103,4 +103,8 @@ body.inactivity-modal-open .modal:not(.time-out-dialog)
   td .label {
     margin-left: @grid-gutter-width/4;
   }
-}
+
+  .hk-select-feedback {
+    margin-left: @grid-gutter-width/8;
+  }
+}
diff --git a/console/src/main/scripts/plugins/metrics/less/metrics.less b/console/src/main/scripts/plugins/metrics/less/metrics.less
@@ -230,6 +230,10 @@ a:hover {
   cursor: pointer;
 }
 
+.hk-inline-block {
+  display: inline-block;
+}
+
 // Alerts
 
 .alert-success,