Repository: ambari Updated Branches: refs/heads/trunk b32f64c5d -> 5d17bfab7
AMBARI-15949 Tweaks to Alerts hyperlink display (zhewang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d17bfab Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d17bfab Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d17bfab Branch: refs/heads/trunk Commit: 5d17bfab711dd6eb4a9f23a60222a9522d91b137 Parents: b32f64c Author: Zhe (Joe) Wang <[email protected]> Authored: Tue Apr 19 09:40:40 2016 -0700 Committer: Zhe (Joe) Wang <[email protected]> Committed: Tue Apr 19 09:40:40 2016 -0700 ---------------------------------------------------------------------- ambari-web/app/messages.js | 2 ++ ambari-web/app/templates/main/alerts/configs.hbs | 6 ------ ambari-web/app/templates/main/alerts/definition_details.hbs | 6 ++++++ 3 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5d17bfab/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 8d73bb3..6c0049d 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -325,6 +325,7 @@ Em.I18n.translations = { 'common.extension': 'Extension', 'common.logs': 'Logs', 'common.warn.message': '<div class="alert alert-warn">{0}</div>', + 'common.link': 'Link', 'models.alert_instance.tiggered.verbose': "Occurred on {0} <br> Checked on {1}", 'models.alert_definition.triggered.verbose': "Occurred on {0}", @@ -1028,6 +1029,7 @@ Em.I18n.translations = { 'alerts.table.header.notification': 'Notification', 'alerts.table.header.repeatTolerance': 'Check Count', 'alerts.table.header.default': '(default)', + 'alerts.table.header.helpUrl': 'Alert Context', 'alerts.table.state': 'State', 'alerts.table.state.enabled': 'Enabled', 'alerts.table.state.disabled': 'Disabled', http://git-wip-us.apache.org/repos/asf/ambari/blob/5d17bfab/ambari-web/app/templates/main/alerts/configs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/configs.hbs b/ambari-web/app/templates/main/alerts/configs.hbs index 4259be8..5cc9a25 100644 --- a/ambari-web/app/templates/main/alerts/configs.hbs +++ b/ambari-web/app/templates/main/alerts/configs.hbs @@ -16,12 +16,6 @@ * limitations under the License. }} <form class="form-horizontal alert-configs"> - {{#if controller.content.hasHelpUrl}} - <div class="control-group"> - <label for="" class="control-label"><a {{bindAttr href="controller.content.helpUrl"}} target="_blank">{{t common.details}}</a></label> - <div class="controls"></div> - </div> - {{/if}} {{#each property in controller.configs}} {{#unless property.hidden}} <div {{bindAttr class=":control-group property.name property.isValid::error"}}> http://git-wip-us.apache.org/repos/asf/ambari/blob/5d17bfab/ambari-web/app/templates/main/alerts/definition_details.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/definition_details.hbs b/ambari-web/app/templates/main/alerts/definition_details.hbs index 15cf168..cda1193 100644 --- a/ambari-web/app/templates/main/alerts/definition_details.hbs +++ b/ambari-web/app/templates/main/alerts/definition_details.hbs @@ -180,6 +180,12 @@ </div> </div> {{/unless}} + {{#if controller.content.hasHelpUrl}} + <div class="row-fluid"> + <div class="span6 property-name">{{t alerts.table.header.helpUrl}}:</div> + <div class="span6"><label for=""><a {{bindAttr href="controller.content.helpUrl"}} target="_blank">{{t common.link}}</a></label></div> + </div> + {{/if}} </div> </div> </div>
