Author: yusaku
Date: Fri Jun 14 02:43:17 2013
New Revision: 1492932
URL: http://svn.apache.org/r1492932
Log:
AMBARI-2372. Show installed stack and its services. (yusaku)
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/admin/cluster.hbs
incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/admin.js
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/admin/cluster.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/admin/cluster.hbs?rev=1492932&r1=1492931&r2=1492932&view=diff
==============================================================================
---
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/admin/cluster.hbs
(original)
+++
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/admin/cluster.hbs
Fri Jun 14 02:43:17 2013
@@ -19,11 +19,13 @@
<div class="admin-cluster">
<div class="header">
<strong>{{t admin.cluster.stackVersion}}: {{App.currentStackVersion}}
+ {{#if App.supports.stackUpgrade}}
(<a href="true" {{bindAttr
class="view.isUpgradeAvailable::inactive"}}{{action "upgradeStack"}}>
{{#if view.isUpgradeAvailable}}{{t
admin.cluster.upgradeAvailable}}: {{upgradeVersion}}
{{else}} {{t admin.cluster.upgradeUnavailable}}
{{/if}}
</a>)
+ {{/if}}
</strong>
</div>
<table class="table table-bordered table-striped">
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/admin.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/admin.js?rev=1492932&r1=1492931&r2=1492932&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/admin.js
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/admin.js
Fri Jun 14 02:43:17 2013
@@ -33,14 +33,12 @@ App.MainAdminView = Em.View.extend({
url: 'adminSecurity.index',
label: Em.I18n.t('common.security')
});
- }
- if (App.supports.stackUpgrade) {
- items.push({
- name: 'cluster',
- url: 'adminCluster',
- label: Em.I18n.t('common.cluster')
- });
- }
+ };
+ items.push({
+ name: 'cluster',
+ url: 'adminCluster',
+ label: Em.I18n.t('common.cluster')
+ });
items.push({
name: 'misc',
url: 'adminMisc',
