You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2012/12/09 13:38:09 UTC
svn commit: r1418916 [3/3] - in /incubator/ambari/branches/AMBARI-666: ./
ambari-web/ ambari-web/app/ ambari-web/app/assets/data/hosts/
ambari-web/app/assets/data/racks/ ambari-web/app/controllers/
ambari-web/app/controllers/global/ ambari-web/app/cont...
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/linear_time.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/linear_time.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/linear_time.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/linear_time.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div id="{{unbound view.id}}-container" class="chart-container">
<div id="{{unbound view.id}}-yaxis" class="chart-y-axis"></div>
<div id="{{unbound view.id}}-xaxis" class="chart-x-axis"></div>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="row">
<div class="span6">
@@ -92,8 +92,8 @@
<div class="span11">
<div class="row-fluid">
<div class="span8 title">{{title}}
- {{#if service.serviceName}}
- <a class="serviceLink" href="{{unbound serviceLink}}">{{service.serviceName}}</a>
+ {{#if serviceName}}
+ <a class="serviceLink" href="{{unbound serviceLink}}">{{serviceName}}</a>
{{/if}}
</div>
<div class="span4 date-time">{{dateDisplay}}</div>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hbase.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hbase.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hbase.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hbase.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="clearfix">
<div class="name span2">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hdfs.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hdfs.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hdfs.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hdfs.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="clearfix">
<div class="name span2">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hive.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hive.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hive.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hive.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="clearfix">
<div class="name span2">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<div class="clearfix">
<div class="name span2">
{{view App.MainDashboardServiceHealthView serviceBinding="view.service"}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/oozie.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/oozie.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/oozie.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/oozie.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="clearfix">
<div class="name span2">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="clearfix">
<div class="name span2">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<div id="hosts" class="box">
<div class="box-header">
<div class="button-section">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/add.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/add.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/add.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/add.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div id="add-host">
<div class="container">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/audit.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/audit.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/audit.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/audit.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,6 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<h5>Audit</h5>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/details.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/details.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/details.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/details.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<div id="host-details">
<a href='#' {{action "routeHome" target="controller"}}><i class="icon-home"></i></a> /
<a href="javascript:void(null)" data-toggle="modal" {{action backToHostsList}}>Hosts</a> /
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/metrics.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/metrics.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/metrics.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/metrics.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="host-metrics">
<div class="span4">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/summary.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/summary.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/summary.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host/summary.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<div class="row">
<div class="span5 host-configuration">
<div class="box">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/menu.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/menu.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/menu.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/menu.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<ul class="nav nav-tabs">
{{#each view.items}}
<li {{bindAttr class="active"}} ><a {{action navigate routing }} href="#">{{unbound label}}</a></li>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/menu_item.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/menu_item.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/menu_item.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/menu_item.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<a href="#/main/{{unbound view.content.routing}}">
{{unbound view.content.label}}
{{#if view.alertsCount}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="row-fluid">
<div id="services-menu" class="well span2" style="padding: 8px 0">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/add.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/add.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/add.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/add.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div id="add-service">
<div class="container">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/configs.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/configs.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/configs.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/configs.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<!--<div>-->
<!--<fieldset class="fieldset">-->
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/metrics.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/metrics.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/metrics.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/metrics.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<h5>Metrics</h5>
{{outlet}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/summary.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/summary.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/summary.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/summary.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<div class="row-fluid service-block">
<div class="span6">
{{#if view.service.quickLinks.length}}
@@ -46,7 +47,7 @@
<tr>
{{#if component.isMaster}}
<td class="summary-label">{{component.displayName}}</td>
- <td><a {{action selectHost component.host}} href="javascript:void(null)">{{component.hostComponents}}</a></td>
+ <td><a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.hostName}}</a></td>
{{else}}
<td class="summary-label">{{component.displayName}}s</td>
<td><a {{action filterHosts component}} href="javascript:void(null)">{{component.displayName}}s</a></td>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/item.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/item.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/item.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/item.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
{{view App.MainServiceInfoMenuView}}
<div class="service-button">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/menu_item.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/menu_item.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/menu_item.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/menu_item.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,10 +14,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<a href="#/main/services/{{unbound view.content.id}}/summary">
- {{view App.MainDashboardServiceHealthView serviceBinding="view.content"}} <span>{{unbound view.content.label}}</span>
+ {{view App.MainDashboardServiceHealthView class="service-health" serviceBinding="view.content"}} <span>{{unbound view.content.displayName}}</span>
{{#if view.serviceOperationsCount}}
<span class="label operations-count" {{action "showPopup" target="App.router.backgroundOperationsController"}}>
{{view.serviceOperationsCount}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/test.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/test.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/test.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/test.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
SERVICES
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/master_hosts.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/master_hosts.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/master_hosts.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/master_hosts.hbs Sun Dec 9 12:37:57 2012
@@ -1,3 +1,21 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
+
{{#if view.hasNoHosts}}
No host assigned
{{/if}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/master_hosts_popup.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/master_hosts_popup.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/master_hosts_popup.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/master_hosts_popup.hbs Sun Dec 9 12:37:57 2012
@@ -1,3 +1,21 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
+
<ul>
{{#each host in view.serviceConfig.value}}
<li>{{host}}</li>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/slave_component_hosts.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/slave_component_hosts.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/slave_component_hosts.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/slave_component_hosts.hbs Sun Dec 9 12:37:57 2012
@@ -1,3 +1,21 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
+
{{#if view.hasNoHosts}}
none -
<a href="#" {{action showEditSlaveComponentGroups view.serviceConfig.category target="controller"}}>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/slave_component_hosts_popup.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/slave_component_hosts_popup.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/slave_component_hosts_popup.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/slave_component_hosts_popup.hbs Sun Dec 9 12:37:57 2012
@@ -1,3 +1,21 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
+
<div id="slave-hosts-popup" class="alert alert-info">Select which hosts should belong to which {{selectedComponentName}} group.</div>
<table class="table table-striped">
<thead>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/slave_hosts.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/slave_hosts.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/slave_hosts.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/slave_hosts.hbs Sun Dec 9 12:37:57 2012
@@ -1,3 +1,21 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
+
{{#if view.hasNoHosts}}
No host assigned
{{else}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step1.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step1.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step1.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step1.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<h2>{{t installer.step1.body.header}}</h2>
<p class="alert alert-info">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step10.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step10.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step10.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step10.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<h2>{{t installer.step10.header}}</h2>
<div class="alert alert-info">
@@ -37,11 +37,7 @@
</ul>
{{/each}}
</div>
-
<div class="btn-area">
- <a
- class="btn pull-left" {{bindAttr disabled="isSubmitDisabled"}} {{action back}}>←
- Back</a>
- <a
- class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action complete}}>Complete →</a>
+ <a class="btn pull-left" {{bindAttr disabled="isSubmitDisabled"}} {{action back}}>← Back</a>
+ <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action complete}}>Complete →</a>
</div>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step2.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step2.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step2.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step2.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<div id="installOptions">
<h2>{{t installer.step2.header}}</h2>
@@ -33,9 +34,13 @@
</p>
{{#if view.parentView.controller.hideBackButton}}
- {{#if content.hostNames }}
- <p class="alert alert-info">{{t hosts.add.step2.warning}}</p>
- {{/if}}
+ {{#if content.oldHostNames }}
+ <p class="alert alert-info">
+ {{t hosts.add.step2.warning}}
+ <br/>
+ {{content.oldHostNames}}
+ </p>
+ {{/if}}
{{/if}}
<div class="controls">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step2ManualInstallPopup.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step2ManualInstallPopup.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step2ManualInstallPopup.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step2ManualInstallPopup.hbs Sun Dec 9 12:37:57 2012
@@ -1 +1,19 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
+
<p>{{t installer.step2.manualInstall.popup.body}}</p>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step3.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step3.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step3.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step3.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div id="confirm-hosts">
<h2>{{t installer.step3.header}}</h2>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step3HostLogPopup.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step3HostLogPopup.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step3HostLogPopup.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step3HostLogPopup.hbs Sun Dec 9 12:37:57 2012
@@ -1 +1,19 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
+
<p>{{t installer.step3.hostLog.popup.body}}</p>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step4.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step4.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step4.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step4.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,8 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
-
+}}
<div id="step4">
<h2>{{t installer.step4.header}}</h2>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step5.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step5.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step5.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step5.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<h2>{{t installer.step5.header}}</h2>
<div class="alert alert-info">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step6.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step6.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step6.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step6.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div id="step6">
<h2>{{t installer.step6.header}}</h2>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step7.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step7.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step7.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step7.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div id="serviceConfig">
<h2>{{t installer.step7.header}}</h2>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step8.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step8.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step8.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step8.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<h2>{{t installer.step8.header}}</h2>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step9.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step9.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step9.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step9.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div id="deploy">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs Sun Dec 9 12:37:57 2012
@@ -1,3 +1,21 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
+
<p>Click on the task to see the log:</p>
<div id="host-log">
{{#each role in view.roles}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/data_table.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/data_table.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/data_table.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/data_table.js Sun Dec 9 12:37:57 2012
@@ -44,7 +44,6 @@ jQuery.extend(jQuery.fn.dataTableExt.oSo
* Custom methods for correct bandwidth sorting
*/
"ambari-bandwidth-pre": function (bandwidth_string) {
- debugger;
bandwidth_string = (jQuery(bandwidth_string).text()) ? jQuery(bandwidth_string).text() : bandwidth_string;
var convertedRowValue;
if (bandwidth_string === '<1KB') {
@@ -231,7 +230,6 @@ jQuery.extend($.fn.dataTableExt.afnFilte
}
function bandwidthFilter(rangeExp, rowValue) {
- debugger;
var compareChar = rangeExp.charAt(0);
var compareScale = rangeExp.charAt(rangeExp.length - 1);
var compareValue = isNaN(parseFloat(compareScale)) ? parseFloat(rangeExp.substr(1, rangeExp.length - 2)) : parseFloat(rangeExp.substr(1, rangeExp.length - 1));
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/helper.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/helper.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/helper.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/helper.js Sun Dec 9 12:37:57 2012
@@ -112,7 +112,7 @@ Number.prototype.countPercentageRatio =
App.formatUrl = function (urlTemplate, substitutes, testUrl) {
var formatted = urlTemplate;
if (urlTemplate) {
- if (App.testMode) {
+ if (!App.testMode) {
var toSeconds = Math.round(new Date().getTime() / 1000);
var allSubstitutes = {
toSeconds: toSeconds,
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/apps/item/dag_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/apps/item/dag_view.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/apps/item/dag_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/apps/item/dag_view.js Sun Dec 9 12:37:57 2012
@@ -38,7 +38,7 @@ App.MainAppsItemDagView = Em.View.extend
var result = [];
c.forEach(function(item, index){
result[index] = new Object({
- 'name' : item.get('id'),
+ 'name' : item.get('workflowEntityName'),
'status' : item.get('status') == 'COMPLETE',
'info' : [],
'input' : 2,
@@ -47,7 +47,7 @@ App.MainAppsItemDagView = Em.View.extend
});
return result;
}.property('content'),
- didInsertElement:function (){
+ didInsertElement:function (){;
var innerTable = this.$('#innerTable').dataTable({
"sDom": 'rt<"page-bar"lip><"clear">',
"oLanguage": {
@@ -61,6 +61,7 @@ App.MainAppsItemDagView = Em.View.extend
},
"iDisplayLength": 5,
"aLengthMenu": [[5, 10, 25, 50, -1], [5, 10, 25, 50, "All"]],
+ "aaSorting": [],
"aoColumns":[
null,
null,
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/apps_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/apps_view.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/apps_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/apps_view.js Sun Dec 9 12:37:57 2012
@@ -30,8 +30,10 @@ App.MainAppsView = Em.View.extend({
var content = this.get('controller').get('content');
content.forEach(function(run){
var app = App.store.find(App.App, run.get('appId'));
- run.set('appName', app.get('appName'));
- run.set('type', app.get('type'));
+ /*run.set('appName', app.get('appName'));
+ run.set('type', app.get('type'));*/
+ run.set('appName', 'pig.sh');
+ run.set('type', 'Pig');
});
return content;
}.property('App.router.mainAppsController.content'),
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/dashboard/service.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/dashboard/service.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/dashboard/service.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/dashboard/service.js Sun Dec 9 12:37:57 2012
@@ -27,8 +27,8 @@ App.MainDashboardServiceHealthView = Em.
tagName: 'span',
status: function () {
- return this.get('service.healthStatus');
- }.property('service.healthStatus'),
+ return this.get('service.workStatus');
+ }.property('service.workStatus'),
startBlink: function () {
this.set('blink', true);
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host.js Sun Dec 9 12:37:57 2012
@@ -106,12 +106,11 @@ App.MainHostView = Em.View.extend({
},
HostView:Em.View.extend({
content:null,
- labels:'',
- init:function () {
- this._super();
- var labels = this.get('content.components').getEach('label');
- this.set('labels', labels.join(', '));
- },
+
+ labels: function(){
+ return this.get('content.components').getEach('displayName').join(', ');
+ }.property('content.components.@each'),
+
usageStyle:function () {
return "width:" + this.get('content.diskUsage') + "%";
}.property('content.diskUsage'),
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/summary.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/summary.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/summary.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/summary.js Sun Dec 9 12:37:57 2012
@@ -33,7 +33,7 @@ App.MainHostSummaryView = Em.View.extend
*/
disabledClass:function(){
var workStatus = this.get('content.workStatus');
- if(['STARTING', 'STOPPING'].contains(workStatus) ){
+ if([App.Component.Status.starting, App.Component.Status.stopping].contains(workStatus) ){
return 'disabled';
} else {
return '';
@@ -49,11 +49,11 @@ App.MainHostSummaryView = Em.View.extend
}.property('content.id') ,
indicatorClass: function() {
- return 'health-status-' + this.get('content.workStatus');
+ return 'health-status-' + App.Component.Status.getKeyName(this.get('content.workStatus'));
}.property('content.workStatus'),
componentCheckStatus : function() {
- return (this.get('content.workStatus') === "STARTED" || this.get('content.workStatus') === "STARTING");
+ return (this.get('content.workStatus') === App.Component.Status.started || this.get('content.workStatus') === App.Component.Status.starting);
}.property('content.workStatus'),
/**
@@ -63,7 +63,7 @@ App.MainHostSummaryView = Em.View.extend
var workStatus = this.get('content.workStatus');
var self = this;
- if(['STARTING', 'STOPPING'].contains(workStatus) ){
+ if([App.Component.Status.starting, App.Component.Status.stopping].contains(workStatus) ){
this.$('.components-health').effect("pulsate", null, 1000, function () {
self.doBlinking();
});
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/summary.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/summary.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/summary.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/summary.js Sun Dec 9 12:37:57 2012
@@ -29,9 +29,6 @@ App.MainServiceInfoSummaryView = Em.View
hive: false
},
- controller: function () {
- return App.router.get('mainServiceInfoSummaryController');
- }.property(),
data:{
hive:{
"database" : "PostgreSQL",
@@ -55,25 +52,38 @@ App.MainServiceInfoSummaryView = Em.View
},
href: 'javascript:void(null)'
}),
+
serviceName: function () {
- return App.router.mainServiceInfoSummaryController.get('content.serviceName');
- }.property('App.router.mainServiceInfoSummaryController.content'),
- init: function () {
- this._super();
- if (this.get('serviceName'))
- this.loadServiceSummary(this.get('serviceName'));
- },
+ return this.get('service.serviceName');
+ }.property('service'),
+
+ oldServiceName : '',
+
loadServiceSummary: function (serviceName) {
+
+ var serviceName = this.get('serviceName');
+ if(!serviceName){
+ return;
+ }
+
+ if(this.get('oldServiceName')){
+ // do not delete it!
+ return;
+ }
+
var summaryView = this;
var serviceStatus = summaryView.get('serviceStatus');
$.each(serviceStatus, function (key, value) {
- if (key == serviceName) {
+ if (key.toUpperCase() == serviceName) {
summaryView.set('serviceStatus.' + key, true);
} else {
summaryView.set('serviceStatus.' + key, false);
}
});
+ console.log('load ', serviceName, ' info');
+ this.set('oldServiceName', serviceName);
+ serviceName = serviceName.toLowerCase();
jQuery.getJSON('data/services/summary/' + serviceName + '.json', function (data) {
if (data[serviceName]) {
var summary = data[serviceName];
@@ -121,7 +131,7 @@ App.MainServiceInfoSummaryView = Em.View
summaryView.set('attributes', summary);
}
})
- },
+ }.observes('serviceName'),
didInsertElement: function () {
// We have to make the height of the Alerts section
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/menu.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/menu.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/menu.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/menu.js Sun Dec 9 12:37:57 2012
@@ -23,15 +23,13 @@ App.MainServiceMenuView = Em.CollectionV
return App.router.get('mainServiceController.content');
}.property('App.router.mainServiceController.content'),
- init: function () {
- this._super();
- this.renderOnRoute();
- },
didInsertElement: function () {
App.router.location.addObserver('lastSetURL', this, 'renderOnRoute');
this.renderOnRoute();
},
+ activeServiceId : null,
+
/**
* Syncs navigation menu with requested URL
*/
@@ -43,25 +41,18 @@ App.MainServiceMenuView = Em.CollectionV
var reg = /^\/main\/services\/(\S+)\//g;
var sub_url = reg.exec(last_url);
var service_id = (null != sub_url) ? sub_url[1] : 1;
- //TODO: fix this._childViews =[]
- $.each(this._childViews, function () {
- this.set('active', this.get('content.id') == service_id ? "active" : "");
- });
+ this.set('activeServiceId', service_id);
+
},
tagName: 'ul',
classNames: ["nav", "nav-list", "nav-services"],
- activateView: function () {
- var service = App.router.get('mainServiceItemController.content');
- $.each(this._childViews, function () {
- this.set('active', (this.get('content.serviceName') == service.get('serviceName') ? "active" : ""));
- });
- }.observes("App.router.mainServiceItemController.content"),
-
itemViewClass: Em.View.extend({
classNameBindings: ["active"],
- active: "",
+ active: function(){
+ return this.get('content.id') == this.get('parentView.activeServiceId') ? 'active' : '';
+ }.property('parentView.activeServiceId'),
serviceOperationsCount: function () {
var operations = App.router.get('backgroundOperationsController').getOperationsFor(this.get('content.serviceName'));
return operations.length;
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/pom.xml?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/pom.xml (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/pom.xml Sun Dec 9 12:37:57 2012
@@ -10,12 +10,6 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.ambari</groupId>
- <artifactId>ambari-project</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- <relativePath>../ambari-project</relativePath>
- </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-web</artifactId>
@@ -23,15 +17,28 @@
<name>Ambari Web</name>
<version>1.0.3-SNAPSHOT</version>
<description>Ambari Web</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.ambari</groupId>
- <artifactId>ambari-server</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- </dependency>
- </dependencies>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <version>2.0.1</version>
+ <executions>
+ <execution>
+ <!-- unbinds rpm creation from maven lifecycle -->
+ <phase>none</phase>
+ <goals>
+ <goal>attached-rpm</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <copyright>2012, Apache Software Foundation</copyright>
+ <group>Development</group>
+ <description>Maven Recipe: RPM Package.</description>
+ <mappings/>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -81,7 +88,6 @@
<fileset dir="${basedir}/../ambari-web/public"/>
</copy>
-->
- <symlink overwrite="true" link="${basedir}/../ambari-server/target/ambari-server-${project.version}-dist/ambari-server-${project.version}/web" resource="${basedir}/public" failonerror="false"/>
</target>
</configuration>
</execution>