Repository: ambari Updated Branches: refs/heads/trunk 1672cc9d5 -> 7038957df
AMBARI-17008 Log Search: CSS edits.(atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7038957d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7038957d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7038957d Branch: refs/heads/trunk Commit: 7038957df73bcc239ad156a3041a009826bd9900 Parents: 1672cc9 Author: Andrii Tkach <[email protected]> Authored: Thu Jun 2 18:05:38 2016 +0300 Committer: Andrii Tkach <[email protected]> Committed: Fri Jun 3 11:22:37 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/messages.js | 1 + ambari-web/app/templates/common/host_progress_popup.hbs | 4 ++-- ambari-web/app/templates/main/host/logs.hbs | 2 +- ambari-web/app/views/main/host/logs_view.js | 6 ++++++ 4 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7038957d/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 8426a56..e8ca9ae 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -2850,6 +2850,7 @@ Em.I18n.translations = { 'tableView.filters.showAll': 'Show All', 'tableView.filters.filteredConfigVersionInfo': '{0} of {1} versions showing', 'tableView.filters.filteredAlertInstancesInfo': '{0} of {1} instances showing', + 'tableView.filters.filteredLogsInfo': '{0} of {1} logs showing', 'rollingrestart.dialog.title': 'Restart {0}s', 'rollingrestart.dialog.primary': 'Trigger Rolling Restart', http://git-wip-us.apache.org/repos/asf/ambari/blob/7038957d/ambari-web/app/templates/common/host_progress_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs b/ambari-web/app/templates/common/host_progress_popup.hbs index 223d202..8658955 100644 --- a/ambari-web/app/templates/common/host_progress_popup.hbs +++ b/ambari-web/app/templates/common/host_progress_popup.hbs @@ -249,9 +249,9 @@ </div> <hr> {{/if}} - <p class="text-bold">{{t common.stderr}}: <span class="muted">{{view.openedTask.errorLog}} </span></p> + <p>{{t common.stderr}}: <span class="muted">{{view.openedTask.errorLog}} </span></p> <pre class="stderr">{{view.openedTask.stderr}}</pre> - <p class="text-bold">{{t common.stdout}}: <span class="muted"> {{view.openedTask.outputLog}} </span></p> + <p>{{t common.stdout}}: <span class="muted"> {{view.openedTask.outputLog}} </span></p> <pre class="stdout">{{view.openedTask.stdout}}</pre> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/7038957d/ambari-web/app/templates/main/host/logs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/logs.hbs b/ambari-web/app/templates/main/host/logs.hbs index c553081..571c528 100644 --- a/ambari-web/app/templates/main/host/logs.hbs +++ b/ambari-web/app/templates/main/host/logs.hbs @@ -33,7 +33,7 @@ {{#if view.pageContent}} {{#each row in view.pageContent}} {{#view view.logFileRowView contentBinding="row"}} - <td>{{row.serviceDisplayName}}</td> + <td class="first">{{row.serviceDisplayName}}</td> <td>{{row.componentDisplayName}}</td> <td> {{#each file in row.fileNamesObject}} http://git-wip-us.apache.org/repos/asf/ambari/blob/7038957d/ambari-web/app/views/main/host/logs_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/host/logs_view.js b/ambari-web/app/views/main/host/logs_view.js index 239edc7..4e634e7 100644 --- a/ambari-web/app/views/main/host/logs_view.js +++ b/ambari-web/app/views/main/host/logs_view.js @@ -29,6 +29,12 @@ App.MainHostLogsView = App.TableView.extend({ classNames: ['logs-tab-content'], /** + * Filtered number of all content number information displayed on the page footer bar + * @returns {String} + */ + filteredContentInfo: Em.computed.i18nFormat('tableView.filters.filteredLogsInfo', 'filteredCount', 'totalCount'), + + /** * @type {Ember.Object} */ host: Em.computed.alias('App.router.mainHostDetailsController.content'),
