Repository: ambari Updated Branches: refs/heads/trunk dd57e60af -> 3f5f8878c
AMBARI-5049 Add Falcon clients link to Falcon Service summary page. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3f5f8878 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3f5f8878 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3f5f8878 Branch: refs/heads/trunk Commit: 3f5f8878c1e96ecaa8315ad14f3694478ca67206 Parents: dd57e60 Author: aBabiichuk <[email protected]> Authored: Wed Mar 12 14:22:10 2014 +0200 Committer: aBabiichuk <[email protected]> Committed: Wed Mar 12 14:22:10 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/messages.js | 3 +++ ambari-web/app/templates/main/dashboard/service/yarn.hbs | 4 ++-- .../app/templates/main/service/info/summary/falcon.hbs | 7 +++++++ ambari-web/app/templates/main/service/info/summary/hive.hbs | 8 ++++---- .../app/templates/main/service/info/summary/mapreduce2.hbs | 8 ++++---- ambari-web/app/templates/main/service/info/summary/oozie.hbs | 8 ++++---- ambari-web/app/templates/main/service/info/summary/pig.hbs | 2 +- ambari-web/app/templates/main/service/info/summary/sqoop.hbs | 2 +- ambari-web/app/templates/main/service/info/summary/tez.hbs | 2 +- .../app/templates/main/service/info/summary/zookeeper.hbs | 4 ++-- ambari-web/app/views/main/service/info/summary.js | 2 +- 11 files changed, 30 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3f5f8878/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index fc60607..e153adf 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1332,6 +1332,9 @@ Em.I18n.translations = { 'services.hive.client': 'Hive Client', 'services.hive.clients': 'Hive Clients', + 'services.falcon.client': 'Falcon Client', + 'services.falcon.clients': 'Falcon Clients', + 'services.oozie.client': 'Oozie Client', 'services.oozie.clients': 'Oozie Clients', 'services.oozie.webUi': 'Oozie Web UI', http://git-wip-us.apache.org/repos/asf/ambari/blob/3f5f8878/ambari-web/app/templates/main/dashboard/service/yarn.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/service/yarn.hbs b/ambari-web/app/templates/main/dashboard/service/yarn.hbs index 3959ccf..d675f62 100644 --- a/ambari-web/app/templates/main/dashboard/service/yarn.hbs +++ b/ambari-web/app/templates/main/dashboard/service/yarn.hbs @@ -57,10 +57,10 @@ </tr> <!-- YARN Clients --> <tr> - <td class="summary-label"><a {{action filterHosts view.yarnClientComponent}} href="javascript:void(null)">{{t dashboard.services.yarn.clients}}</a></td> + <td class="summary-label"><a {{action filterHosts view.yarnClientComponent}} href="javascript:void(null)">{{pluralize view.service.yarnClientNodes.length singular="t:dashboard.services.yarn.client" plural="t:dashboard.services.yarn.clients"}}</a></td> <td> <span class="green-live">{{view.service.yarnClientNodes.length}} </span> - {{t dashboard.services.yarn.client}}{{#if view.hasManyYarnClients}}s{{/if}} {{t common.installed}} + {{pluralize view.service.yarnClientNodes.length singular="t:dashboard.services.yarn.client" plural="t:dashboard.services.yarn.clients"}} {{t common.installed}} </td> </tr> <!-- ResourceManager Uptime --> http://git-wip-us.apache.org/repos/asf/ambari/blob/3f5f8878/ambari-web/app/templates/main/service/info/summary/falcon.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/summary/falcon.hbs b/ambari-web/app/templates/main/service/info/summary/falcon.hbs index ff62e54..eb79ead 100644 --- a/ambari-web/app/templates/main/service/info/summary/falcon.hbs +++ b/ambari-web/app/templates/main/service/info/summary/falcon.hbs @@ -17,3 +17,10 @@ }} {{!<!-- @todo create correct view after api implementing-->}} {{view view.sumMasterComponentView}} + +<tr> + <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{pluralize view.clients.length singular="t:services.falcon.client" plural="t:services.falcon.clients"}}</a></td> + <td> + <span class="green-live">{{view.clients.length}} </span>{{pluralize view.clients.length singular="t:services.falcon.client" plural="t:services.falcon.clients"}} {{t common.installed}} + </td> +</tr> http://git-wip-us.apache.org/repos/asf/ambari/blob/3f5f8878/ambari-web/app/templates/main/service/info/summary/hive.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/summary/hive.hbs b/ambari-web/app/templates/main/service/info/summary/hive.hbs index aa36742..749e77c 100644 --- a/ambari-web/app/templates/main/service/info/summary/hive.hbs +++ b/ambari-web/app/templates/main/service/info/summary/hive.hbs @@ -19,8 +19,8 @@ {{view view.sumMasterComponentView}} <tr> - <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{t services.hive.clients}}</a></td> - <td> - <span class="green-live">{{view.clients.length}} </span>{{t services.hive.client}}{{#if view.hasManyClients}}s{{/if}} {{t common.installed}} - </td> + <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{pluralize view.clients.length singular="t:services.hive.client" plural="t:services.hive.clients"}}</a></td> + <td> + <span class="green-live">{{view.clients.length}} </span>{{pluralize view.clients.length singular="t:services.hive.client" plural="t:services.hive.clients"}} {{t common.installed}} + </td> </tr> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/3f5f8878/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs b/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs index 0802073..6a03c2e 100644 --- a/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs +++ b/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs @@ -18,8 +18,8 @@ {{view view.sumMasterComponentView}} <tr> - <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{t services.service.summary.mapreduce2.clients}}</a></td> - <td> - <span class="green-live">{{view.clients.length}} </span>{{t services.service.summary.mapreduce2.client}}{{#if view.hasManyClients}}s{{/if}} {{t common.installed}} - </td> + <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{pluralize view.clients.length singular="t:services.service.summary.mapreduce2.client" plural="t:services.service.summary.mapreduce2.clients"}}</a></td> + <td> + <span class="green-live">{{view.clients.length}} </span>{{pluralize view.clients.length singular="t:services.service.summary.mapreduce2.client" plural="t:services.service.summary.mapreduce2.clients"}} {{t common.installed}} + </td> </tr> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/3f5f8878/ambari-web/app/templates/main/service/info/summary/oozie.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/summary/oozie.hbs b/ambari-web/app/templates/main/service/info/summary/oozie.hbs index ccd710c..a59b158 100644 --- a/ambari-web/app/templates/main/service/info/summary/oozie.hbs +++ b/ambari-web/app/templates/main/service/info/summary/oozie.hbs @@ -20,9 +20,9 @@ {{view view.sumMasterComponentView}} <tr> - <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{t services.oozie.clients}}</a></td> - <td> - <span class="green-live">{{view.clients.length}} </span>{{t services.oozie.client}}{{#if view.hasManyClients}}s{{/if}} {{t common.installed}} - </td> + <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{pluralize view.clients.length singular="t:services.oozie.client" plural="t:services.oozie.clients"}}</a></td> + <td> + <span class="green-live">{{view.clients.length}} </span>{{pluralize view.clients.length singular="t:services.oozie.client" plural="t:services.oozie.clients"}} {{t common.installed}} + </td> </tr> http://git-wip-us.apache.org/repos/asf/ambari/blob/3f5f8878/ambari-web/app/templates/main/service/info/summary/pig.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/summary/pig.hbs b/ambari-web/app/templates/main/service/info/summary/pig.hbs index 769865a..692f79d 100644 --- a/ambari-web/app/templates/main/service/info/summary/pig.hbs +++ b/ambari-web/app/templates/main/service/info/summary/pig.hbs @@ -16,7 +16,7 @@ * limitations under the License. }} <tr> - <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{t services.pig.client}}</a></td> + <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{pluralize view.clients.length singular="t:services.pig.client" plural="t:services.pig.clients"}}</a></td> <td> <span class="green-live">{{view.clients.length}} </span>{{pluralize view.clients.length singular="t:services.pig.client" plural="t:services.pig.clients"}} {{t common.installed}} </td> http://git-wip-us.apache.org/repos/asf/ambari/blob/3f5f8878/ambari-web/app/templates/main/service/info/summary/sqoop.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/summary/sqoop.hbs b/ambari-web/app/templates/main/service/info/summary/sqoop.hbs index 31eead6..3a2cec9 100644 --- a/ambari-web/app/templates/main/service/info/summary/sqoop.hbs +++ b/ambari-web/app/templates/main/service/info/summary/sqoop.hbs @@ -16,7 +16,7 @@ * limitations under the License. }} <tr> - <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{t services.sqoop.client}}</a></td> + <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{pluralize view.clients.length singular="t:services.sqoop.client" plural="t:services.sqoop.clients"}}</a></td> <td> <span class="green-live">{{view.clients.length}} </span>{{pluralize view.clients.length singular="t:services.sqoop.client" plural="t:services.sqoop.clients"}} {{t common.installed}} </td> http://git-wip-us.apache.org/repos/asf/ambari/blob/3f5f8878/ambari-web/app/templates/main/service/info/summary/tez.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/summary/tez.hbs b/ambari-web/app/templates/main/service/info/summary/tez.hbs index f139d64..aa68642 100644 --- a/ambari-web/app/templates/main/service/info/summary/tez.hbs +++ b/ambari-web/app/templates/main/service/info/summary/tez.hbs @@ -16,7 +16,7 @@ * limitations under the License. }} <tr> - <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{t services.tez.client}}</a></td> + <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{pluralize view.clients.length singular="t:services.tez.client" plural="t:services.tez.clients"}}</a></td> <td> <span class="green-live">{{view.clients.length}} </span>{{pluralize view.clients.length singular="t:services.tez.client" plural="t:services.tez.clients"}} {{t common.installed}} </td> http://git-wip-us.apache.org/repos/asf/ambari/blob/3f5f8878/ambari-web/app/templates/main/service/info/summary/zookeeper.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/summary/zookeeper.hbs b/ambari-web/app/templates/main/service/info/summary/zookeeper.hbs index cf3481a..f9071f0 100644 --- a/ambari-web/app/templates/main/service/info/summary/zookeeper.hbs +++ b/ambari-web/app/templates/main/service/info/summary/zookeeper.hbs @@ -20,8 +20,8 @@ {{view view.sumMasterComponentView}} <tr> - <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{t services.zookeeper.client}}</a></td> + <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{pluralize view.clients.length singular="t:services.zookeeper.client" plural="t:services.zookeeper.clients"}}</a></td> <td> - <span class="green-live">{{view.clients.length}} </span>{{t services.zookeeper.client}}{{#if view.hasManyClients}}s{{/if}} {{t common.installed}} + <span class="green-live">{{view.clients.length}} </span>{{pluralize view.clients.length singular="t:services.zookeeper.client" plural="t:services.zookeeper.clients"}} {{t common.installed}} </td> </tr> http://git-wip-us.apache.org/repos/asf/ambari/blob/3f5f8878/ambari-web/app/views/main/service/info/summary.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/info/summary.js b/ambari-web/app/views/main/service/info/summary.js index 47212a1..ba4acb0 100644 --- a/ambari-web/app/views/main/service/info/summary.js +++ b/ambari-web/app/views/main/service/info/summary.js @@ -54,7 +54,7 @@ App.MainServiceInfoSummaryView = Em.View.extend({ sqoop: false }, - servicesHaveClients: ["OOZIE", "ZOOKEEPER", "HIVE", "MAPREDUCE2", "TEZ", "SQOOP", "PIG"], + servicesHaveClients: ["OOZIE", "ZOOKEEPER", "HIVE", "MAPREDUCE2", "TEZ", "SQOOP", "PIG","FALCON"], sumMasterComponentView : Em.View.extend({ didInsertElement: function() {
