Updated Branches: refs/heads/trunk d1804acc8 -> 938810b4f
AMBARI-3861. Modify hover text information for restart indicator (Denys Buzhor via alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/938810b4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/938810b4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/938810b4 Branch: refs/heads/trunk Commit: 938810b4fc792f34e7edbc6c8dff1c2276cae604 Parents: d1804ac Author: Alex Antonenko <[email protected]> Authored: Mon Nov 25 17:58:16 2013 +0200 Committer: Alex Antonenko <[email protected]> Committed: Mon Nov 25 17:58:16 2013 +0200 ---------------------------------------------------------------------- .../app/templates/main/service/menu_item.hbs | 2 +- .../templates/main/service/new_config_group.hbs | 6 +++--- ambari-web/app/views/main/service/menu.js | 17 ++++++++++++++++- 3 files changed, 20 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/938810b4/ambari-web/app/templates/main/service/menu_item.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/menu_item.hbs b/ambari-web/app/templates/main/service/menu_item.hbs index 9f8c369..e3ef2cf 100644 --- a/ambari-web/app/templates/main/service/menu_item.hbs +++ b/ambari-web/app/templates/main/service/menu_item.hbs @@ -26,7 +26,7 @@ {{/if}} {{#if App.supports.hostOverrides}} {{#if view.content.isRestartRequired}} - <i class="icon-refresh restart-required-service" rel="tooltip" title="{{unbound view.content.restartRequiredMessage}}"></i> + <i class="icon-refresh restart-required-service" rel="tooltip" title="{{unbound view.restartRequiredMessage}}"></i> {{/if}} {{/if}} </a> http://git-wip-us.apache.org/repos/asf/ambari/blob/938810b4/ambari-web/app/templates/main/service/new_config_group.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/new_config_group.hbs b/ambari-web/app/templates/main/service/new_config_group.hbs index 27dde0a..5f4acb3 100644 --- a/ambari-web/app/templates/main/service/new_config_group.hbs +++ b/ambari-web/app/templates/main/service/new_config_group.hbs @@ -31,9 +31,9 @@ </tr> <tr> <td>{{t services.service.config_groups_popup.group_desc_lable }}:</td> - <td class="textarea-full-width"> - {{view Ember.TextArea valueBinding="configGroupDesc" rows="4"}} + <td class="row-fluid"> + {{view Ember.TextArea classNames="span12" valueBinding="configGroupDesc" rows="4"}} </td> </tr> </table> -</div> \ No newline at end of file +</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/938810b4/ambari-web/app/views/main/service/menu.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/menu.js b/ambari-web/app/views/main/service/menu.js index ab89d68..f090266 100644 --- a/ambari-web/app/views/main/service/menu.js +++ b/ambari-web/app/views/main/service/menu.js @@ -74,7 +74,22 @@ App.MainServiceMenuView = Em.CollectionView.extend({ } return 0; }.property('App.router.clusterController.alerts'), + + restartRequiredMessage: function() { + var restarted, componentsCount, hostsCount, message; + restarted = this.get('content.restartRequiredHostsAndComponents'); + componentsCount = 0; + hostsCount = 0; + message = ""; + for (var host in restarted) { + hostsCount++; + componentsCount += restarted[host].length; + } + message += componentsCount + ' ' + Em.I18n.t('common.components') + ' ' + Em.I18n.t('on') + ' ' + + hostsCount + ' ' + Em.I18n.t('common.hosts') + ' ' + Em.I18n.t('services.service.config.restartService.needToRestartEnd'); + return message; + }.property('content.isRestartRequired'), templateName:require('templates/main/service/menu_item') }) -}); \ No newline at end of file +});
