Repository: ambari Updated Branches: refs/heads/branch-1.6.0.slider 9647152dc -> 10e387f4b
AMBARI-5972. Slider apps view should show warning messages for view issues (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/10e387f4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10e387f4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10e387f4 Branch: refs/heads/branch-1.6.0.slider Commit: 10e387f4b81c34720838c4bb4a7b0fc1a9a5316c Parents: 9647152 Author: Alex Antonenko <[email protected]> Authored: Fri May 30 20:00:33 2014 +0300 Committer: Alex Antonenko <[email protected]> Committed: Fri May 30 20:00:33 2014 +0300 ---------------------------------------------------------------------- .../src/main/resources/ui/app/templates/application.hbs | 8 ++++---- .../src/main/resources/ui/app/templates/slider_apps.hbs | 8 ++++---- .../views/slider/src/main/resources/ui/app/translations.js | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/10e387f4/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs index 581f9b4..b1c560a 100755 --- a/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs +++ b/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs @@ -19,10 +19,10 @@ <div> <h2>{{t slider.apps.title}}</h2> </div> -{{#if App.viewEnabled}} - {{outlet}} -{{else}} +<div class="alert alert-danger"> {{#each error in App.viewErrors}} <h3>{{error}}</h3> {{/each}} -{{/if}} +</div> +{{outlet}} + http://git-wip-us.apache.org/repos/asf/ambari/blob/10e387f4/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs index 0a81379..31ebd2d 100644 --- a/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs +++ b/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs @@ -21,24 +21,24 @@ <div class="pull-right create-app"> <div class="btn-toolbar"> <div class="btn-group"> - <a href="#" class="btn btn-primary" {{action createApp}}> + <a href="#" {{bind-attr class="App.viewEnabled::disabled :btn-primary :btn"}} {{action createApp}}> <i class="icon-plus"></i><span> {{t slider.apps.create}}</span> </a> </div> <div class="btn-group"> - <button class="btn dropdown-toggle" data-toggle="dropdown" href="#"> + <button {{bind-attr class="App.viewEnabled::disabled :btn :dropdown-toggle"}} data-toggle="dropdown" href="#"> <i class="icon-cog"></i><span> </span> <span class="caret"></span> </button> <ul class="dropdown-menu"> {{#if view.yarnUi}} <li> - <a {{bind-attr href="view.yarnUi"}} target="_blank">YARN UI</a> + <a {{bind-attr href="view.yarnUi"}} target="_blank">{{t yarn.ui}}</a> </li> {{/if}} {{#if view.hdfsUi}} <li> - <a {{bind-attr href="view.hdfsUi"}} href="" target="_blank">HDFS UI</a> + <a {{bind-attr href="view.hdfsUi"}} href="" target="_blank">{{t hdfs.ui}}</a> </li> {{/if}} </ul> http://git-wip-us.apache.org/repos/asf/ambari/blob/10e387f4/contrib/views/slider/src/main/resources/ui/app/translations.js ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/translations.js b/contrib/views/slider/src/main/resources/ui/app/translations.js index 4e09acd..b04db85 100644 --- a/contrib/views/slider/src/main/resources/ui/app/translations.js +++ b/contrib/views/slider/src/main/resources/ui/app/translations.js @@ -50,6 +50,9 @@ Em.I18n.translations = { 'popup.confirmation.commonHeader': 'Confirmation', 'question.sure':'Are you sure?', + 'yarn.ui': 'YARN UI', + 'hdfs.ui': 'HDFS UI', + 'tableView.filters.all': 'All', 'tableView.filters.filtered': 'Filtered', 'tableView.filters.clearFilters': 'Clear filters',
