Repository: ambari Updated Branches: refs/heads/trunk d1655dc57 -> ef30d78a3
AMBARI-15722 [Ambari Web] move RedHat Satellite option out of experimental (zhewang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ef30d78a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ef30d78a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ef30d78a Branch: refs/heads/trunk Commit: ef30d78a3913abdb3ab91fd4b683e140bef21bfc Parents: d1655dc Author: Zhe (Joe) Wang <[email protected]> Authored: Wed Apr 6 12:55:39 2016 -0700 Committer: Zhe (Joe) Wang <[email protected]> Committed: Wed Apr 6 12:55:39 2016 -0700 ---------------------------------------------------------------------- .../main/admin/stack_upgrade/edit_repositories.hbs | 12 +++++------- ambari-web/app/templates/wizard/step1.hbs | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ef30d78a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs index 62c3d14..35677ab 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs @@ -50,10 +50,8 @@ <i class="icon-question-sign" rel="skip-validation-tooltip" data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label> </div> -{{#if App.supports.redhatSatellite}} - <div id="use-redhat"> - <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="view.parentView.useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}} - <i class="icon-question-sign" rel="use-redhat-tooltip" - data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}></i></label> - </div> -{{/if}} +<div id="use-redhat"> + <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="view.parentView.useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}} + <i class="icon-question-sign" rel="use-redhat-tooltip" + data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}></i></label> +</div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/ef30d78a/ambari-web/app/templates/wizard/step1.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step1.hbs b/ambari-web/app/templates/wizard/step1.hbs index e59b76d..ab9a0dd 100644 --- a/ambari-web/app/templates/wizard/step1.hbs +++ b/ambari-web/app/templates/wizard/step1.hbs @@ -98,13 +98,11 @@ <i class="icon-question-sign" rel="skip-validation-tooltip" data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label> </div> - {{#if App.supports.redhatSatellite}} - <div id="use-redhat"> - <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}} - <i class="icon-question-sign" rel="use-redhat-tooltip" - data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}></i></label> - </div> - {{/if}} + <div id="use-redhat"> + <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}} + <i class="icon-question-sign" rel="use-redhat-tooltip" + data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}></i></label> + </div> {{#if view.invalidFormatUrlExist}} <div class="alert">{{t installer.step1.attentionNeeded}}</div> {{/if}}
