AMBARI-21082 - Ambari 3.0: Outstanding wizard issues (rzang) Change-Id: Ia6e54d7dbd529cce59d3e2cdcc8fd6ed6a04ce1b
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9415478d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9415478d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9415478d Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 9415478dca03caf7f55ba21e8f00d954dc117757 Parents: 0626b78 Author: Richard Zang <[email protected]> Authored: Mon May 22 19:29:03 2017 -0700 Committer: Richard Zang <[email protected]> Committed: Mon May 22 19:29:03 2017 -0700 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 11 ++++++++++- ambari-web/app/templates/wizard/step4.hbs | 16 ++++++++-------- ambari-web/app/views/wizard/step4_view.js | 7 ++++++- 3 files changed, 24 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9415478d/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 2fc1cf2..95990b8 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -2671,4 +2671,13 @@ a.abort-icon:hover { &.overlay-visible { display: block; } -} \ No newline at end of file +} + +.step-marker { + .step-index { + display: block; + margin-top: -1px; + margin-left: 0.3px; + } +} + http://git-wip-us.apache.org/repos/asf/ambari/blob/9415478d/ambari-web/app/templates/wizard/step4.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step4.hbs b/ambari-web/app/templates/wizard/step4.hbs index 9f1d7df..5a08250 100644 --- a/ambari-web/app/templates/wizard/step4.hbs +++ b/ambari-web/app/templates/wizard/step4.hbs @@ -34,17 +34,17 @@ </tr> </thead> <tbody> - {{#each controller}} + {{#each service in controller}} {{#unless isHiddenOnSelectServicePage}} - <tr {{QAAttr "service-row"}} {{bindAttr class="isSelected:active isSelected:service-selected"}}> - <td {{QAAttr "service-name"}}>{{displayNameOnSelectServicePage}}</td> - <td {{QAAttr "service-version"}}>{{serviceVersionDisplay}}</td> - <td {{QAAttr "service-description"}}>{{{comments}}}</td> + <tr {{QAAttr "service-row"}} {{bindAttr class="service.isSelected:active service.isSelected:service-selected"}} {{action toggleCheckBox service target="view"}}> + <td {{QAAttr "service-name"}}>{{service.displayNameOnSelectServicePage}}</td> + <td {{QAAttr "service-version"}}>{{service.serviceVersionDisplay}}</td> + <td {{QAAttr "service-description"}}>{{{service.comments}}}</td> <td> <div class="checkbox"> - {{view App.CheckboxView checkboxClassNamesBinding="serviceName" data-qa="toggle-service" - disabledBinding="isDisabled" - checkedBinding="isSelected" + {{view App.CheckboxView checkboxClassNamesBinding="service.serviceName" data-qa="toggle-service" + disabledBinding="service.isDisabled" + checkedBinding="service.isSelected" }} </div> </td> http://git-wip-us.apache.org/repos/asf/ambari/blob/9415478d/ambari-web/app/views/wizard/step4_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/step4_view.js b/ambari-web/app/views/wizard/step4_view.js index 137b9f5..928d46c 100644 --- a/ambari-web/app/views/wizard/step4_view.js +++ b/ambari-web/app/views/wizard/step4_view.js @@ -21,6 +21,11 @@ var App = require('app'); App.WizardStep4View = Em.View.extend({ - templateName: require('templates/wizard/step4') + templateName: require('templates/wizard/step4'), + toggleCheckBox: function(event) { + if (event.context.get('isDisabled')) { return; } + var isSelected = event.context.get('isSelected'); + event.context.set('isSelected', !isSelected); + } });
