You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/02/28 18:15:01 UTC
git commit: AMBARI-4891. Refactor templates. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 91bdbc3b8 -> dde5bb330
AMBARI-4891. Refactor templates. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dde5bb33
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dde5bb33
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dde5bb33
Branch: refs/heads/trunk
Commit: dde5bb330910076db8d46c42efcbc45ee58b7abc
Parents: 91bdbc3
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Fri Feb 28 19:12:44 2014 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Fri Feb 28 19:14:54 2014 +0200
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 25 +++++
ambari-web/app/templates/application.hbs | 2 +-
ambari-web/app/templates/common/about.hbs | 21 ++--
ambari-web/app/templates/common/time_range.hbs | 4 +-
.../main/admin/highAvailability/step3.hbs | 18 ++--
.../templates/main/admin/rollbackHA/step1.hbs | 4 +-
.../main/dashboard/widgets/cluster_metrics.hbs | 20 ++--
.../main/dashboard/widgets/hbase_links.hbs | 100 ++++++++++---------
.../main/dashboard/widgets/hdfs_links.hbs | 2 +
.../main/dashboard/widgets/mapreduce_links.hbs | 82 +++++++--------
.../main/dashboard/widgets/mapreduce_slots.hbs | 66 ++++++------
.../main/dashboard/widgets/pie_chart.hbs | 48 ++++-----
.../main/dashboard/widgets/simple_text.hbs | 36 +++----
.../templates/main/dashboard/widgets/uptime.hbs | 50 +++++-----
ambari-web/app/templates/main/jobs.hbs | 2 +-
ambari-web/app/templates/wizard/step10.hbs | 30 +++---
.../wizard/step3_host_warnings_popup.hbs | 2 +-
ambari-web/app/templates/wizard/step8.hbs | 37 ++++---
ambari-web/app/templates/wizard/step9.hbs | 3 +-
19 files changed, 300 insertions(+), 252 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index d64e0af..a920e3d 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2510,6 +2510,11 @@ table.graphs {
background-color: #ffffff;
z-index: 3;
}
+ .has-hidden-info {
+ ul {
+ margin: 0;
+ }
+ }
.has-hidden-info .thumbnail:hover {
cursor: move;
//background-color: #d3d3d3;
@@ -2591,6 +2596,11 @@ table.graphs {
}
}
}
+
+ .cluster-metrics > ul {
+ margin:0;
+ }
+
.cluster-metrics .alert {
padding: 0px;
font-size: 12px;
@@ -2606,6 +2616,11 @@ table.graphs {
margin-left: -6px;
}
}
+ .links {
+ ul {
+ margin: 0;
+ }
+ }
.links .thumbnail{
li{
height:20px;
@@ -4609,6 +4624,11 @@ ul.inline li {
}
#step8-content {
+ ul {
+ li {
+ list-style: none;
+ }
+ }
max-height: 440px;
}
@@ -4623,6 +4643,11 @@ ul.inline li {
}
#step10-content {
+ ul {
+ li {
+ list-style: none;
+ }
+ }
max-height: 440px;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/application.hbs b/ambari-web/app/templates/application.hbs
index 35b7f80..8c21c72 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -22,7 +22,7 @@
<div class="navbar-inner">
<div class="container main-container">
<a {{translateAttr href="topnav.logo.href"}} class="logo" target="_blank"><img src="/img/logo.png" alt="Apache Ambari" title="Apache Ambari"></a>
- <a class="brand" {{translateAttr href="topnav.logo.href"}} target="_blank" alt="Apache Ambari" title="Apache Ambari">{{t app.name}}</a>
+ <a class="brand" {{translateAttr href="topnav.logo.href"}} target="_blank" title="Apache Ambari">{{t app.name}}</a>
{{#if isClusterDataLoaded}}
<a class="brand cluster-name" href="javascript:void(null);" {{bindAttr title="clusterName"}}>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/common/about.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/about.hbs b/ambari-web/app/templates/common/about.hbs
index 0606ab2..59e0622 100644
--- a/ambari-web/app/templates/common/about.hbs
+++ b/ambari-web/app/templates/common/about.hbs
@@ -18,18 +18,17 @@
<div class="about">
<div class="logo">
-<img src="/img/logo.png" alt="Apache Ambari" title="Apache Ambari">
+ <img src="/img/logo.png" alt="Apache Ambari" title="Apache Ambari" />
</div>
<div class="content">
-<div class="project">Apache Ambari</div>
-<br>
-{{t app.aboutAmbari.version}}
-{{view.ambariVersion}}
-<br>
-<br>
-<a href="http://ambari.apache.org/" target="_blank">{{t app.aboutAmbari.getInvolved}}</a>
-<br>
-<a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">{{t app.aboutAmbari.licensed}}</a>
- </label>
+ <div class="project">Apache Ambari</div>
+ <br />
+ {{t app.aboutAmbari.version}}
+ {{view.ambariVersion}}
+ <br />
+ <br />
+ <a href="http://ambari.apache.org/" target="_blank">{{t app.aboutAmbari.getInvolved}}</a>
+ <br />
+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">{{t app.aboutAmbari.licensed}}</a>
</div>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/common/time_range.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/time_range.hbs b/ambari-web/app/templates/common/time_range.hbs
index 66ce3f9..d925caf 100644
--- a/ambari-web/app/templates/common/time_range.hbs
+++ b/ambari-web/app/templates/common/time_range.hbs
@@ -27,6 +27,6 @@
{{t to}} {{view view.dateToView}}
</ul>
<div id="slider">
- <sapn class="period-marker">{{view.rangeLabel}}</sapn>
- <sapn class="now-marker">{{view.nowLabel}}</sapn>
+ <span class="period-marker">{{view.rangeLabel}}</span>
+ <span class="now-marker">{{view.nowLabel}}</span>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/main/admin/highAvailability/step3.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/step3.hbs b/ambari-web/app/templates/main/admin/highAvailability/step3.hbs
index 3cab571..4afbb11 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/step3.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/step3.hbs
@@ -34,14 +34,12 @@
<tr>
<td>{{t admin.highAvailability.wizard.step3.secNameNode}}</td>
<td>{{view.secondaryNameNode}}</td>
- <td class="to-be-disabled-red"><i
- class="icon-minus"></i> {{t admin.highAvailability.wizard.step3.toBeDeleted}}</td>
+ <td><span class="to-be-disabled-red"><i class="icon-minus"></i> {{t admin.highAvailability.wizard.step3.toBeDeleted}}</span></td>
</tr>
<tr>
<td>{{t admin.highAvailability.wizard.step3.addNameNode}}</td>
<td>{{view.addNameNode}}</td>
- <td class="to-be-installed-green"><i
- class="icon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</td>
+ <td><span class="to-be-installed-green"><i class="icon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></td>
</tr>
<tr>
<td>{{t admin.highAvailability.wizard.step3.journalNode}}</td>
@@ -54,12 +52,12 @@
</td>
<td>
<ul>
- <div class="to-be-installed-green"><i
- class="icon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</div>
- <div class="to-be-installed-green"><i
- class="icon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</div>
- <div class="to-be-installed-green"><i
- class="icon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</div>
+ <li><span class="to-be-installed-green"><i
+ class="icon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></li>
+ <li><span class="to-be-installed-green"><i
+ class="icon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></li>
+ <li><span class="to-be-installed-green"><i
+ class="icon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></li>
</ul>
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/main/admin/rollbackHA/step1.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/rollbackHA/step1.hbs b/ambari-web/app/templates/main/admin/rollbackHA/step1.hbs
index 214cc1b..898105d 100644
--- a/ambari-web/app/templates/main/admin/rollbackHA/step1.hbs
+++ b/ambari-web/app/templates/main/admin/rollbackHA/step1.hbs
@@ -25,7 +25,7 @@
valueBinding="view.selectedAddNNHost"
}}
</p>
- <div class="code-snippet">Tip: Suggested host <b>{{view.tipAddNNHost}}</b></div></li>
+ <div class="code-snippet">Tip: Suggested host <b>{{view.tipAddNNHost}}</b></div>
</div>
<div class="alert alert-info">
<p>
@@ -35,7 +35,7 @@
valueBinding="view.selectedSNNHost"
}}
</p>
- <div class="code-snippet">Tip: Suggested host <b>{{view.tipSNNHost}}</b></div></li>
+ <div class="code-snippet">Tip: Suggested host <b>{{view.tipSNNHost}}</b></div>
</div>
<div class="btn-area">
<a {{bindAttr class=":btn controller.isNameServiceIdValid::disabled :btn-success :pull-right"}} {{action done target="view"}}>{{t common.next}} →</a>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs b/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs
index 9778260..eef559d 100644
--- a/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs
+++ b/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs
@@ -17,14 +17,16 @@
}}
<div class="cluster-metrics">
- <li class="thumbnail row">
- <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
- <i class="icon-remove-sign icon-large"></i>
- </a>
- <div class="caption span10">{{view.title}}</div>
+ <ul>
+ <li class="thumbnail row">
+ <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
+ <i class="icon-remove-sign icon-large"></i>
+ </a>
+ <div class="caption span10">{{view.title}}</div>
- <div class="widget-content" >
- {{view view.content}}
- </div>
- </li>
+ <div class="widget-content" >
+ {{view view.content}}
+ </div>
+ </li>
+ </ul>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs b/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs
index f608c49..a4e5945 100644
--- a/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs
+++ b/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs
@@ -17,56 +17,58 @@
}}
<div class="links">
- <li class="thumbnail row">
- <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}><i class="icon-remove-sign icon-large"></i></a>
- <div class="caption span10"> {{view.title}}</div>
+ <ul>
+ <li class="thumbnail row">
+ <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}><i class="icon-remove-sign icon-large"></i></a>
+ <div class="caption span10"> {{view.title}}</div>
- <div class="widget-content" >
- <table>
- <!--hbase master server-->
- <tr>
- <td>
- {{#if view.activeMaster}}
- <a href="#" {{action showDetails view.activeMaster.host}}>{{t dashboard.services.hbase.masterServer}}</a>
- {{else}}
- {{t dashboard.services.hbase.noMasterServer}}
- {{/if}}
- </td>
- </tr>
- <!--region servers-->
- <tr>
- <td><a href="#" {{action filterHosts view.component}}>{{view.model.regionServers.length}} {{t dashboard.services.hbase.regionServers}}</a></td>
- </tr>
- <!--hbase master Web UI-->
- <tr>
- <td>
- {{#if view.activeMaster}}
- <a {{bindAttr href="view.hbaseMasterWebUrl"}} target="_blank">{{t dashboard.services.hbase.masterWebUI}}</a>
- {{else}}
- {{t services.service.summary.notAvailable}}
- {{/if}}
- </td>
- </tr>
- </table>
- </div>
+ <div class="widget-content" >
+ <table>
+ <!--hbase master server-->
+ <tr>
+ <td>
+ {{#if view.activeMaster}}
+ <a href="#" {{action showDetails view.activeMaster.host}}>{{t dashboard.services.hbase.masterServer}}</a>
+ {{else}}
+ {{t dashboard.services.hbase.noMasterServer}}
+ {{/if}}
+ </td>
+ </tr>
+ <!--region servers-->
+ <tr>
+ <td><a href="#" {{action filterHosts view.component}}>{{view.model.regionServers.length}} {{t dashboard.services.hbase.regionServers}}</a></td>
+ </tr>
+ <!--hbase master Web UI-->
+ <tr>
+ <td>
+ {{#if view.activeMaster}}
+ <a {{bindAttr href="view.hbaseMasterWebUrl"}} target="_blank">{{t dashboard.services.hbase.masterWebUI}}</a>
+ {{else}}
+ {{t services.service.summary.notAvailable}}
+ {{/if}}
+ </td>
+ </tr>
+ </table>
+ </div>
- <div class="link-button">
- {{#if view.model.quickLinks.length}}
- {{#view App.QuickViewLinks contentBinding="view.model"}}
- <div class="btn-group">
- <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
- {{t common.more}}
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- {{#each view.quickLinks}}
- <li><a {{bindAttr href="url"}} target="_blank">{{label}}</a></li>
- {{/each}}
- </ul>
- </div>
- {{/view}}
- {{/if}}
- </div>
+ <div class="link-button">
+ {{#if view.model.quickLinks.length}}
+ {{#view App.QuickViewLinks contentBinding="view.model"}}
+ <div class="btn-group">
+ <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
+ {{t common.more}}
+ <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ {{#each view.quickLinks}}
+ <li><a {{bindAttr href="url"}} target="_blank">{{label}}</a></li>
+ {{/each}}
+ </ul>
+ </div>
+ {{/view}}
+ {{/if}}
+ </div>
- </li>
+ </li>
+ </ul>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs b/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs
index bd45a25..56999da 100644
--- a/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs
+++ b/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs
@@ -17,6 +17,7 @@
}}
<div class="links">
+ <ul>
<li class="thumbnail row">
<a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
<i class="icon-remove-sign icon-large"></i>
@@ -98,4 +99,5 @@
{{/if}}
</div>
</li>
+ </ul>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/main/dashboard/widgets/mapreduce_links.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/widgets/mapreduce_links.hbs b/ambari-web/app/templates/main/dashboard/widgets/mapreduce_links.hbs
index 63ac451..815e694 100644
--- a/ambari-web/app/templates/main/dashboard/widgets/mapreduce_links.hbs
+++ b/ambari-web/app/templates/main/dashboard/widgets/mapreduce_links.hbs
@@ -17,45 +17,47 @@
}}
<div class="links">
- <li class="thumbnail row">
- <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
- <i class="icon-remove-sign icon-large"></i>
- </a>
- <div class="caption span10"> {{view.title}}</div>
+ <ul>
+ <li class="thumbnail row">
+ <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
+ <i class="icon-remove-sign icon-large"></i>
+ </a>
+ <div class="caption span10"> {{view.title}}</div>
- <div class="widget-content" >
- <table>
- <!--jobTracker-->
- <tr>
- <td><a href="#" {{action showDetails view.model.jobTracker}}>{{t services.service.summary.jobTracker}}</a></td>
- </tr>
- <!--taskTrackers-->
- <tr>
- <td><a href="#" {{action filterHosts view.component}}>{{view.model.taskTrackers.length}} {{t dashboard.services.mapreduce.taskTrackers}}</a></td>
- </tr>
- <!--jobTracker Web UI-->
- <tr>
- <td><a {{bindAttr href="view.webUrl"}} target="_blank">{{t services.service.summary.jobTrackerWebUI}}</a></td>
- </tr>
- </table>
- </div>
+ <div class="widget-content" >
+ <table>
+ <!--jobTracker-->
+ <tr>
+ <td><a href="#" {{action showDetails view.model.jobTracker}}>{{t services.service.summary.jobTracker}}</a></td>
+ </tr>
+ <!--taskTrackers-->
+ <tr>
+ <td><a href="#" {{action filterHosts view.component}}>{{view.model.taskTrackers.length}} {{t dashboard.services.mapreduce.taskTrackers}}</a></td>
+ </tr>
+ <!--jobTracker Web UI-->
+ <tr>
+ <td><a {{bindAttr href="view.webUrl"}} target="_blank">{{t services.service.summary.jobTrackerWebUI}}</a></td>
+ </tr>
+ </table>
+ </div>
- <div class="link-button">
- {{#if view.model.quickLinks.length}}
- {{#view App.QuickViewLinks contentBinding="view.model"}}
- <div class="btn-group">
- <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
- {{t common.more}}
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- {{#each view.quickLinks}}
- <li><a {{bindAttr href="url"}} target="_blank">{{label}}</a></li>
- {{/each}}
- </ul>
- </div>
- {{/view}}
- {{/if}}
- </div>
- </li>
-</div>
+ <div class="link-button">
+ {{#if view.model.quickLinks.length}}
+ {{#view App.QuickViewLinks contentBinding="view.model"}}
+ <div class="btn-group">
+ <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
+ {{t common.more}}
+ <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ {{#each view.quickLinks}}
+ <li><a {{bindAttr href="url"}} target="_blank">{{label}}</a></li>
+ {{/each}}
+ </ul>
+ </div>
+ {{/view}}
+ {{/if}}
+ </div>
+ </li>
+ </ul>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/main/dashboard/widgets/mapreduce_slots.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/widgets/mapreduce_slots.hbs b/ambari-web/app/templates/main/dashboard/widgets/mapreduce_slots.hbs
index 5b38cb0..26f61ba 100644
--- a/ambari-web/app/templates/main/dashboard/widgets/mapreduce_slots.hbs
+++ b/ambari-web/app/templates/main/dashboard/widgets/mapreduce_slots.hbs
@@ -17,38 +17,40 @@
}}
<div class="has-hidden-info">
- <li class="thumbnail row" >
- <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}><i class="icon-remove-sign icon-large"></i></a>
- <div class="caption span10 slots-caption"> {{view.title}}</div>
+ <ul>
+ <li class="thumbnail row" >
+ <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}><i class="icon-remove-sign icon-large"></i></a>
+ <div class="caption span10 slots-caption"> {{view.title}}</div>
- <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass"}}>
- <table align="center">
- {{#each line in view.hiddenInfo}}
- <tr><td>{{line}}</td></tr>{{/each}}
- </table>
- </div>
-
- {{#if view.isViewExist}}
- <div class="widget-content row-fluid" id="map-reduce-slots-text" >
- <ul class="span12">
- <div class="span3"> {{t dashboard.widgets.mapSlots}}</div>
- <div class="progress span5" id="map-reduce-slots-bar1">
- <div class="bar bar-success" {{bindAttr style="view.map_occupied"}}></div>
- <div class="bar bar-warning" {{bindAttr style="view.map_reserved"}}></div>
- </div>
- <div class="span3" id="map-reduce-slots-num1"> {{view.map_display_text}}</div>
- </ul>
- <ul class="span12">
- <div class="span3"> {{t dashboard.widgets.reduceSlots}}</div>
- <div class="progress span5" id="map-reduce-slots-bar2">
- <div class="bar bar-success" {{bindAttr style="view.reduce_occupied"}}></div>
- <div class="bar bar-warning" {{bindAttr style="view.reduce_reserved"}}></div>
- </div>
- <div class="span3" id="map-reduce-slots-num2"> {{view.reduce_display_text}}</div>
- </ul>
+ <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass"}}>
+ <table align="center">
+ {{#each line in view.hiddenInfo}}
+ <tr><td>{{line}}</td></tr>{{/each}}
+ </table>
</div>
- {{else}}
- <div class="widget-content-isNA slots-content-isNA" >{{t services.service.summary.notAvailable}}</div>
- {{/if}}
- </li>
+
+ {{#if view.isViewExist}}
+ <div class="widget-content row-fluid" id="map-reduce-slots-text" >
+ <ul class="span12">
+ <div class="span3"> {{t dashboard.widgets.mapSlots}}</div>
+ <div class="progress span5" id="map-reduce-slots-bar1">
+ <div class="bar bar-success" {{bindAttr style="view.map_occupied"}}></div>
+ <div class="bar bar-warning" {{bindAttr style="view.map_reserved"}}></div>
+ </div>
+ <div class="span3" id="map-reduce-slots-num1"> {{view.map_display_text}}</div>
+ </ul>
+ <ul class="span12">
+ <div class="span3"> {{t dashboard.widgets.reduceSlots}}</div>
+ <div class="progress span5" id="map-reduce-slots-bar2">
+ <div class="bar bar-success" {{bindAttr style="view.reduce_occupied"}}></div>
+ <div class="bar bar-warning" {{bindAttr style="view.reduce_reserved"}}></div>
+ </div>
+ <div class="span3" id="map-reduce-slots-num2"> {{view.reduce_display_text}}</div>
+ </ul>
+ </div>
+ {{else}}
+ <div class="widget-content-isNA slots-content-isNA" >{{t services.service.summary.notAvailable}}</div>
+ {{/if}}
+ </li>
+ </ul>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs b/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs
index 41988c1..cd5d099 100644
--- a/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs
+++ b/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs
@@ -17,29 +17,31 @@
}}
<div class="has-hidden-info">
- <li class="thumbnail row">
- <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
- <i class="icon-remove-sign icon-large"></i>
- </a>
- <div class="caption span10">{{view.title}}</div>
- <a class="corner-icon span1" href="#" {{action editWidget target="view"}}>
- <i class="icon-edit"></i>
- </a>
+ <ul>
+ <li class="thumbnail row">
+ <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
+ <i class="icon-remove-sign icon-large"></i>
+ </a>
+ <div class="caption span10">{{view.title}}</div>
+ <a class="corner-icon span1" href="#" {{action editWidget target="view"}}>
+ <i class="icon-edit"></i>
+ </a>
- <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass" }}>
- <table align="center">
- {{#each line in view.hiddenInfo}}
- <tr><td>{{line}}</td></tr>
- {{/each}}
- </table>
- </div>
-
- {{#if view.isPieExist}}
- <div class="widget-content" >
- {{view view.content modelBinding="view.model" thresh1Binding="view.thresh1" thresh2Binding="view.thresh2"}}
+ <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass" }}>
+ <table align="center">
+ {{#each line in view.hiddenInfo}}
+ <tr><td>{{line}}</td></tr>
+ {{/each}}
+ </table>
</div>
- {{else}}
- <div class="widget-content-isNA" >{{t services.service.summary.notAvailable}}</div>
- {{/if}}
- </li>
+
+ {{#if view.isPieExist}}
+ <div class="widget-content" >
+ {{view view.content modelBinding="view.model" thresh1Binding="view.thresh1" thresh2Binding="view.thresh2"}}
+ </div>
+ {{else}}
+ <div class="widget-content-isNA" >{{t services.service.summary.notAvailable}}</div>
+ {{/if}}
+ </li>
+ </ul>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs b/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs
index f5a96ca..845a938 100644
--- a/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs
+++ b/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs
@@ -17,23 +17,25 @@
}}
<div class="has-hidden-info">
- <li class="thumbnail row" >
- <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
- <i class="icon-remove-sign icon-large"></i>
- </a>
- <div class="caption span10"> {{view.title}}</div>
- <a class="corner-icon span1" href="#" {{action editWidget target="view"}}>
- <i class="icon-edit"></i>
- </a>
+ <ul>
+ <li class="thumbnail row" >
+ <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
+ <i class="icon-remove-sign icon-large"></i>
+ </a>
+ <div class="caption span10"> {{view.title}}</div>
+ <a class="corner-icon span1" href="#" {{action editWidget target="view"}}>
+ <i class="icon-edit"></i>
+ </a>
- <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass" }}>
- <table align="center">
- {{#each line in view.hiddenInfo}}
- <tr><td>{{line}}</td></tr>
- {{/each}}
- </table>
- </div>
+ <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass" }}>
+ <table align="center">
+ {{#each line in view.hiddenInfo}}
+ <tr><td>{{line}}</td></tr>
+ {{/each}}
+ </table>
+ </div>
- <div {{bindAttr class=":widget-content view.hoverContentTopClass"}}>{{view.content}}</div>
- </li>
+ <div {{bindAttr class=":widget-content view.hoverContentTopClass"}}>{{view.content}}</div>
+ </li>
+ </ul>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs b/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs
index f5c8636..ce356a1 100644
--- a/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs
+++ b/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs
@@ -17,29 +17,31 @@
}}
<div class="has-hidden-info">
- <li class="thumbnail row" >
- <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
- <i class="icon-remove-sign icon-large"></i>
- </a>
- <div class="caption span11"> {{view.title}} </div>
- <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass"}}>
- <table align="center">
- {{#each line in view.hiddenInfo}}
- <tr>
- <td>
- {{line}}
- </td>
- </tr>
- {{/each}}
- </table>
- </div>
-
- {{#if view.isNA}}
- <div class="widget-content-isNA uptime-content-isNA" >{{t services.service.summary.notAvailable}}</div>
- {{else}}
- <div class="widget-content uptime-content" >
- {{view.content}}
+ <ul>
+ <li class="thumbnail row" >
+ <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
+ <i class="icon-remove-sign icon-large"></i>
+ </a>
+ <div class="caption span11"> {{view.title}} </div>
+ <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass"}}>
+ <table align="center">
+ {{#each line in view.hiddenInfo}}
+ <tr>
+ <td>
+ {{line}}
+ </td>
+ </tr>
+ {{/each}}
+ </table>
</div>
- {{/if}}
- </li>
+
+ {{#if view.isNA}}
+ <div class="widget-content-isNA uptime-content-isNA" >{{t services.service.summary.notAvailable}}</div>
+ {{else}}
+ <div class="widget-content uptime-content" >
+ {{view.content}}
+ </div>
+ {{/if}}
+ </li>
+ </ul>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/main/jobs.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/jobs.hbs b/ambari-web/app/templates/main/jobs.hbs
index 5098f87..498899b 100644
--- a/ambari-web/app/templates/main/jobs.hbs
+++ b/ambari-web/app/templates/main/jobs.hbs
@@ -57,7 +57,7 @@
{{#if job.hasTezDag}}
<a rel="tooltip" class="job-link" title="{{unbound job.queryText}}" href="#" {{action "showJobDetails" job}}>{{unbound job.name}}</a>
{{else}}
- <span rel="tooltip" class="job-link" title="{{unbound job.queryText}}">{{unbound job.name}}</a>
+ <span rel="tooltip" class="job-link" title="{{unbound job.queryText}}">{{unbound job.name}}</span>
{{/if}}
</td>
<td>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/wizard/step10.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step10.hbs b/ambari-web/app/templates/wizard/step10.hbs
index 2ec787a..b0f8cff 100644
--- a/ambari-web/app/templates/wizard/step10.hbs
+++ b/ambari-web/app/templates/wizard/step10.hbs
@@ -26,21 +26,27 @@
{{t installer.step10.body}}
</div>
<div id="step10-content" class="well pre-scrollable">
- {{#each item in clusterInfo}}
<ul>
- <span {{bindAttr class="item.color"}}>{{item.displayStatement}}</span>
- {{#each status in item.status}}
- <ul>
- <span {{bindAttr class="status.color"}}>{{status.displayStatement}}</span>
- {{#each statement in status.statements}}
- <ul>
- <span {{bindAttr class="status.color"}}>{{statement.displayStatement}}</span>
- </ul>
- {{/each}}
- </ul>
+ {{#each item in clusterInfo}}
+ <li>
+ <span {{bindAttr class="item.color"}}>{{item.displayStatement}}</span>
+ <ul>
+ {{#each status in item.status}}
+ <li>
+ <span {{bindAttr class="status.color"}}>{{status.displayStatement}}</span>
+ <ul>
+ {{#each statement in status.statements}}
+ <li>
+ <span {{bindAttr class="status.color"}}>{{statement.displayStatement}}</span>
+ </li>
+ {{/each}}
+ </ul>
+ </li>
+ {{/each}}
+ </ul>
+ </li>
{{/each}}
</ul>
- {{/each}}
</div>
<div class="btn-area">
<a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action complete}}>{{t common.complete}} →</a>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs b/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs
index 5ef85cb..cfd3239 100644
--- a/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs
+++ b/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs
@@ -30,7 +30,7 @@
</div>
{{#if view.categoryWarnings.length}}
<div class="span3 offset2">
- <a href="javascript.void(0)" title="Show Details" {{action openWarningsInDialog target="view"}}
+ <a href="javascript:void(null)" title="Show Details" {{action openWarningsInDialog target="view"}}
class="task-detail-open-dialog"><i
class="icon-external-link"></i> {{t installer.step3.hostWarningsPopup.report}}</a>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/wizard/step8.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step8.hbs b/ambari-web/app/templates/wizard/step8.hbs
index af77c04..25501b5 100644
--- a/ambari-web/app/templates/wizard/step8.hbs
+++ b/ambari-web/app/templates/wizard/step8.hbs
@@ -41,27 +41,32 @@
<p><b>{{controller.clusterInfo.repoInfo.display_name}}</b>:</p>
<div>
- {{#each item in controller.clusterInfo.repoInfo}}
- <ul><span class="text text-info">{{item.os_type}}
- : </span>{{item.base_url}}</ul>
- {{/each}}
+ <ul>
+ {{#each item in controller.clusterInfo.repoInfo}}
+ <li>
+ <p><span class="text text-info">{{item.os_type}} : </span>{{item.base_url}}</p>
+ </li>
+ {{/each}}
+ </ul>
</div>
<div>
{{#if controller.services.length}}
<p><b>{{t menu.item.services}}</b></p>
- {{#each controller.services}}
- <div>
- <ul><em><b>{{display_name}}</b></em>
- <div>
- {{#each component in this.service_components}}
- <ul><span class="text text-info">{{component.display_name }}
- : </span>{{component.component_value}}</ul>
- {{/each}}
- </div>
- </ul>
- </div>
- {{/each}}
+ <ul>
+ {{#each controller.services}}
+ <li>
+ <em><b>{{display_name}}</b></em>
+ <ul>
+ {{#each component in this.service_components}}
+ <li>
+ <span class="text text-info">{{component.display_name }} : </span>{{component.component_value}}
+ </li>
+ {{/each}}
+ </ul>
+ </li>
+ {{/each}}
+ </ul>
{{/if}}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dde5bb33/ambari-web/app/templates/wizard/step9.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step9.hbs b/ambari-web/app/templates/wizard/step9.hbs
index ba30a0a..e3b2a48 100644
--- a/ambari-web/app/templates/wizard/step9.hbs
+++ b/ambari-web/app/templates/wizard/step9.hbs
@@ -125,5 +125,4 @@
</div>
</div>
-</div>
-</div>
+</div>
\ No newline at end of file