Author: yusaku
Date: Thu Jan 31 00:19:09 2013
New Revision: 1440744
URL: http://svn.apache.org/viewvc?rev=1440744&view=rev
Log:
AMBARI-1302. MBARI-1302. Minor label cleanup on Jobs Charts popup. (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/item/bar.hbs
incubator/ambari/trunk/ambari-web/app/views/main/apps/item_view.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1440744&r1=1440743&r2=1440744&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Jan 31 00:19:09 2013
@@ -36,6 +36,9 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-1302. Minor label cleanup on Jobs Charts popup. (Arun Kandregula via
+ yusaku)
+
AMBARI-1296. Task log popup footer should be statically placed only the
content should scroll vertically. (Jaimin Jetly 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=1440744&r1=1440743&r2=1440744&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Thu Jan 31 00:19:09 2013
@@ -417,7 +417,12 @@ Em.I18n.translations = {
'timeRange.presets.1year':'1yr',
'apps.filters.customRunDate':'Run Date custom filter',
- 'apps.dagCharts.popup':'DAG/Charts',
+ 'apps.dagCharts.popup':'Job Charts',
+ 'apps.dagCharts.popup.job': 'Job',
+ 'apps.dagCharts.popup.dag':'DAG',
+ 'apps.dagCharts.popup.tasks':'Timeline & Tasks',
+ 'apps.dagCharts.popup.tasks.timeline':'Job Timeline',
+ 'apps.dagCharts.popup.tasks.tasks':'Job Tasks',
'apps.isRunning.popup.title':'Is running',
'apps.isRunning.popup.content':'Job is running now',
Modified: incubator/ambari/trunk/ambari-web/app/templates/main/apps/item/bar.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/apps/item/bar.hbs?rev=1440744&r1=1440743&r2=1440744&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/apps/item/bar.hbs
(original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/apps/item/bar.hbs Thu
Jan 31 00:19:09 2013
@@ -18,12 +18,12 @@
<div class="btn-group">
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
- Job {{view.activeJob.id}} - {{view.activeJob.run.id}}
+ {{t apps.dagCharts.popup.job}} {{view.activeJob.id}} -
{{view.activeJob.run.id}}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{{#each job in view.content}}
- <li><a {{action "selectJob" job target="view"}}
href="javascript:void(null)">Job {{job.id}} - {{job.run.id}}</a></li>
+ <li><a {{action "selectJob" job target="view"}}
href="javascript:void(null)">{{t apps.dagCharts.popup.job}} {{job.id}} -
{{job.run.id}}</a></li>
{{/each}}
</ul>
</div>
@@ -31,7 +31,7 @@
<div id="graph1" class="pull-left">
<div class="pull-left">
<div id="graph1_desc" class="graph_desc">
- <h4>Job Timeline</h4>
+ <h4>{{t apps.dagCharts.popup.tasks.timeline}}</h4>
</div>
<div id="y-axis"></div>
<div id="chart"></div>
@@ -44,7 +44,7 @@
<div id="graph2" class="pull-right">
<div class="pull-left">
<div id="graph2_desc" class="graph_desc">
- <h4>Job Tasks' View</h4>
+ <h4>{{t apps.dagCharts.popup.tasks.tasks}}</h4>
</div>
<div id="y-axis2"></div>
<div id="job_tasks"></div>
Modified: incubator/ambari/trunk/ambari-web/app/views/main/apps/item_view.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/apps/item_view.js?rev=1440744&r1=1440743&r2=1440744&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/apps/item_view.js
(original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/apps/item_view.js Thu Jan
31 00:19:09 2013
@@ -24,12 +24,12 @@ App.MainAppsItemView = Em.View.extend({
templateName:require('templates/main/apps/item'),
menuTabs:[
Em.Object.create({
- label:'DAG',
+ label:Em.I18n.t('apps.dagCharts.popup.dag'),
active:'active',
content:'App.MainAppsItemDagView'
}),
Em.Object.create({
- label:'Charts',
+ label:Em.I18n.t('apps.dagCharts.popup.tasks'),
active:'',
content:'App.MainAppsItemBarView'
})
