AMBARI-18972. Remove redundant css (part 4) (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6088c179 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6088c179 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6088c179 Branch: refs/heads/branch-feature-AMBARI-18634 Commit: 6088c17906b784f57adca36af224d63135a49b9a Parents: 292d279 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Wed Nov 23 12:49:38 2016 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Wed Nov 23 12:49:38 2016 +0200 ---------------------------------------------------------------------- .../app/controllers/main/charts/heatmap.js | 6 +- ambari-web/app/styles/application.less | 213 +------------------ ambari-web/app/styles/wizard.less | 19 +- .../common/assign_master_components.hbs | 62 +++--- .../common/form/check_db_connection.hbs | 26 ++- .../templates/common/host_progress_popup.hbs | 7 +- .../main/charts/heatmap/heatmap_host_detail.hbs | 70 ++++-- .../main/charts/heatmap/heatmap_rack.hbs | 37 +--- .../templates/main/charts/heatmap_dropdown.hbs | 4 +- .../main/host/details/deleteComponentPopup.hbs | 20 +- .../main/host/details/doDeleteHostPopup.hbs | 35 ++- .../details/raiseDeleteComponentErrorPopup.hbs | 21 +- .../main/service/info/heatmap_dropdown.hbs | 2 +- ambari-web/app/templates/wizard/step3.hbs | 2 +- .../wizard/step3/step3_host_warnings_popup.hbs | 18 +- .../wizard/step9/step9HostTasksLogPopup.hbs | 2 +- .../common/assign_master_components_view.js | 4 +- .../views/main/charts/heatmap/heatmap_rack.js | 23 +- .../step1_controller_test.js | 11 +- 19 files changed, 213 insertions(+), 369 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/controllers/main/charts/heatmap.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/charts/heatmap.js b/ambari-web/app/controllers/main/charts/heatmap.js index caa3f2d..e4f35a4 100644 --- a/ambari-web/app/controllers/main/charts/heatmap.js +++ b/ambari-web/app/controllers/main/charts/heatmap.js @@ -270,10 +270,10 @@ App.MainChartsHeatmapController = Em.Controller.extend(App.WidgetSectionMixin, { var rackCount = this.get('racks.length'); if (rackCount < 2) { return "col-md-12"; - } else if (rackCount == 2) { + } + if (rackCount === 2) { return "col-md-6"; - } else { - return "col-md-4"; } + return "col-md-4"; }.property('racks.length') }); http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 024679e..aab3287 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -461,16 +461,6 @@ table.diff { } } -.row .tinyoffset { - margin-left: 3%!important; -} - -.row .tinyspan { - width: 2%!important; - *width: 1.95%!important; - float: none; -} - .hidden-scroll { overflow-y: hidden; } @@ -1168,22 +1158,6 @@ a:focus { .tab-marker-position (@health-status-yellow); } - .summary-view-host{ - float: right; - padding-right: 20px; - a { - text-decoration: none; - &:hover { - text-decoration: underline; - } - } - .category-name { - cursor: pointer; - color: #23527c; - font-size: 14px; - margin-left: 10px; - } - } .service-summary-component-red-dead { color: @health-status-red; display: inline; @@ -1215,30 +1189,6 @@ a:focus { } } -#security-stages { - tr { - height: 50px; - } - td { - width: 180px; - } - .progress-wrapper { - width: 50%; - .progress { - margin-bottom: 0; - } - } - .progress-percentage { - margin-left: 10px; - } - a.remove-link { - text-decoration:none; - pointer-events: none; - color:black; - cursor: default; - } -} - .faintText { color: #999; } @@ -1591,14 +1541,6 @@ table.graphs { border-radius: 4px; padding: 4px; background: #FFFDF6; - .warning-details { - padding-left: 16px; - padding-top: 5px; - } - .warning-list { - font-size: 0.95em; - font-style: italic; - } } .services-menu { @@ -1660,68 +1602,10 @@ ul.filter { /*start charts rack*/ .rack { - vertical-align: top; - border: 1px solid #D4D4D4; - margin-bottom: 10px; - margin-top:5px; - background-color: #fff; .rackHeader { - background-color: #F7F7F7; padding: 5px 5px 5px 10px; - border-bottom: 1px solid #D4D4D4; - - .statusName { - font-size: 15px; - color: #006F9F; - text-shadow: #fff 0 0 1px; - font-weight: bold; - vertical-align: top; - } - .toggler { - background-repeat: no-repeat; - background-image: @rack-state-toggler; - display: block; - height: 22px; - position: relative; - width: 32px; - float: right; - - span { - background-repeat: no-repeat; - background-image: @rack-state-plus; - display: block; - height: 17px; - left: 7px; - position: absolute; - top: 3px; - width: 18px; - } - - span.isActive { - background-image: @rack-state-minus !important; - top: 10px; - } - } - } - .hostsSummary { - border-left: 1px solid #CDCDCD; - border-right: 1px solid #CDCDCD; - border-bottom: 1px solid #9f9f9f; - background-color: #f7f8fa; - font-size: 12px; - padding: 4px 0 4px 9px; - .textBlock { - color: #000; - padding-right: 10px; - - div { - height: 12px; - margin: 0 3px 0 0; - width: 12px; - display: inline-block; - } - } + color: #006F9F; } .indicatorR { background-color: #E2001A; @@ -1734,103 +1618,23 @@ ul.filter { .indicatorG { background-color: #88BF67; } - .statusIndicator { - display: inline-block; - width: 20px; - height: 19px; - margin-right: 10px; - margin-top: 4px; - float: left; - background-repeat: no-repeat; - } - .rackName { - margin-top: 4px; - float: left; - } - .statusIndicator.LIVE { - background-image: @rack-status-live; - } - - .statusIndicator.CRITICAL { - background-image: @rack-status-critical; - } - - .statusIndicator.DEAD { - background-image: @rack-status-dead; - } .hosts { - padding: 4px; - overflow: hidden; - display: none; + padding: 2px 15px; - .ember-view { - float: left; - width: 100%; - height: 43px; - - .hostBlock { - height: 38px; - position: relative; - border: 1px solid #D4D4D4; - margin-right: 3px; - } - } .hostBlock { + height: 38px; + border: 1px solid #D4D4D4; border-radius: 4px; } - .hostBlock.HEALTHY { - background-color: #87BE73; - } - .hostBlock.UNHEALTHY { - background-color: #E40024; - } - .hostBlock.CRITICAL { - background: #F39236; - } - .ember-view:hover { - } - } - - .hosts.isActive { - display: block; } } /*Start Heatmap*/ .heatmap { - li.heatmap-metrics-dropdown-links{ - cursor: pointer; - } - .rack.rack-5-2 { - .hosts { - height: 86px; - } - } - .rack.rack-5-4 { - .hosts { - height: 172px; - } - } - .rack.rack-5-6 { - .hosts { - height: 258px; - } - } - .rack.rack-5-8 { - .hosts { - height: 344px; - } - } - .rack.rack-5-10 { - .hosts { - height: 430px; - } - } .heatmap_host_details { - font-size: 12px; - line-height: 1.6em; + border: 1px solid #D9D9D9; background: #f9f9f9; width: 280px; @@ -1838,9 +1642,7 @@ ul.filter { position: absolute; z-index: 1000; } - .container-fluid { - padding: 0; - } + .legend { margin-top: 20px; margin-bottom: 20px; @@ -1857,9 +1659,6 @@ ul.filter { } } - h4 { - color: #777; - } .heatmap-host { display: block; width: 100%; http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/styles/wizard.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less index 005bd0c..747c7eb 100644 --- a/ambari-web/app/styles/wizard.less +++ b/ambari-web/app/styles/wizard.less @@ -380,12 +380,6 @@ } .remaining-hosts { - padding: 25px; - border-top: solid 1px #ccc; - border-left: solid 1px #ccc; - border-right: groove 5px #ccc; - border-bottom: groove 5px #ccc; - margin-top: 20px; background-color: #FCF8E3; color: #C09853; } @@ -427,27 +421,22 @@ } .hostName { - word-wrap: break-word!important; - white-space: normal; - width: 220px; line-height: 30px; - display: inline-block; } .hostString { margin-bottom: 5px; word-wrap: break-word; } - .badge { + .label { background-color: @green; color: #fff; cursor: pointer; font-weight: bold; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - } - - .badge:hover { - background-color: @green; + &:hover { + background-color: @green; + } } .alertFlag { http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/templates/common/assign_master_components.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/assign_master_components.hbs b/ambari-web/app/templates/common/assign_master_components.hbs index fc90a99..a0a4990 100644 --- a/ambari-web/app/templates/common/assign_master_components.hbs +++ b/ambari-web/app/templates/common/assign_master_components.hbs @@ -33,7 +33,7 @@ {{#if controller.isLoaded}} <div class="assign-masters row"> <div class="select-hosts col-md-8"> - <div class="row col-md-12"> + <div class="row"> {{#if showCurrentHost}} <div class="col-md-12 control-group mlc"> <div class="row"> @@ -46,23 +46,22 @@ <div class="clearfix"></div> <div class="row"> <div class="col-md-12 control-group"> - <form class="form-horizontal" autocomplete="off"> <!-- View for array controller --> {{#each controller.additionalHostsList}} - <div class="row additional-hosts-list"> - <div class="col-md-5"> + <div class="row row-no-pad additional-hosts-list"> + <div class="col-md-4"> <label class="pts pull-right"> {{label}} </label> </div> - <div class="col-md-7 host-cell"> + <div class="col-md-8 host-cell"> {{host}} </div> </div> {{/each}} {{#each servicesMastersToShow}} - <div class="row"> - <div class="col-md-5"> + <div class="row row-no-pad form-group"> + <div class="col-md-4"> <div class="control-group"> <label class="pts pull-right"> {{#if showCurrentPrefix}} @@ -75,13 +74,13 @@ </label> </div> </div> - <div class="col-md-7"> + <div class="col-md-6"> {{#if isServiceCoHost}} <div class="hostName"> {{selectedHost}}<i class="glyphicon glyphicon-asterisks">✵</i> </div> {{else}} - <div {{bindAttr class="errorMessage:error: warnMessage:warning: :form-group"}}> + <div {{bindAttr class="errorMessage:error: warnMessage:warning:"}}> {{#if view.shouldUseInputs}} {{view App.InputHostView componentBinding="this" @@ -93,13 +92,6 @@ optionValuePath="content.host_name" optionLabelPath="content.host_info" }} {{/if}} - {{#if showAddControl}} - {{view App.AddControlView componentNameBinding="component_name"}} - {{/if}} - {{#if showRemoveControl}} - {{view App.RemoveControlView componentNameBinding="component_name" serviceComponentIdBinding="serviceComponentId"}} - {{/if}} - <span rel="popover" title="Warning" {{bindAttr data-content="warnMessage"}}> {{#if warnMessage}} <i class="glyphicon glyphicon-warning-sign"></i> @@ -113,9 +105,22 @@ </div> {{/if}} </div> + <div class="col-md-1 pts"> + {{#if showAddControl}} + <div class="pull-right"> + {{view App.AddControlView componentNameBinding="component_name"}} + </div> + {{/if}} + </div> + <div class="col-md-1 pts"> + {{#if showRemoveControl}} + <div class="pull-left"> + {{view App.RemoveControlView componentNameBinding="component_name" serviceComponentIdBinding="serviceComponentId"}} + </div> + {{/if}} + </div> </div> {{/each}} - </form> </div> </div> </div> @@ -123,17 +128,26 @@ <div class="host-assignments col-md-4"> {{#each masterHostMapping}} - <div class="mapping-box"> - <div class="hostString"><span>{{hostInfo}}</span></div> - {{#each masterServicesToDisplay}} - <span {{bindAttr class="isInstalled:assigned-service:new-service :service-component :label"}}>{{display_name}}</span> - {{/each}} + <div class="well side-menu-well"> + <div class="row"> + <div class="col-md-10 col-md-offset-1"> + <div class="hostString"><span>{{hostInfo}}</span></div> + {{#each masterServicesToDisplay}} + <span {{bindAttr class="isInstalled:assigned-service:new-service :service-component :label"}}>{{display_name}}</span> + {{/each}} + </div> + </div> </div> {{/each}} {{#if remainingHosts}} - <div class="remaining-hosts"> - <span><strong>{{remainingHosts}}</strong> {{t installer.step5.attention}}</span></div> + <div class="remaining-hosts well side-menu-well"> + <div class="row"> + <div class="col-md-10 col-md-offset-1"> + <strong>{{remainingHosts}}</strong> {{t installer.step5.attention}} + </div> + </div> + </div> {{/if}} </div> <div class="clearfix"></div> http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/templates/common/form/check_db_connection.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/form/check_db_connection.hbs b/ambari-web/app/templates/common/form/check_db_connection.hbs index 71bcdab..39de9c4 100644 --- a/ambari-web/app/templates/common/form/check_db_connection.hbs +++ b/ambari-web/app/templates/common/form/check_db_connection.hbs @@ -16,16 +16,22 @@ * limitations under the License. }} -<div class="entry-row form-group db-connection"> - <div class="col-md-3 control-label"></div> - <div class="col-md-9"> - <span {{bindAttr class=":pull-left :btn :btn-primary view.isBtnDisabled:disabled"}} {{action connectToDatabase target="view"}}>{{view.btnCaption}}</span> - <div class="pull-left connection-result mll"> - <a {{bindAttr class="view.isConnectionSuccess:mute:action"}} {{action showLogsPopup target="view"}}>{{view.responseCaption}}</a> +<div class="entry-row db-connection"> + <div class="col-md-3 form-group control-label"></div> + <div class="col-md-9 form-group"> + <div class="row"> + <div class="col-md-5"> + <span {{bindAttr class=":pull-left :btn :btn-primary view.isBtnDisabled:disabled"}} {{action connectToDatabase target="view"}}>{{view.btnCaption}}</span> + </div> + <div class="connection-result col-md-5"> + <a {{bindAttr class="view.isConnectionSuccess:mute:action :btn :btn-link"}} {{action showLogsPopup target="view"}}>{{view.responseCaption}}</a> + </div> + {{#if view.isConnecting}} + {{view App.SpinnerView classNames="mll pull-left"}} + {{/if}} + <div class="col-md-2"> + <i {{bindAttr class="view.isConnectionSuccess:glyphicon-ok-sign:glyphicon-warning-sign :glyphicon view.isRequestResolved::hide"}}></i> + </div> </div> - {{#if view.isConnecting}} - {{view App.SpinnerView classNames="mll pull-left"}} - {{/if}} - <i {{bindAttr class=":pull-right view.isConnectionSuccess:glyphicon-ok-sign:glyphicon-warning-sign :glyphicon view.isRequestResolved::hide"}}></i> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/templates/common/host_progress_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs b/ambari-web/app/templates/common/host_progress_popup.hbs index 2123f0a..c6c8bf8 100644 --- a/ambari-web/app/templates/common/host_progress_popup.hbs +++ b/ambari-web/app/templates/common/host_progress_popup.hbs @@ -33,7 +33,7 @@ optionValuePath="content.value" optionLabelPath="content.label" selectionBinding="view.serviceCategory" - class="form-control" + classNames="form-control" }} </div> </div> @@ -92,7 +92,7 @@ optionValuePath="content.value" optionLabelPath="content.label" selectionBinding="view.hostCategory" - class="form-control" + classNames="form-control" }} </div> </div> @@ -155,12 +155,11 @@ <div class="select-wrap tasks-list-select"> {{t common.show}}: {{view Ember.Select - class="form-control" contentBinding="view.categories" optionValuePath="content.value" optionLabelPath="content.label" selectionBinding="view.taskCategory" - class="form-control" + classNames="form-control" }} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs b/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs index ca45740..c2311e3 100644 --- a/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs +++ b/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs @@ -16,22 +16,54 @@ * limitations under the License. }} -<b>{{view.details.hostName}}</b><br/> -{{t common.os}}: {{view.details.osType}}<br/> -{{t common.ipAddress}}: {{view.details.ip}}<br/> -{{t common.rack}}: {{view.details.rack}}<br/> -{{#if view.details.metricName}} - {{view.details.metricName}}: {{view.details.metricValue}}<br/> -{{/if}} -{{#if view.details.diskUsage}} - {{t common.disk}}: {{view.details.diskUsage}}% <br/> -{{/if}} -{{#if view.details.cpuUsage}} - {{t common.cpu}}: {{view.details.cpuUsage}}%<br/> -{{/if}} -{{#if view.details.memoryUsage}} - {{t common.memory}}: {{view.details.memoryUsage}}%<br/> -{{/if}} -{{#if view.details.hostComponents}} - {{t common.components}}: {{view.details.hostComponents}}<br/> -{{/if}} +<table class="table"> + <thead> + <tr> + <td colspan="2">{{view.details.hostName}}</td> + </tr> + </thead> + <tbody> + <tr> + <td>{{t common.os}}</td> + <td>{{view.details.osType}}</td> + </tr> + <tr> + <td>{{t common.ipAddress}}</td> + <td>{{view.details.ip}}</td> + </tr> + <tr> + <td>{{t common.rack}}</td> + <td>{{view.details.rack}}</td> + </tr> + {{#if view.details.metricName}} + <tr> + <td>{{view.details.metricName}}</td> + <td>{{view.details.metricValue}}</td> + </tr> + {{/if}} + {{#if view.details.diskUsage}} + <tr> + <td>{{t common.disk}}</td> + <td>{{view.details.diskUsage}}%</td> + </tr> + {{/if}} + {{#if view.details.cpuUsage}} + <tr> + <td>{{t common.cpu}}</td> + <td>{{view.details.cpuUsage}}%</td> + </tr> + {{/if}} + {{#if view.details.memoryUsage}} + <tr> + <td>{{t common.memory}}</td> + <td>{{view.details.memoryUsage}}%</td> + </tr> + {{/if}} + {{#if view.details.hostComponents}} + <tr> + <td>{{t common.components}}</td> + <td>{{view.details.hostComponents}}</td> + </tr> + {{/if}} + </tbody> +</table> http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs b/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs index c3fe9fe..304e63d 100644 --- a/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs +++ b/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs @@ -16,36 +16,21 @@ * limitations under the License. }} -<div class="rackHeader"> - <div class="statusName clearfix"> - <div {{bindAttr class="view.statusIndicator rack.status"}}></div> - <div class="rackName">{{rack.name}}</div> +<div class="rackHeader panel-heading"> + <div class="statusName"> + <h3 class="panel-title rackName">{{rack.name}}</h3> </div> </div> -<!--<div class="hostsSummary clearfix">--> - <!--<div class="textBlock">Total hosts: {{!rack.hosts.length}}</div>--> - <!--{{!#if view.heatmapIsOpened}}--> - <!--<div class="textBlock">--> - <!--<div class="indicatorG"></div>--> - <!--Hosts in live state: {{!rack.liveHostsCount}}--> - <!--</div>--> - <!--<div class="textBlock">--> - <!--<div class="indicatorY"></div>--> - <!--Hosts in critical state: {{!rack.criticalHostsCount}}--> - <!--</div>--> - <!--<div class="textBlock">--> - <!--<div class="indicatorR"></div>--> - <!--Hosts in dead state: {{!rack.deadHostsCount}}--> - <!--</div>--> - <!--{{!/if}}--> -<!--</div>--> -<div class="isActive hosts clearfix"> - <div {{bindAttr class="view.rack.isLoaded::hidden"}}> - {{#each view.hosts}} - <div {{bindAttr style="view.hostCssStyle"}}> + +<div class="isActive hosts clearfix panel-body"> + <div {{bindAttr class="view.rack.isLoaded::hidden"}}> + <div class="row row-no-pad"> + {{#each view.hosts}} + <div {{bindAttr class="view.hostCssStyle"}}> {{view App.MainChartsHeatmapHostView contentBinding="this"}} </div> - {{/each}} + {{/each}} + </div> </div> {{#unless view.rack.isLoaded}} {{view App.SpinnerView}} http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs b/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs index 1dd3d21..c080901 100644 --- a/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs +++ b/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs @@ -23,11 +23,11 @@ <ul class="dropdown-menu"> {{#each category in controller.heatmapCategories}} <li class="dropdown-submenu"> - <a tabindex="-1" >{{category.displayName}}</a> + <a tabindex="-1">{{category.displayName}}</a> <ul class="dropdown-menu"> {{#each heatmap in category.heatmaps}} <li> - <a tabindex="-1" {{action showHeatMapMetric heatmap target="controller"}}>{{heatmap.widget_name}}</a> + <a tabindex="-1" href="#" {{action showHeatMapMetric heatmap target="controller"}}>{{heatmap.widget_name}}</a> </li> {{/each}} </ul> http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/templates/main/host/details/deleteComponentPopup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/details/deleteComponentPopup.hbs b/ambari-web/app/templates/main/host/details/deleteComponentPopup.hbs index 14a585d..45cee97 100644 --- a/ambari-web/app/templates/main/host/details/deleteComponentPopup.hbs +++ b/ambari-web/app/templates/main/host/details/deleteComponentPopup.hbs @@ -18,26 +18,28 @@ <p>{{{deleteComponentMsg}}}</p> {{#if lastComponent}} - <div class="alert alert-danger row"> - <div class='tinyspan tinyoffset'>{{view App.CheckboxView checkedBinding="isChecked"}}</div> - <div class='col-md-10'>{{{lastComponentError}}}</div> + <div class="alert alert-danger"> + <div class="row row-no-pad"> + <div class="col-md-1">{{view App.CheckboxView checkedBinding="isChecked"}}</div> + <div class="col-md-11">{{{lastComponentError}}}</div> + </div> </div> {{/if}} {{#if isZkServer}} - <div class='alert alert-warning'>{{{deleteZkServerMsg}}}</div> + <div class="alert alert-warning">{{{deleteZkServerMsg}}}</div> {{/if}} {{#if isHiveMetastore}} - <div class='alert alert-warning'>{{{deleteHiveMetastoreMsg}}}</div> + <div class="alert alert-warning">{{{deleteHiveMetastoreMsg}}}</div> {{/if}} {{#if isWebHCatServer}} - <div class='alert alert-warning'>{{{deleteWebHCatServerMsg}}}</div> + <div class="alert alert-warning">{{{deleteWebHCatServerMsg}}}</div> {{/if}} {{#if isNimbus}} - <div class='alert alert-warning'>{{{deleteNimbusMsg}}}</div> + <div class="alert alert-warning">{{{deleteNimbusMsg}}}</div> {{/if}} {{#if isRangerKMSServer}} - <div class='alert alert-warning'>{{{deleteRangerKMSServereMsg}}}</div> + <div class="alert alert-warning">{{{deleteRangerKMSServereMsg}}}</div> {{/if}} {{#if isJournalNode}} - <div class='alert alert-warning'>{{{deleteJournalNodeMsg}}}</div> + <div class="alert alert-warning">{{{deleteJournalNodeMsg}}}</div> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs b/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs index 15729e0..6a62ee0 100644 --- a/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs +++ b/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs @@ -16,29 +16,29 @@ * limitations under the License. }} {{#if unknownComponents}} - {{t hosts.delete.popup.unknownComponents}} - <br /><br /> - <div class='row'> - <div class='tinyoffset col-md-10'> - <i>{{unknownComponents}}</i> + <div class="row"> + <div class="col-md-12"> + <p>{{t hosts.delete.popup.unknownComponents}}<br /><i>{{unknownComponents}}</i></p> </div> </div> - <br /> {{/if}} <p><i class="glyphicon glyphicon-warning-sign"></i> {{{deletePopupBody}}}</p> {{#if lastComponent}} - <div class="alert alert-danger row"> - <div class='tinyspan tinyoffset'>{{view App.CheckboxView checkedBinding="isChecked"}}</div> - <div class='col-md-10'>{{view lastComponentError}}</div> + <div class="alert alert-danger"> + <div class="row row-no-pad"> + <div class="col-md-1">{{view App.CheckboxView checkedBinding="isChecked"}}</div> + <div class="col-md-10">{{view lastComponentError}}</div> </div> + </div> {{/if}} -<br /> + {{#if toDecommissionComponents.length}} - <div class='alert alert-warning'> + <div class="alert alert-warning"> {{view decommissionWarning}} </div> {{/if}} -<div class='alert alert-warning'>{{{t common.important.strong}}} + +<div class="alert alert-warning">{{{t common.important.strong}}} {{#if unknownComponents}} {{t hosts.delete.popup.body.msg.unknownComponents}} {{/if}} @@ -46,12 +46,11 @@ </div> {{#unless unknownComponents}} - <div class='alert alert-warning'> - <!-- Agent is still online, so host record will be re-inserted on next heartbeat. --> - {{t hosts.delete.popup.body.msg5}} - <span class="text-danger">{{t hosts.delete.popup.body.msg6}}</span> + <div class="alert alert-warning"> + <!-- Agent is still online, so host record will be re-inserted on next heartbeat. --> + {{t hosts.delete.popup.body.msg5}} + <span class="text-danger">{{t hosts.delete.popup.body.msg6}}</span> </div> {{/unless}} - -<div class='alert alert-warning'>{{{t common.important.strong}}} {{t hosts.delete.popup.body.msg3}}</div> +<div class="alert alert-warning">{{{t common.important.strong}}} {{t hosts.delete.popup.body.msg3}}</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs b/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs index e83e76a..a21d364 100644 --- a/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs +++ b/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs @@ -17,16 +17,17 @@ }} <div class="dialog-delete-component"> - <div class="warning"> - <i class="glyphicon glyphicon-warning-sign"></i> <strong>{{componentsBody}}</strong> - </div> - <div class="row"> - <div class="tinyoffset col-md-10 warning-list"> - {{componentsStr}} + <div class="warning row row-no-pad"> + <div class="col-md-1"> + <i class="glyphicon glyphicon-warning-sign"></i> + </div> + <div class="col-md-11 warning-list"> + <p><strong>{{componentsBody}}</strong><br /><em>{{componentsStr}}</em></p> + {{#if showBodyEnd}} + <div class="warning-details"> + {{{componentsBodyEnd}}} + </div> + {{/if}} </div> </div> - -{{#if showBodyEnd}} - <div class="warning-details">{{{componentsBodyEnd}}}</div> -{{/if}} </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs b/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs index d4ad435..10e333e 100644 --- a/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs +++ b/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs @@ -24,7 +24,7 @@ <ul class="dropdown-menu"> {{#each heatmap in controller.allHeatmaps}} <li class="heatmap-metrics-dropdown-links"> - <a tabindex="-1" {{action showHeatMapMetric heatmap target="controller"}}>{{heatmap.widget_name}}</a> + <a tabindex="-1" href="#" {{action showHeatMapMetric heatmap target="controller"}}>{{heatmap.widget_name}}</a> </li> {{/each}} </ul> http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/templates/wizard/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step3.hbs b/ambari-web/app/templates/wizard/step3.hbs index 64c76ef..2ba87e1 100644 --- a/ambari-web/app/templates/wizard/step3.hbs +++ b/ambari-web/app/templates/wizard/step3.hbs @@ -71,7 +71,7 @@ <th class="col-md-2">{{t common.action}}</th> <!-- trash icon --> <!-- retry icon --> - <th class="tinyspan"> + <th> {{view App.CheckboxView checkedBinding="view.pageChecked"}} </th> </tr> http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs b/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs index 0628a98..7b8475f 100644 --- a/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs +++ b/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs @@ -61,14 +61,14 @@ </div> <div id="{{unbound category.category}}" class="panel-body collapse in" style="display: none"> {{#if category.warnings.length}} - <table> + <table class="table"> <thead> - <tr> - <th colspan="2">{{{category.message}}}</th> - </tr> - <tr> - <th colspan="2"><b>{{category.type}}</b></th> - </tr> + <tr> + <th colspan="4">{{{category.message}}}</th> + </tr> + <tr> + <th colspan="4"><b>{{category.type}}</b></th> + </tr> </thead> <tbody> {{#each warning in category.warnings}} @@ -76,9 +76,13 @@ <td class="warning-name" {{bindAttr data-original-title="warning.command"}} >{{{warning.name}}}</td> {{#if warning.version}} <td class="package-version">{{warning.version}}</td> + {{else}} + <td></td> {{/if}} {{#if warning.target}} <td class="package-version">{{warning.target}}</td> + {{else}} + <td></td> {{/if}} <td>{{category.action}} <a href="javascript:void(null);" rel='HostsListTooltip' {{bindAttr data-original-title="warning.hostsList"}} {{action showHostsPopup warning.hostsLong}}> http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs b/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs index 3d6895c..9640e32 100644 --- a/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs +++ b/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs @@ -30,7 +30,7 @@ <div class="select-wrap"> {{t common.show}}: {{view Ember.Select - class="form-control" + classNames="form-control" contentBinding="view.categories" optionValuePath="content.value" optionLabelPath="content.label" http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/views/common/assign_master_components_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/assign_master_components_view.js b/ambari-web/app/views/common/assign_master_components_view.js index d838eef..53859f6 100644 --- a/ambari-web/app/views/common/assign_master_components_view.js +++ b/ambari-web/app/views/common/assign_master_components_view.js @@ -173,7 +173,7 @@ App.AddControlView = Em.View.extend({ tagName: "span", - classNames: ["badge"], + classNames: ["label", 'extra-component'], classNameBindings: ['uniqueId'], @@ -212,7 +212,7 @@ App.RemoveControlView = Em.View.extend({ tagName: "span", - classNames: ["badge"], + classNames: ["label", 'extra-component'], template: Em.Handlebars.compile('-'), http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/views/main/charts/heatmap/heatmap_rack.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/charts/heatmap/heatmap_rack.js b/ambari-web/app/views/main/charts/heatmap/heatmap_rack.js index af840fb..012e762 100644 --- a/ambari-web/app/views/main/charts/heatmap/heatmap_rack.js +++ b/ambari-web/app/views/main/charts/heatmap/heatmap_rack.js @@ -21,7 +21,7 @@ var lazyloading = require('utils/lazy_loading'); App.MainChartsHeatmapRackView = Em.View.extend({ templateName: require('templates/main/charts/heatmap/heatmap_rack'), - classNames: ['rack'], + classNames: ['rack', 'panel', 'panel-default'], classNameBindings: ['visualSchema'], /** rack status block class */ @@ -63,13 +63,22 @@ App.MainChartsHeatmapRackView = Em.View.extend({ */ hostCssStyle: function () { var rack = this.get('rack'); - var widthPercent = 100; var hostCount = rack.get('hosts.length'); - if (hostCount && hostCount < 11) { - widthPercent = (100 / hostCount) - 0.5; - } else { - widthPercent = 10; // max out at 10% + if (hostCount >= 12) { + return 'col-md-1'; } - return "width:" + widthPercent + "%;float:left;"; + if (hostCount === 1) { + return 'col-md-12'; + } + if (hostCount === 2) { + return 'col-md-6'; + } + if (hostCount === 3) { + return 'col-md-4'; + } + if (hostCount === 4) { + return 'col-md-3'; + } + return 'col-md-2'; }.property('rack.isLoaded') }); http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/test/controllers/main/alerts/add_alert_definition/step1_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/alerts/add_alert_definition/step1_controller_test.js b/ambari-web/test/controllers/main/alerts/add_alert_definition/step1_controller_test.js index 7d19239..58f1b47 100644 --- a/ambari-web/test/controllers/main/alerts/add_alert_definition/step1_controller_test.js +++ b/ambari-web/test/controllers/main/alerts/add_alert_definition/step1_controller_test.js @@ -24,17 +24,22 @@ var controller; describe('App.AddAlertDefinitionStep1Controller', function () { beforeEach(function () { - controller = App.AddAlertDefinitionStep1Controller.create({content: {}}); + controller = App.AddAlertDefinitionStep1Controller.create({content: Em.Object.create({})}); }); describe('#selectType', function() { beforeEach(function () { + sinon.stub(App.router, 'send', Em.K); controller.get('content').set('selectedType', ''); }); + afterEach(function () { + App.router.send.restore(); + }); + it('should set isActive for selected type', function () { - var e = {context: {value: 'PORT'}}; + var e = {context: {name: 'PORT'}}; controller.selectType(e); expect(controller.get('content.selectedType')).to.equal('PORT'); }); @@ -49,7 +54,7 @@ describe('App.AddAlertDefinitionStep1Controller', function () { it('should set predefined type', function () { controller.loadStep(); - expect(controller.get('content.selectedType').to.equal('')); + expect(controller.get('content.selectedType')).to.equal(''); }); });
