Author: yusaku
Date: Thu Jan 31 00:55:31 2013
New Revision: 1440774
URL: http://svn.apache.org/viewvc?rev=1440774&view=rev
Log:
AMBARI-1309. Remove all text from Apps views, controllers, templates to
messages.js. (Arun Kandregula via yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/messages.js
incubator/ambari/trunk/ambari-web/app/templates/main/apps.hbs
incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1440774&r1=1440773&r2=1440774&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Jan 31 00:55:31 2013
@@ -35,6 +35,9 @@ Trunk (unreleased changes):
accessible for demo/test purposes. (mahadev)
IMPROVEMENTS
+
+ AMBARI-1309. Remove all text from Apps views, controllers, templates to
+ messages.js. (Arun Kandregula via yusaku)
AMBARI-1308. Properly display Apps page aggregate summary and data table when
there are no data to be show. (Arun Kandregula via yusaku)
Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1440774&r1=1440773&r2=1440774&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Thu Jan 31 00:55:31 2013
@@ -416,7 +416,22 @@ Em.I18n.translations = {
'timeRange.presets.1month':'1mo',
'timeRange.presets.1year':'1yr',
+ 'apps.avgTable.avg': 'Avg',
+ 'apps.avgTable.min': 'Min',
+ 'apps.avgTable.max': 'Max',
+ 'apps.avgTable.jobs': 'Jobs',
+ 'apps.avgTable.input': 'Input',
+ 'apps.avgTable.output': 'Output',
+ 'apps.avgTable.duration': 'Duration',
+ 'apps.avgTable.oldest': 'Oldest',
+ 'apps.avgTable.mostRecent': 'Most Recent',
+ 'apps.filters.all': 'All',
+ 'apps.filters.filtered': 'Filtered',
+ 'apps.filters.clearFilters': 'Clear filters',
+ 'apps.filters.show': 'Show',
+ 'apps.filters.paginationInfo': '{0} - {1} of {2}',
'apps.filters.customRunDate':'Run Date custom filter',
+ 'apps.filters.nothingToShow': 'No jobs to display',
'apps.dagCharts.popup':'Job Charts',
'apps.dagCharts.popup.job': 'Job',
'apps.dagCharts.popup.dag':'DAG',
Modified: incubator/ambari/trunk/ambari-web/app/templates/main/apps.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/apps.hbs?rev=1440774&r1=1440773&r2=1440774&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/apps.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/apps.hbs Thu Jan 31
00:55:31 2013
@@ -21,15 +21,15 @@
<tbody>
<tr>
<td></td>
- <td>Jobs</td>
- <td>Input</td>
- <td>Output</td>
- <td>Duration</td>
- <td>Oldest</td>
- <td>Most Recent</td>
+ <td>{{t apps.avgTable.jobs}}</td>
+ <td>{{t apps.avgTable.input}}</td>
+ <td>{{t apps.avgTable.output}}</td>
+ <td>{{t apps.avgTable.duration}}</td>
+ <td>{{t apps.avgTable.oldest}}</td>
+ <td>{{t apps.avgTable.mostRecent}}</td>
</tr>
<tr class="avg-info">
- <td>Avg</td>
+ <td>{{t apps.avgTable.avg}}</td>
<td>{{summary.jobs.avg}}</td>
<td>{{summary.input.avg}}</td>
<td>{{summary.output.avg}}</td>
@@ -39,7 +39,7 @@
</tr>
<tr class="compare-info">
- <td>Min / Max</td>
+ <td>{{t apps.avgTable.min}} / {{t apps.avgTable.max}}</td>
<td>{{summary.jobs.min}} / {{summary.jobs.max}}</td>
<td>{{summary.input.min}} / {{summary.input.max}}</td>
<td>{{summary.output.min}} / {{summary.output.max}}</td>
@@ -52,14 +52,14 @@
<div class="filter_info">
- <div class="span4" id="filter_buttons">Show:
- <a class="all selected" {{action "clickViewType" target="view"}}
data-view-type="all">All
+ <div class="span4" id="filter_buttons">{{t apps.filters.show}}:
+ <a class="all selected" {{action "clickViewType" target="view"}}
data-view-type="all">{{t apps.filters.all}}
({{controller.paginationObject.iTotalRecords}})</a> |
- <a class="filtered" {{action "clickViewType" target="view"}}
data-view-type="filtered">Filtered
+ <a class="filtered" {{action "clickViewType" target="view"}}
data-view-type="filtered">{{t apps.filters.filtered}}
({{controller.filterObject.filteredDisplayRecords}})</a>
</div>
<div class="span2 clear_filter">
- <a {{action "clearFilters" target="view"}}>Clear filters</a>
+ <a {{action "clearFilters" target="view"}}>{{t
apps.filters.clearFilters}}</a>
</div>
<div class="search-bar">
{{view view.appSearchThrough
valueBinding="controller.filterObject.sSearch"}}
@@ -90,7 +90,7 @@
<tbody>
{{#if view.emptyData}}
<tr>
- <td class="no-data" colspan="9">No jobs to display</td>
+ <td class="no-data" colspan="9">{{t
apps.filters.nothingToShow}}</td>
</tr>
{{else}}
{{#each run in content}}
@@ -102,9 +102,9 @@
<div class="page-bar">
<div class="items-on-page">
- <label>Show: {{view view.runPerPageSelectView
viewName="runPerPageSelectView"
selectionBinding="controller.filterObject.iDisplayLength"}}</label>
+ <label>{{t apps.filters.show}}: {{view view.runPerPageSelectView
viewName="runPerPageSelectView"
selectionBinding="controller.filterObject.iDisplayLength"}}</label>
</div>
- <div class="info">{{controller.paginationObject.startIndex}} -
{{controller.paginationObject.endIndex}} of
{{controller.paginationObject.iTotalDisplayRecords}}</div>
+ <div class="info">{{view.paginationInfo}}</div>
<div class="paging_two_button">
{{view view.paginationLeft}}
{{view view.paginationRight}}
Modified: incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js?rev=1440774&r1=1440773&r2=1440774&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js Thu Jan 31
00:55:31 2013
@@ -21,7 +21,9 @@ var filters = require('views/common/filt
App.MainAppsView = Em.View.extend({
templateName: require('templates/main/apps'),
-
+ paginationInfo: function() {
+ return
this.t('apps.filters.paginationInfo').format(this.get('controller.paginationObject.startIndex'),
this.get('controller.paginationObject.endIndex'),
this.get('controller.paginationObject.iTotalDisplayRecords'));
+ }.property('controller.paginationObject.startIndex',
'controller.paginationObject.endIndex',
'controller.paginationObject.iTotalDisplayRecords'),
//Pagination left/right buttons css class
paginationLeft: Ember.View.extend({
tagName: 'a',
