Repository: ambari Updated Branches: refs/heads/branch-dev-patch-upgrade 898523113 -> 10cea2c79
AMBARI-18764 Fix missing checkboxes and radiobuttons. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/464d3d5c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/464d3d5c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/464d3d5c Branch: refs/heads/branch-dev-patch-upgrade Commit: 464d3d5cecc3745155397e5c33a0a7cea7e44862 Parents: 2a983d4 Author: ababiichuk <[email protected]> Authored: Tue Nov 1 20:10:01 2016 +0200 Committer: ababiichuk <[email protected]> Committed: Tue Nov 1 23:54:49 2016 +0200 ---------------------------------------------------------------------- .../main/service/configs/config_overridable.js | 18 +-- ambari-web/app/models/form.js | 2 +- ambari-web/app/styles/application.less | 1 - ambari-web/app/styles/stack_versions.less | 3 - .../common/configs/selectCreateConfigGroup.hbs | 2 - .../configs/widgets/list_config_widget.hbs | 3 +- ambari-web/app/templates/common/grid/filter.hbs | 4 +- .../app/templates/common/log_file_search.hbs | 2 +- .../kerberos/regenerate_keytabs_popup_body.hbs | 2 +- .../restart_services_after_regenerate_body.hbs | 2 +- .../app/templates/main/admin/kerberos/step3.hbs | 148 +++++++++---------- .../stack_upgrade/stack_upgrade_wizard.hbs | 12 +- .../main/alerts/create_alert_notification.hbs | 2 +- .../main/dashboard/plus_button_filter.hbs | 4 +- .../step4/step4_ranger_requirements_popup.hbs | 5 +- .../configs/widgets/list_config_widget_view.js | 4 +- .../app/views/common/radio_button_view.js | 1 + .../main/alerts/definition_configs_view.js | 4 +- ambari-web/app/views/main/dashboard/widgets.js | 2 +- ambari-web/app/views/wizard/step1_view.js | 2 +- 20 files changed, 101 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/mixins/main/service/configs/config_overridable.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/main/service/configs/config_overridable.js b/ambari-web/app/mixins/main/service/configs/config_overridable.js index 92891be..d84e31c 100644 --- a/ambari-web/app/mixins/main/service/configs/config_overridable.js +++ b/ambari-web/app/mixins/main/service/configs/config_overridable.js @@ -192,27 +192,25 @@ App.ConfigOverridable = Em.Mixin.create({ bodyClass: Em.View.extend({ templateName: require('templates/common/configs/selectCreateConfigGroup'), controllerBinding: 'App.router.mainServiceInfoConfigsController', - selectConfigGroupRadioButton: Em.Checkbox.extend({ - tagName: 'input', - attributeBindings: ['type', 'checked', 'disabled'], + selectConfigGroupRadioButton: App.RadioButtonView.extend({ + label: Em.computed.alias('parentView.parentView.selectExistingGroupLabel'), checked: Em.computed.alias('parentView.parentView.optionSelectConfigGroup'), - type: 'radio', - disabled: false, + disabled: Em.computed.not('parentView.parentView.hasExistedGroups'), click: function () { + if (this.get('disabled')) { + return; + } this.set('parentView.parentView.optionSelectConfigGroup', true); }, didInsertElement: function () { if (!this.get('parentView.parentView.hasExistedGroups')) { - this.set('disabled', true); this.set('parentView.parentView.optionSelectConfigGroup', false); } } }), - createConfigGroupRadioButton: Em.Checkbox.extend({ - tagName: 'input', - attributeBindings: ['type', 'checked'], + createConfigGroupRadioButton: App.RadioButtonView.extend({ + label: Em.computed.alias('parentView.parentView.createNewGroupLabel'), checked: Em.computed.not('parentView.parentView.optionSelectConfigGroup'), - type: 'radio', click: function () { this.set('parentView.parentView.optionSelectConfigGroup', false); } http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/models/form.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/form.js b/ambari-web/app/models/form.js index 09a620a..22a48a9 100644 --- a/ambari-web/app/models/form.js +++ b/ambari-web/app/models/form.js @@ -131,7 +131,7 @@ App.FormField = Em.Object.extend({ // try to realize this as view var element = Em.TextField; switch (this.get('displayType')) { case 'checkbox': - element = Em.Checkbox; + element = App.CheckboxView; options.checkedBinding = "value"; break; case 'select': http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 51a22d5..d0eebce 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -2862,7 +2862,6 @@ table.graphs { li { display: block; padding: 3px 0 3px 5px; - line-height: 20px; .checkbox { margin: 0; } http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/styles/stack_versions.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/stack_versions.less b/ambari-web/app/styles/stack_versions.less index f8bd698..9d4190a 100644 --- a/ambari-web/app/styles/stack_versions.less +++ b/ambari-web/app/styles/stack_versions.less @@ -369,9 +369,6 @@ input[type="checkbox"] { margin: 0; } - .message { - line-height: 30px; - } } .task-details { .manage-controls a { http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs b/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs index a175ee5..47dcb2a 100644 --- a/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs +++ b/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs @@ -27,7 +27,6 @@ <div class="radio"> <label {{bindAttr class="view.parentView.hasExistedGroups::message"}}> {{view view.selectConfigGroupRadioButton}} - {{view.parentView.selectExistingGroupLabel}} </label> </div> </div> @@ -60,7 +59,6 @@ <div class="radio"> <label> {{view view.createConfigGroupRadioButton}} - {{view.parentView.createNewGroupLabel}} </label> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs index 75ab2bf..0f6e338 100644 --- a/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs +++ b/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs @@ -25,8 +25,7 @@ <li> <a rel="tooltip" href="javascript:void(0);" {{action "toggleOption" option target="view"}} {{bindAttr data-original-title="option.description"}}> - <label - class="checkbox">{{view view.checkBoxWithoutAction valueBinding="option.value" disabledBinding="option.isDisabled" checkedBinding="option.isSelected"}} {{option.label}}</label> + {{view view.checkBoxWithoutAction valueBinding="option.value" disabledBinding="option.isDisabled" checkedBinding="option.isSelected" labelBinding="option.label"}} </a> </li> {{/each}} http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/templates/common/grid/filter.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/grid/filter.hbs b/ambari-web/app/templates/common/grid/filter.hbs index 41ab1cb..33ff1fe 100644 --- a/ambari-web/app/templates/common/grid/filter.hbs +++ b/ambari-web/app/templates/common/grid/filter.hbs @@ -19,9 +19,7 @@ {{#each filter in view.filters}} <li> <div class="checkbox"> - <label> - {{view Em.Checkbox checkedBinding="filter.checked"}} {{filter.label}} - </label> + {{view App.CheckboxView checkedBinding="filter.checked" labelBinding="filter.label"}} </div> </li> {{/each}} http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/templates/common/log_file_search.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/log_file_search.hbs b/ambari-web/app/templates/common/log_file_search.hbs index 5f6bfe1..4242e42 100644 --- a/ambari-web/app/templates/common/log_file_search.hbs +++ b/ambari-web/app/templates/common/log_file_search.hbs @@ -44,7 +44,7 @@ {{#each level in view.levelsContext}} <div class="display-inline-block level-checkbox"> <label> - {{view Em.Checkbox checkedBinding="level.checked"}} + {{view App.CheckboxView checkedBinding="level.checked"}} {{level.displayName}} ({{level.counter}}) </label> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/templates/main/admin/kerberos/regenerate_keytabs_popup_body.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/kerberos/regenerate_keytabs_popup_body.hbs b/ambari-web/app/templates/main/admin/kerberos/regenerate_keytabs_popup_body.hbs index 3a0cedf..e0bae92 100644 --- a/ambari-web/app/templates/main/admin/kerberos/regenerate_keytabs_popup_body.hbs +++ b/ambari-web/app/templates/main/admin/kerberos/regenerate_keytabs_popup_body.hbs @@ -18,5 +18,5 @@ <p class="alert alert-warning">{{t admin.kerberos.regenerate_keytabs.popup.body}}</p> <p> - <label>{{view Em.Checkbox classNames="checkbox" checkedBinding="view.parentView.regenerateKeytabsOnlyForMissing"}} {{t admin.kerberos.regenerate_keytabs.checkbox.label}}</label> + {{view App.CheckboxView classNames="checkbox" checkedBinding="view.parentView.regenerateKeytabsOnlyForMissing" labelTranslate="admin.kerberos.regenerate_keytabs.checkbox.label"}} </p> http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/templates/main/admin/kerberos/restart_services_after_regenerate_body.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/kerberos/restart_services_after_regenerate_body.hbs b/ambari-web/app/templates/main/admin/kerberos/restart_services_after_regenerate_body.hbs index c3ce6a7..08fc079 100644 --- a/ambari-web/app/templates/main/admin/kerberos/restart_services_after_regenerate_body.hbs +++ b/ambari-web/app/templates/main/admin/kerberos/restart_services_after_regenerate_body.hbs @@ -17,5 +17,5 @@ }} <p class="alert alert-warning">{{t admin.kerberos.regenerate_keytabs.popup.restart.body}}</p> <p> - <label>{{view Em.Checkbox classNames="checkbox" checkedBinding="view.parentView.restartComponents"}} {{t admin.kerberos.regenerate_keytabs.checkbox.restart.label}}</label> + {{view App.CheckboxView classNames="checkbox" checkedBinding="view.parentView.restartComponents" labelTranslate="admin.kerberos.regenerate_keytabs.checkbox.restart.label"}} </p> http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/templates/main/admin/kerberos/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/kerberos/step3.hbs b/ambari-web/app/templates/main/admin/kerberos/step3.hbs index ef51818..6e2ea57 100644 --- a/ambari-web/app/templates/main/admin/kerberos/step3.hbs +++ b/ambari-web/app/templates/main/admin/kerberos/step3.hbs @@ -16,85 +16,85 @@ * limitations under the License. }} <div id="kerberos-wizard-step3"> - <div id="common-progress-page" class="wizard-content col-md-9"> - <h4 class="step-title">{{view.headerTitle}}</h4> - <div {{bindAttr class="view.noticeClass"}}>{{{view.notice}}} - {{#if controller.showRetry}} - <a href="#" {{action retry target="controller"}}> - {{t common.retry}} - </a> - {{/if}} - </div> - {{#if controller.isLoaded}} - <div class="panel panel-default"> - <div class="panel-body"> - <div class="clearfix"> - {{#each task in controller.tasks}} - {{#view view.taskView contentBinding="task"}} - <div class="item"> - <div {{bindAttr class=":pull-left view.linkClass view.parentView.labelWidth"}}> - <i {{bindAttr class="view.icon view.iconColor"}}></i> - <a {{action "showHostProgressPopup" task target="controller"}} >{{task.title}}</a> - </div> - <div {{bindAttr class="view.showProgressBar::hide :row :col-md-5 :pull-left" }}> - <div {{bindAttr class=":progress-wrapper controller.isRollback::col-md-8 controller.isRollback:col-md-3"}}> - <div class="progress"> - <div class="progress-bar-striped active progress-bar-info progress-bar" {{bindAttr style="view.barWidth"}}></div> - </div> - </div> - <div {{bindAttr class=":col-md-1 view.hidePercent:noDisplay"}}>{{task.progress}}%</div> - </div> - <div> - {{#if task.showRetry}} - <a {{action retryTask target="controller"}} class="btn btn-primary retry" - rel="tooltip" - data-trigger="click" {{bindAttr title="view.showDBTooltip:testDBRetryTooltip"}}> - <i class="glyphicon glyphicon-repeat glyphicon-white"></i> - {{t common.retry}} - </a> - - {{/if}} - {{#if task.showRollback}} - <a {{action rollback target="controller"}} class="btn btn-primary retry"> - <i class="glyphicon glyphicon-repeat glyphicon-white"></i> - {{t common.rollBack}} - </a> - {{/if}} - {{#if task.showSkip}} - <a {{action skipTask target="controller"}} class="btn btn-primary retry"> - <i class="glyphicon-step-forward glyphicon glyphicon-white"></i> - {{t common.skip}} - </a> - {{/if}} - </div> + <div id="common-progress-page" class="wizard-content col-md-9"> + <h4 class="step-title">{{view.headerTitle}}</h4> + <div {{bindAttr class="view.noticeClass"}}>{{{view.notice}}} + {{#if controller.showRetry}} + <a href="#" {{action retry target="controller"}}> + {{t common.retry}} + </a> + {{/if}} + </div> + {{#if controller.isLoaded}} + <div class="panel panel-default"> + <div class="panel-body"> + <div class="clearfix"> + {{#each task in controller.tasks}} + {{#view view.taskView contentBinding="task"}} + <div class="item"> + <div {{bindAttr class=":pull-left view.linkClass view.parentView.labelWidth"}}> + <i {{bindAttr class="view.icon view.iconColor"}}></i> + <a {{action "showHostProgressPopup" task target="controller"}} >{{task.title}}</a> + </div> + <div {{bindAttr class="view.showProgressBar::hide :row :col-md-5 :pull-left" }}> + <div {{bindAttr class=":progress-wrapper controller.isRollback::col-md-8 controller.isRollback:col-md-3"}}> + <div class="progress"> + <div class="progress-bar-striped active progress-bar-info progress-bar" {{bindAttr style="view.barWidth"}}></div> </div> - {{/view}} + </div> + <div {{bindAttr class=":col-md-1 view.hidePercent:noDisplay"}}>{{task.progress}}%</div> + </div> + <div> + {{#if task.showRetry}} + <a {{action retryTask target="controller"}} class="btn btn-primary retry" + rel="tooltip" + data-trigger="click" {{bindAttr title="view.showDBTooltip:testDBRetryTooltip"}}> + <i class="glyphicon glyphicon-repeat glyphicon-white"></i> + {{t common.retry}} + </a> - {{/each}} - </div> - {{#if showIgnore}} - <div class="alert alert-warning"> - <label>{{view Em.Checkbox classNames="checkbox" checkedBinding="ignore"}} {{t admin.kerberos.wizard.step3.checkbox.ignoreAndProceed.label}}</label> + {{/if}} + {{#if task.showRollback}} + <a {{action rollback target="controller"}} class="btn btn-primary retry"> + <i class="glyphicon glyphicon-repeat glyphicon-white"></i> + {{t common.rollBack}} + </a> + {{/if}} + {{#if task.showSkip}} + <a {{action skipTask target="controller"}} class="btn btn-primary retry"> + <i class="glyphicon-step-forward glyphicon glyphicon-white"></i> + {{t common.skip}} + </a> + {{/if}} + </div> </div> - {{/if}} - {{#if view.isHostHeartbeatLost}} - <p class="alert alert-danger">{{view.resultMsg}} - <a href="javascript:void(null)" - data-toggle="modal" {{action showHostsWithLostHeartBeat target="view"}}>{{t common.showDetails}}</a> - </p> - {{/if}} - {{else}} - {{view App.SpinnerView}} + {{/view}} + + {{/each}} + </div> + {{#if showIgnore}} + <div class="alert alert-warning"> + <label>{{view App.CheckboxView classNames="checkbox" checkedBinding="ignore" labelTranslate="admin.kerberos.wizard.step3.checkbox.ignoreAndProceed.label"}}</label> + </div> {{/if}} - </div> - </div> - </div> - <div class="wizard-footer col-md-12"> - <div class="btn-area"> - {{#if view.showBackButton}} - <button class="btn btn-default pull-left" {{bindAttr disabled="controller.isBackButtonDisabled"}} {{action back target="controller"}}>← {{t common.back}}</button> + {{#if view.isHostHeartbeatLost}} + <p class="alert alert-danger">{{view.resultMsg}} + <a href="javascript:void(null)" + data-toggle="modal" {{action showHostsWithLostHeartBeat target="view"}}>{{t common.showDetails}}</a> + </p> {{/if}} - <button class="btn btn-success pull-right" {{bindAttr disabled="controller.isSubmitDisabled"}} {{action done target="controller"}}>{{{view.submitButtonText}}}</button> </div> + </div> + {{else}} + {{view App.SpinnerView}} + {{/if}} + </div> + <div class="wizard-footer col-md-12"> + <div class="btn-area"> + {{#if view.showBackButton}} + <button class="btn btn-default pull-left" {{bindAttr disabled="controller.isBackButtonDisabled"}} {{action back target="controller"}}>← {{t common.back}}</button> + {{/if}} + <button class="btn btn-success pull-right" {{bindAttr disabled="controller.isSubmitDisabled"}} {{action done target="controller"}}>{{{view.submitButtonText}}}</button> </div> + </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs index f7de77f..6548ea0 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs @@ -101,8 +101,7 @@ <p class="manual-steps-content">{{message}}</p> {{/each}} <label class="message"> - {{view Em.Checkbox checkedBinding="view.isManualDone"}} - {{t admin.stackUpgrade.dialog.manualDone}} + {{view App.CheckboxView checkedBinding="view.isManualDone" labelTranslate="admin.stackUpgrade.dialog.manualDone"}} </label> <div class="button-row"> {{#if view.isDowngradeAvailable}} @@ -143,8 +142,7 @@ {{/if}} <label class="message"> - {{view Em.Checkbox checkedBinding="view.isManualDone"}} - {{t admin.stackUpgrade.dialog.manualDone}} + {{view App.CheckboxView checkedBinding="view.isManualDone" labelTranslate="admin.stackUpgrade.dialog.manualDone"}} </label> <div class="button-row"> {{#if view.isDowngradeAvailable}} @@ -181,8 +179,7 @@ </div> {{#unless view.isHoldingState}} <label class="message"> - {{view Em.Checkbox checkedBinding="view.isManualDone"}} - {{t admin.stackUpgrade.dialog.manualDone}} + {{view App.CheckboxView checkedBinding="view.isManualDone" labelTranslate="admin.stackUpgrade.dialog.manualDone"}} </label> {{/unless}} <div class="button-row"> @@ -245,8 +242,7 @@ {{/if}} <label class="message"> - {{view Em.Checkbox checkedBinding="view.isManualDone"}} - {{t admin.stackUpgrade.dialog.manualDone}} + {{view App.CheckboxView checkedBinding="view.isManualDone" labelTranslate="admin.stackUpgrade.dialog.manualDone"}} </label> <div class="button-row"> {{#if view.isDowngradeAvailable}} http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/templates/main/alerts/create_alert_notification.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/create_alert_notification.hbs b/ambari-web/app/templates/main/alerts/create_alert_notification.hbs index 0dfe05d..342b247 100644 --- a/ambari-web/app/templates/main/alerts/create_alert_notification.hbs +++ b/ambari-web/app/templates/main/alerts/create_alert_notification.hbs @@ -205,7 +205,7 @@ <label class="control-label col-md-2" for="inputSMTPSTARTTLS">{{controller.inputFields.SMTPSTARTTLS.label}}</label> <div class="col-md-10"> - {{view Em.Checkbox disabledBinding="controller.inputFields.SMTPUseAuthentication.invertedValue" checkedBinding="controller.inputFields.SMTPSTARTTLS.value" id="inputSMTPSTARTTLS"}} + {{view App.CheckboxView disabledBinding="controller.inputFields.SMTPUseAuthentication.invertedValue" checkedBinding="controller.inputFields.SMTPSTARTTLS.value" id="inputSMTPSTARTTLS"}} </div> </div> {{else}} http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs b/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs index 71a4980..a8792fe 100644 --- a/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs +++ b/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs @@ -23,9 +23,7 @@ {{#each widget in view.hiddenWidgets}} <li> <div class="checkbox"> - <label> - {{view view.widgetCheckbox checkedBinding="widget.checked"}} {{unbound widget.displayName}} - </label> + {{view view.widgetCheckbox checkedBinding="widget.checked" labelBinding="widget.displayName"}} </div> </li> {{/each}} http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/templates/wizard/step4/step4_ranger_requirements_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step4/step4_ranger_requirements_popup.hbs b/ambari-web/app/templates/wizard/step4/step4_ranger_requirements_popup.hbs index 5adb7bc..107b861 100644 --- a/ambari-web/app/templates/wizard/step4/step4_ranger_requirements_popup.hbs +++ b/ambari-web/app/templates/wizard/step4/step4_ranger_requirements_popup.hbs @@ -18,8 +18,5 @@ {{t installer.step4.rangerRequirements.popup.body.requirements}} <div class="checkbox"> - {{!-- <label> --}} - {{view App.CheckboxView checkedBinding="isChecked" labelTranslate="installer.step4.rangerRequirements.popup.body.confirmation"}} - {{!-- t installer.step4.rangerRequirements.popup.body.confirmation --}} - {{!-- </label> --}} + {{view App.CheckboxView checkedBinding="isChecked" labelTranslate="installer.step4.rangerRequirements.popup.body.confirmation"}} </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js index d3261c8..1f739e3 100644 --- a/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js +++ b/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js @@ -274,9 +274,9 @@ App.ListConfigWidgetView = App.ConfigWidgetView.extend({ * Just a small checkbox-wrapper with modified click-handler * Should call <code>parentView.toggleOption</code> * User may click on the checkbox or on the link which wraps it, but action in both cases should be the same (<code>toggleOption</code>) - * @type {Em.Checkbox} + * @type {App.CheckboxView} */ - checkBoxWithoutAction: Em.Checkbox.extend({ + checkBoxWithoutAction: App.CheckboxView.extend({ init: function() { this._super(); this.off('change', this, this._updateElementValue); http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/views/common/radio_button_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/radio_button_view.js b/ambari-web/app/views/common/radio_button_view.js index 6242be2..a8898b3 100644 --- a/ambari-web/app/views/common/radio_button_view.js +++ b/ambari-web/app/views/common/radio_button_view.js @@ -46,6 +46,7 @@ App.RadioButtonView = App.CheckboxView.extend({ checkboxView: Ember.RadioButton.extend({ selectionBinding: 'parentView.selection', valueBinding: 'parentView.value', + disabledBinding: 'parentView.disabled', checked: Em.computed.alias('parentView.checked'), didInsertElement: function() { this.set('parentView.checkboxId', this.get('elementId')); http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/views/main/alerts/definition_configs_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/alerts/definition_configs_view.js b/ambari-web/app/views/main/alerts/definition_configs_view.js index 72b2dde..09c8029 100644 --- a/ambari-web/app/views/main/alerts/definition_configs_view.js +++ b/ambari-web/app/views/main/alerts/definition_configs_view.js @@ -80,9 +80,7 @@ App.AlertConfigThresholdView = Em.View.extend({ classNames: ['row'] }); -App.AlertConfigRadioButtonView = Em.Checkbox.extend({ - attributeBindings: ['type', 'name', 'value', 'checked', 'disabled'], - type: 'radio', +App.AlertConfigRadioButtonView = App.RadioButtonView.extend({ nameBinding: 'property.group', checkedBinding: 'property.value', http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/views/main/dashboard/widgets.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/widgets.js b/ambari-web/app/views/main/dashboard/widgets.js index 48293d3..57f5f50 100644 --- a/ambari-web/app/views/main/dashboard/widgets.js +++ b/ambari-web/app/views/main/dashboard/widgets.js @@ -232,7 +232,7 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, Ap hiddenWidgetsBinding: 'parentView.hiddenWidgets', visibleWidgetsBinding: 'parentView.visibleWidgets', valueBinding: '', - widgetCheckbox: Em.Checkbox.extend({ + widgetCheckbox: App.CheckboxView.extend({ didInsertElement: function () { $('.checkbox').click(function (event) { event.stopPropagation(); http://git-wip-us.apache.org/repos/asf/ambari/blob/464d3d5c/ambari-web/app/views/wizard/step1_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/step1_view.js b/ambari-web/app/views/wizard/step1_view.js index fe1032b..b7a57ca 100644 --- a/ambari-web/app/views/wizard/step1_view.js +++ b/ambari-web/app/views/wizard/step1_view.js @@ -213,7 +213,7 @@ App.WizardStep1View = Em.View.extend({ }), /** - * @type {Em.Checkbox} + * @type {App.CheckboxView} */ redhatCheckBoxView: App.CheckboxView.extend({ checkedBinding: 'controller.selectedStack.useRedhatSatellite',
