AMBARI-20653.Bad user experience in workflow credential creation.(M Madhan Mohan Reddy via padmapriyanitt)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8f8fc11d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8f8fc11d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8f8fc11d Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 8f8fc11d34bd2a72cff194e22e176913d874fc10 Parents: e945bb1 Author: padmapriyanitt <[email protected]> Authored: Tue Apr 4 11:55:13 2017 +0530 Committer: padmapriyanitt <[email protected]> Committed: Tue Apr 4 11:55:13 2017 +0530 ---------------------------------------------------------------------- .../ui/app/components/workflow-credentials.js | 2 +- .../src/main/resources/ui/app/styles/app.less | 3 --- .../ui/app/templates/components/credentials-config.hbs | 2 +- .../app/templates/components/workflow-credentials.hbs | 13 ++++++++----- 4 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8f8fc11d/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-credentials.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-credentials.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-credentials.js index 1072ca4..1f1fc04 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-credentials.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-credentials.js @@ -23,7 +23,7 @@ export default Ember.Component.extend(Ember.Evented, { initialize : function(){ this.get('credentialsList').clear(); this.get('childComponents').clear(); - this.set('credentialsList', Ember.copy(this.get('workflowCredentials'))); + this.set('credentialsList', this.get('workflowCredentials')); }.on('init'), rendered : function(){ this.$('#workflow_credentials_dialog').modal({ http://git-wip-us.apache.org/repos/asf/ambari/blob/8f8fc11d/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less index 673ae6a..3c5e720 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less +++ b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less @@ -1267,9 +1267,6 @@ input:invalid { color: @defaultRed; cursor: pointer; } -.credential-list { - margin-top: 37px; -} .credential-list .fa-trash-o{ color: @defaultRed; cursor: pointer; http://git-wip-us.apache.org/repos/asf/ambari/blob/8f8fc11d/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/credentials-config.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/credentials-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/credentials-config.hbs index 366920d..555bf98 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/credentials-config.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/credentials-config.hbs @@ -66,7 +66,7 @@ </div> </div> <div class="col-xs-24 pull-right"> - <input class="btn btn-default marginright5" type="button" {{action "cancel"}} value="Cancel"> + <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> {{#if (eq mode 'create')}} <input class="btn btn-primary" type="button" {{action "add"}} value="Add"> {{else}} http://git-wip-us.apache.org/repos/asf/ambari/blob/8f8fc11d/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-credentials.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-credentials.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-credentials.hbs index 464221f..fa47612 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-credentials.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-credentials.hbs @@ -24,13 +24,16 @@ </div> <div class="modal-body"> <div class=" panel panel-default"> - <div class="panel-heading">Credentials</div> - <div class="panel-body handlerPanel"> - <div id="credential-action-bar" class="form-group pull-right"> + <div class="panel-heading clearfix"> + <div class="pull-left paddingtop7">Credentials</div> + <div id="credential-action-bar" class="pull-right"> <button id="dataset-create-btn" {{action 'createCredentials'}} type="button" class="btn btn-default"> <i class="fa fa-plus-circle"></i> Add </button> </div> + </div> + <div class="panel-body handlerPanel"> + <div class="paddingtop10"> <ul class="list-group credential-list"> {{#each credentialsList as |credential index|}} @@ -57,10 +60,10 @@ {{#credentials-config credential=currentCredentials showCredentials="showCredentials" update="updateCredentials" mode="edit" cancel="cancelEditMode"}}{{/credentials-config}} {{/if}} </div> - <div class="modal-footer"> + <!-- <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> <button type="button" class="btn btn-primary" {{action "saveCredentials"}}>Save</button> - </div> + </div> --> </div> </div> </div>
